History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge with stable

Changeset aaac856508a0 …

Parents 123811ec40a6 …

Parents 774617fd1cc6 …

by Steve Borho Jul 6 09 at 10:30 PM

Changes to 6 files · Browse files at aaac856508a0 Showing diff from parent 123811ec40a6 774617fd1cc6 Diff from another changeset...

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/gdialog.py Stacked
121 122 123 124 125 126 127	121 122 123 124 125 126 127 128 129 130 131 132 133 134	@@ -121,7 +121,14 @@ `self.cwd = cwd or os.getcwd()` `self.ui = ui` `self.ui.setconfig('ui', 'interactive', 'off')`-`self.repo = repo or hg.repository(ui, path=paths.find_root())`+`if repo:`+`self.repo = repo`+`else:`+`root = paths.find_root()`+`if root:`+`self.repo = hg.repository(ui, path=root)`+`else:`+`self.repo = None` `self.pats = pats` `self.opts = opts` `self.tmproot = None`

Change 1 of 4 Show Changes Only Show Entire File Loading... hggtk/hgtk.py Stacked
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685	`# front-end script for TortoiseHg dialogs` `#` `# Copyright (C) 2008-9 Steve Borho <steve@borho.org>` `# Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>` `shortlicense = '''` `Copyright (C) 2009 Steve Borho <steve@borho.org>.` `This is free software; see the source for copying conditions. There is NO` `warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.` `'''` `import os` `import pdb` `import sys` `import traceback` `import gtk` `import gobject` `import mercurial.ui as _ui` `from mercurial import hg, util, fancyopts, cmdutil, extensions` `from thgutil.i18n import agettext as _` `from thgutil import hglib, paths, shlib` `from thgutil import version as thgversion` `nonrepo_commands = '''userconfig clone debugcomplete init about help` `version thgstatus'''` `# Add TortoiseHg signals, hooked to key accelerators in gtklib` `for sig in ('copy-clipboard', 'thg-diff', 'thg-parent'):` `gobject.signal_new(sig, gtk.TreeView,` `gobject.SIGNAL_ACTION, gobject.TYPE_NONE, ())` `for sig in ('thg-exit', 'thg-close', 'thg-refresh', 'thg-accept'):` `gobject.signal_new(sig, gtk.Window,` `gobject.SIGNAL_ACTION, gobject.TYPE_NONE, ())` `gtkmainalive = False` `def dispatch(args):` `"run the command specified in args"` `try:` `u = _ui.ui()` `if '--traceback' in args:` `u.setconfig('ui', 'traceback', 'on')` `if '--debugger' in args:` `pdb.set_trace()` `return _runcatch(u, args)` `except SystemExit:` `pass` `except:` `from hggtk.bugreport import run` `if '--debugger' in args:` `pdb.post_mortem(sys.exc_info()[2])` `error = traceback.format_exc()` `opts = {}` `opts['cmd'] = ' '.join(sys.argv[1:])` `opts['error'] = error` `if gtkmainalive:` `dlg = run(u, opts)` `dlg.display()` `dlg.show_all()` `else:` `gtkrun(run(u, opts))` `def portable_fork(ui):` `fork = ui.configbool('tortoisehg', 'hgtkfork', True)` `if not fork or 'THG_HGTK_SPAWN' in os.environ or '--nofork' in sys.argv:` `return` `# Spawn background process and exit` `if hasattr(sys, "frozen"):` `args = sys.argv` `else:` `args = [sys.executable] + sys.argv` `if os.name == 'nt':` `args = ['"%s"' % arg for arg in args]` `env = os.environ.copy()` `env['THG_HGTK_SPAWN'] = '1'` `os.spawnve(os.P_NOWAIT, sys.executable, args, env)` `sys.exit(0)` `def get_list_from_file(filename):` `try:` `if filename == '-':` `lines = [ x.replace("\n", "") for x in sys.stdin.readlines() ]` `else:` `fd = open(filename, "r")` `lines = [ x.replace("\n", "") for x in fd.readlines() ]` `fd.close()` `os.unlink(filename)` `except IOError, e:` `sys.stderr.write(_('can not read file "%s". Ignored.\n') % filename)` `return []` `# Convert absolute file paths to repo/cwd canonical` `cwd = os.getcwd()` `root = paths.find_root()` `if cwd == root:` `cwd_rel = ''` `else:` `cwd_rel = cwd[len(root+os.sep):] + os.sep` `files = []` `for f in lines:` `try:` `cpath = util.canonpath(root, cwd, f)` `# canonpath will abort on .hg/ paths` `except util.Abort:` `continue` `if cpath.startswith(cwd_rel):` `cpath = cpath[len(cwd_rel):]` `files.append(cpath)` `else:` `files.append(f)` `return files` `def _parse(ui, args):` `options = {}` `cmdoptions = {}` `try:` `args = fancyopts.fancyopts(args, globalopts, options)` `except fancyopts.getopt.GetoptError, inst:` `raise hglib.ParseError(None, inst)` `if args:` `cmd, args = args[0], args[1:]` `aliases, i = cmdutil.findcmd(cmd, table, ui.config("ui", "strict"))` `cmd = aliases[0]` `c = list(i[1])` `else:` `cmd = None` `c = []` `# combine global options into local` `for o in globalopts:` `c.append((o[0], o[1], options[o[1]], o[3]))` `try:` `args = fancyopts.fancyopts(args, c, cmdoptions)` `except fancyopts.getopt.GetoptError, inst:` `raise hglib.ParseError(cmd, inst)` `# separate global options back out` `for o in globalopts:` `n = o[1]` `options[n] = cmdoptions[n]` `del cmdoptions[n]` `listfile = options.get('listfile')` `if listfile:` `del options['listfile']` `args += get_list_from_file(listfile)` `return (cmd, cmd and i[0] or None, args, options, cmdoptions)` `def _runcatch(ui, args):` `try:` `try:`+`checkhgversion(hglib.hgversion)`+`except util.Abort, inst:`+`ui.status(_("abort: %s!\n") % inst)`+`return 0`+`try:` `return runcommand(ui, args)` `finally:` `ui.flush()` `except hglib.ParseError, inst:` `if inst.args[0]:` `ui.status(_("hgtk %s: %s\n") % (inst.args[0], inst.args[1]))` `help_(ui, inst.args[0])` `else:` `ui.status(_("hgtk: %s\n") % inst.args[1])` `help_(ui, 'shortlist')` `except hglib.AmbiguousCommand, inst:` `ui.status(_("hgtk: command '%s' is ambiguous:\n %s\n") %` `(inst.args[0], " ".join(inst.args[1])))` `except hglib.UnknownCommand, inst:` `ui.status(_("hgtk: unknown command '%s'\n") % inst.args[0])` `help_(ui, 'shortlist')` `except hglib.RepoError, inst:` `ui.status(_("abort: %s!\n") % inst)` `return -1` `def runcommand(ui, args):` `fullargs = args` `cmd, func, args, options, cmdoptions = _parse(ui, args)` `ui.setconfig("ui", "verbose", str(bool(options["verbose"])))` `if options['help']:` `return help_(ui, cmd)` `elif not cmd:` `return help_(ui, 'shortlist')` +`if options['repository']:`+`path = ui.expandpath(options['repository'])`+`cmdoptions['repository'] = path`+`os.chdir(path)` `path = paths.find_root(os.getcwd())` `if path:` `try:` `lui = hasattr(_ui, 'copy') and _ui.copy() or _ui.ui(ui)` `lui.readconfig(os.path.join(path, ".hg", "hgrc"))` `except IOError:` `pass` `else:` `lui = ui`-`if options['repository']:`-`path = lui.expandpath(options['repository'])`-`cmdoptions['repository'] = path` `_loaded = {}` `extensions.loadall(ui)` `for name, module in extensions.extensions():` `if name in _loaded:` `continue` `extsetup = getattr(module, 'extsetup', None)` `if extsetup:` `extsetup()` `_loaded[name] = 1` `if cmd not in nonrepo_commands.split() and not path:` `raise hglib.RepoError(_("There is no Mercurial repository here"` `" (.hg not found)"))` `try:` `return func(ui, args, cmdoptions)` `except TypeError, inst:` `# was this an argument error?` `tb = traceback.extract_tb(sys.exc_info()[2])` `if len(tb) != 1: # no` `raise` `raise hglib.ParseError(cmd, _("invalid arguments"))` `mainwindow = None` `def thgexit(win):` `if hasattr(mainwindow, 'should_live'):` `if mainwindow.should_live(): return` `mainwindow.destroy()` `def gtkrun(win):` `global mainwindow, gtkmainalive` `mainwindow = win` `if hasattr(win, 'display'):` `win.display()` `win.show_all()` `if 'response' in gobject.signal_list_names(win):` `win.connect('response', gtk.main_quit)` `win.connect('destroy', gtk.main_quit)` `gtk.gdk.threads_init()` `gtk.gdk.threads_enter()` `gtkmainalive = True` `gtk.main()` `gtkmainalive = False` `gtk.gdk.threads_leave()` `def about(ui, pats, *opts):` `"""about TortoiseHg"""` `from hggtk.about import run` `gtkrun(run(ui, pats, *opts))` `def add(ui, pats, *opts):` `"""add files"""` `from mercurial import dispatch as _dispatch` `_dispatch.dispatch(['add'] + list(pats))` `shlib.shell_notify([os.getcwd()])` `def thgstatus(ui, pats, *opts):` `"""update TortoiseHg status cache"""` `from hggtk.thgstatus import run` `run(ui, pats, *opts)` `def clone(ui, pats, *opts):` `"""clone tool"""` `portable_fork(ui)` `from hggtk.clone import run` `gtkrun(run(ui, pats, *opts))` `def commit(ui, pats, *opts):` `"""commit tool"""` `portable_fork(ui)` `# move cwd to repo root if repo is merged, so we can show` `# all the changed files` `repo = hg.repository(ui, path=paths.find_root())` `if len(repo.parents()) > 1:` `os.chdir(repo.root)` `pats = []` `from hggtk.commit import run` `gtkrun(run(ui, pats, *opts))` `def shelve(ui, pats, *opts):` `"""shelve/unshelve tool"""` `portable_fork(ui)` `from hggtk.thgshelve import run` `gtkrun(run(ui, pats, *opts))` `def userconfig(ui, pats, *opts):` `"""user configuration editor"""` `portable_fork(ui)` `from hggtk.thgconfig import run` `opts['repomode'] = False` `gtkrun(run(ui, pats, *opts))` `def repoconfig(ui, pats, *opts):` `"""repository configuration editor"""` `portable_fork(ui)` `from hggtk.thgconfig import run` `opts['repomode'] = True` `gtkrun(run(ui, pats, *opts))` `def rename(ui, pats, *opts):` `"""rename a single file or directory"""` `if not pats or len(pats) > 2:` `from hggtk import gdialog` `gdialog.Prompt(_('Rename error'),` `_('rename takes one or two path arguments'), None).run()` `return` `portable_fork(ui)` `from hggtk.rename import run` `gtkrun(run(ui, pats, *opts))` `def guess(ui, pats, *opts):` `"""guess previous renames or copies"""` `portable_fork(ui)` `from hggtk.guess import run` `gtkrun(run(ui, pats, *opts))` `def datamine(ui, pats, *opts):` `"""repository search and annotate tool"""` `portable_fork(ui)` `from hggtk.datamine import run` `gtkrun(run(ui, pats, *opts))` `def hgignore(ui, pats, *opts):` `"""ignore filter editor"""` `portable_fork(ui)` `from hggtk.hgignore import run` `gtkrun(run(ui, pats, *opts))` `def hginit(ui, pats, *opts):` `"""repository initialization tool"""` `portable_fork(ui)` `from hggtk.hginit import run` `gtkrun(run(ui, pats, *opts))` `def log(ui, pats, *opts):` `"""changelog viewer"""` `portable_fork(ui)` `from hggtk.history import run` `gtkrun(run(ui, pats, *opts))` `def merge(ui, pats, *opts):` `"""merge tool"""` `portable_fork(ui)` `from hggtk.merge import run` `gtkrun(run(ui, pats, *opts))` `def recovery(ui, pats, *opts):` `"""recover, rollback & verify"""` `portable_fork(ui)` `from hggtk.recovery import run` `gtkrun(run(ui, pats, *opts))` `def remove(ui, pats, *opts):` `"""file status viewer in remove mode"""` `portable_fork(ui)` `from hggtk.status import run` `gtkrun(run(ui, pats, *opts))` `def revert(ui, pats, *opts):` `"""file status viewer in revert mode"""` `portable_fork(ui)` `from hggtk.status import run` `gtkrun(run(ui, pats, *opts))` `def serve(ui, pats, *opts):` `"""web server"""` `portable_fork(ui)` `from hggtk.serve import run` `gtkrun(run(ui, pats, *opts))` `def status(ui, pats, *opts):` `"""file status & diff viewer"""` `portable_fork(ui)` `from hggtk.status import run` `gtkrun(run(ui, pats, *opts))` `def synch(ui, pats, *opts):` `"""repository synchronization tool"""` `portable_fork(ui)` `from hggtk.synch import run` `cmd = sys.argv[1]` `if 'push'.startswith(cmd) or 'outgoing'.startswith(cmd):` `opts['pushmode'] = True` `else:` `opts['pushmode'] = False` `gtkrun(run(ui, pats, *opts))` `def update(ui, pats, *opts):` `"""update/checkout tool"""` `portable_fork(ui)` `from hggtk.update import run` `gtkrun(run(ui, pats, *opts))` `def vdiff(ui, pats, *opts):` `"""launch configured visual diff tool"""` `portable_fork(ui)` `from hggtk.visdiff import run` `gtkrun(run(ui, pats, *opts))` `### help management, adapted from mercurial.commands.help_()` `def help_(ui, name=None, with_version=False):` `"""show help for a command, extension, or list of commands` `With no arguments, print a list of commands and short help.` `Given a command name, print help for that command.` `Given an extension name, print help for that extension, and the` `commands it provides."""` `option_lists = []` `def addglobalopts(aliases):` `if ui.verbose:` `option_lists.append((_("global options:"), globalopts))` `if name == 'shortlist':` `option_lists.append((_('use "hgtk help" for the full list '` `'of commands'), ()))` `else:` `if name == 'shortlist':` `msg = _('use "hgtk help" for the full list of commands '` `'or "hgtk -v" for details')` `elif aliases:` `msg = _('use "hgtk -v help%s" to show aliases and '` `'global options') % (name and " " + name or "")` `else:` `msg = _('use "hgtk -v help %s" to show global options') % name` `option_lists.append((msg, ()))` `def helpcmd(name):` `if with_version:` `version(ui)` `ui.write('\n')` `try:` `aliases, i = cmdutil.findcmd(name, table, False)` `except hglib.AmbiguousCommand, inst:` `select = lambda c: c.lstrip('^').startswith(inst.args[0])` `helplist(_('list of commands:\n\n'), select)` `return` `# synopsis` `ui.write("%s\n" % i[2])` `# aliases` `if not ui.quiet and len(aliases) > 1:` `ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))` `# description` `doc = i[0].__doc__` `if not doc:` `doc = _("(No help text available)")` `if ui.quiet:` `doc = doc.splitlines(0)[0]` `ui.write("\n%s\n" % doc.rstrip())` `if not ui.quiet:` `# options` `if i[1]:` `option_lists.append((_("options:\n"), i[1]))` `addglobalopts(False)` `def helplist(header, select=None):` `h = {}` `cmds = {}` `for c, e in table.items():` `f = c.split("\|", 1)[0]` `if select and not select(f):` `continue` `if name == "shortlist" and not f.startswith("^"):` `continue` `f = f.lstrip("^")` `if not ui.debugflag and f.startswith("debug"):` `continue` `doc = e[0].__doc__` `if not doc:` `doc = _("(No help text available)")` `h[f] = doc.splitlines(0)[0].rstrip()` `cmds[f] = c.lstrip("^")` `if not h:` `ui.status(_('no commands defined\n'))` `return` `ui.status(header)` `fns = h.keys()` `fns.sort()` `m = max(map(len, fns))` `for f in fns:` `if ui.verbose:` `commands = cmds[f].replace("\|",", ")` `ui.write(" %s:\n %s\n"%(commands, h[f]))` `else:` `ui.write(' %-s %s\n' % (m, f, h[f]))` `if not ui.quiet:` `addglobalopts(True)` `def helptopic(name):` `from mercurial import help` `for names, header, doc in help.helptable:` `if name in names:` `break` `else:` `raise hglib.UnknownCommand(name)` `# description` `if not doc:` `doc = _("(No help text available)")` `if hasattr(doc, '__call__'):` `doc = doc()` `ui.write("%s\n" % header)` `ui.write("%s\n" % doc.rstrip())` `if name and name != 'shortlist':` `i = None` `for f in (helpcmd, helptopic):` `try:` `f(name)` `i = None` `break` `except hglib.UnknownCommand, inst:` `i = inst` `if i:` `raise i` `else:` `# program name` `if ui.verbose or with_version:` `version(ui)` `else:` `ui.status(_("Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"))` `ui.status('\n')` `# list of commands` `if name == "shortlist":` `header = _('basic commands:\n\n')` `else:` `header = _('list of commands:\n\n')` `helplist(header)` `# list all option lists` `opt_output = []` `for title, options in option_lists:` `opt_output.append(("\n%s" % title, None))` `for shortopt, longopt, default, desc in options:` `if "DEPRECATED" in desc and not ui.verbose: continue` `opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,` `longopt and " --%s" % longopt),` `"%s%s" % (desc,` `default` `and _(" (default: %s)") % default` `or "")))` `if opt_output:` `opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])` `for first, second in opt_output:` `if second:` `ui.write(" %-s %s\n" % (opts_len, first, second))` `else:` `ui.write("%s\n" % first)` +`def checkhgversion(v):`+`"""range check the Mercurial version"""`+`# this is a series of hacks, but Mercurial's versioning scheme`+`# doesn't lend itself to a "correct" solution. This will at least`+`# catch people who have old Mercurial packages.`+`reqver = ['1', '2']`+`if not v or v == 'unknown' or len(v) == 12:`+`# can't make any intelligent decisions about unknown or hashes`+`return`+`vers = v.split('.')[:2]`+`if vers == reqver:`+`return`+`nextver = list(reqver)`+`nextver[1] = chr(ord(reqver[1])+1)`+`if vers == nextver:`+`return`+`raise util.Abort(_('This version of TortoiseHg requires Mercurial '`+`'version %s.n to %s.n') % ('.'.join(reqver),`+`'.'.join(nextver)))`+ `def version(ui, opts):` `"""output version and copyright information"""` `ui.write(_('TortoiseHg Dialogs (version %s), '` `'Mercurial (version %s)\n') %` `(hglib.fromutf(thgversion.version()), hglib.hgversion))` `if not ui.quiet:` `ui.write(shortlicense)` `def debugcomplete(ui, cmd='', *opts):` `"""output list of possible commands"""` `if opts.get('options'):` `options = []` `otables = [globalopts]` `if cmd:` `aliases, entry = cmdutil.findcmd(cmd, table, False)` `otables.append(entry[1])` `for t in otables:` `for o in t:` `if o[0]:` `options.append('-%s' % o[0])` `options.append('--%s' % o[1])` `ui.write("%s\n" % "\n".join(options))` `return` `cmdlist = cmdutil.findpossible(cmd, table)` `if ui.verbose:` `cmdlist = [' '.join(c[0]) for c in cmdlist.values()]` `ui.write("%s\n" % "\n".join(sorted(cmdlist)))` `globalopts = [` `('R', 'repository', '',` `_('repository root directory or symbolic path name')),` `('v', 'verbose', None, _('enable additional output')),` `('h', 'help', None, _('display help and exit')),` `('', 'debugger', None, _('start debugger')),` `('', 'nofork', None, _('do not fork GUI process')),` `('l', 'listfile', '', _('read file list from file')),` `]` `table = {` `"^about": (about, [], _('hgtk about')),` `"^add": (add, [], _('hgtk add [FILE]...')),` `"^clone": (clone, [], _('hgtk clone SOURCE [DEST]')),` `"^commit\|ci": (commit,` `[('u', 'user', '', _('record user as committer')),` `('d', 'date', '', _('record datecode as commit date'))],` `_('hgtk commit [OPTIONS] [FILE]...')),` `"^datamine\|annotate\|blame": (datamine, [], _('hgtk datamine')),` `"^hgignore\|ignore\|filter": (hgignore, [], _('hgtk hgignore [FILE]')),` `"^init": (hginit, [], _('hgtk init [DEST]')),` `"^log\|history": (log,` `[('l', 'limit', '', _('limit number of changes displayed'))],` `_('hgtk log [OPTIONS] [FILE]')),` `"^merge": (merge,` `[('r', 'rev', '', _('revision to update'))],` `_('hgtk merge')),` `"^recovery\|rollback\|verify": (recovery, [], _('hgtk recovery')),` `"^shelve\|unshelve": (shelve, [], _('hgtk shelve')),` `"^synch\|pull\|push\|incoming\|outgoing\|email": (synch, [], _('hgtk synch')),` `"^status\|st\|diff": (status,` `[('r', 'rev', [], _('revisions to compare'))],` `_('hgtk status [FILE]...')),` `"^userconfig": (userconfig, [], _('hgtk userconfig')),` `"^repoconfig": (repoconfig, [], _('hgtk repoconfig')),` `"^guess": (guess, [], _('hgtk guess')),` `"^remove\|rm": (revert, [], _('hgtk remove [FILE]...')),` `"^rename\|mv": (rename, [], _('hgtk rename SOURCE [DEST]')),` `"^revert": (revert, [], _('hgtk revert [FILE]...')),` `"^serve":` `(serve,` `[('', 'webdir-conf', '', _('name of the webdir config file'))],` `_('hgtk serve [OPTION]...')),` `"thgstatus": (thgstatus,` `[('', 'delay', None, _('wait until the second ticks over')),` `('n', 'notify', [], _('notify the shell for path(s) given')),` `('', 'remove', None, _('remove the status cache')),` `('s', 'show', None, _('show the contents of the'` `' status cache (no update)')),` `('', 'all', None, _('udpate all repos in current dir')) ],` `_('hgtk thgstatus [OPTION]')),` `"^update\|checkout\|co": (update,` `[('r', 'rev', '', _('revision to update'))],` `('hgtk update')),` `"^vdiff": (vdiff,` `[('c', 'change', '', _('changeset to view in diff tool')),` `('r', 'rev', [], _('revisions to view in diff tool'))],` `_('launch visual diff tool')),` `"^version": (version,` `[('v', 'verbose', None, _('print license'))],` `_('hgtk version [OPTION]')),` `"debugcomplete": (debugcomplete,` `[('o', 'options', None, _('show the command options'))],` `_('[-o] CMD')),` `"help": (help_, [], _('hgtk help [COMMAND]')),` `}`

Change 1 of 3 Show Changes Only Show Entire File Loading... hggtk/logview/treemodel.py Stacked
10 11 12 13 14 15 16 41 42 43 44 45 46 47 136 137 138 139 140 141 142 143 144 145 146	10 11 12 13 14 15 16 41 42 43 44 45 46 135 136 137 138 139 140 141 142 143	@@ -10,7 +10,7 @@ `import gtk` `import gobject` `import re`-`from mercurial import util`+`from mercurial import util, templatefilters` `from mercurial.hgweb import webutil` `from thgutil import hglib` `from hggtk import gtklib`@@ -41,7 +41,6 @@ `self.branch_names = {}` `self.repo = repo` `self.line_graph_data = graphdata`-`self.author_re = re.compile('<.@.>', 0)` `self.color_func = color_func` `self.parents = [x.rev() for x in repo.parents()]` `self.heads = [repo[x].rev() for x in repo.heads()]`@@ -136,11 +135,9 @@ `bstr += '<span color="%s" background="%s"> %s </span> ' % \` `('black', '#aaffaa', branch)` -`if '<' in ctx.user():`-`author = self.author_re.sub('', ctx.user()).strip(' ')`-`else:`+`author = templatefilters.person(ctx.user())`+`if not author:` `author = util.shortuser(ctx.user())`- `author = hglib.toutf(author)` `date = hglib.displaytime(ctx.date())` `utc = hglib.utctime(ctx.date())`

Change 1 of 4 Show Changes Only Show Entire File Loading... win32/shellext/ContextMenu.cpp Stacked
27 28 29 30 31 32 33 63 64 65 66 67 68 69 78 79 80 81 82 83 84 478 479 480 481 482 483 484	27 28 29 30 31 32 33 63 64 65 66 67 68 69 78 79 80 81 82 83 84 478 479 480 481 482 483 484 485 486	@@ -27,7 +27,7 @@ `"Commit changes in repository",` `"menucommit.ico", 0},` `{"init", "Create Repository Here",`-`"Create a new repository in this directory",`+`"Create a new repository",` `"menucreaterepos.ico", 0},` `{"clone", "Clone a Repository",` `"Create clone here from source",`@@ -63,7 +63,7 @@ `"Update working directory",` `"menucheckout.ico", 0},` `{"recover", "Recovery...",`-`"General repair and recovery of repository",`+`"Repair and recovery of repository",` `"general.ico", 0},` `{"thgstatus", "Update Icons",` `"Update icons for this repository",`@@ -78,7 +78,7 @@ `"Show About Dialog",` `"menuabout.ico", 0},` `{"datamine", "Annotate Files",`-`"Show changeset information per file line",`+`"Changeset information per file line",` `"menublame.ico", 0},` `{"vdiff", "Visual Diff",` `"View changes using GUI diff tool",`@@ -478,7 +478,9 @@ `TDEBUG_TRACE(` `"CShellExt::GetCommandString: idCmd = " << idCmd`-`<< ", uFlags = " << uFlags << " (" << sflags << ")");`+`<< ", uFlags = " << uFlags << " (" << sflags << ")"`+`<< ", cchMax = " << cchMax`+`);` `MenuIdCmdMap::iterator iter = MenuIdMap.find(static_cast<UINT>(idCmd));` `if (iter == MenuIdMap.end())`

win32/thg-cmenu-en-US.reg
		(Binary files differ)

win32/thg-cmenu-it-IT.reg
		(Binary files differ)

Diff Options

merge with stable

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

merge with stable

Diff to aaac856508a0

Attach a Trello Card

Add a tag

Your session has expired