equal
deleted
inserted
replaced
194 cmd.extend(args) |
194 cmd.extend(args) |
195 |
195 |
196 ui.status((bytes(cmd)), "\n") |
196 ui.status((bytes(cmd)), "\n") |
197 |
197 |
198 def bisect(ui, repo, *args, **kwargs): |
198 def bisect(ui, repo, *args, **kwargs): |
199 ui.status(_("See 'hg help bisect' for how to use bisect.\n\n")) |
199 ui.status(_("see 'hg help bisect' for how to use bisect.\n\n")) |
200 |
200 |
201 def blame(ui, repo, *args, **kwargs): |
201 def blame(ui, repo, *args, **kwargs): |
202 cmdoptions = [ |
202 cmdoptions = [ |
203 ] |
203 ] |
204 args, opts = parseoptions(ui, cmdoptions, args) |
204 args, opts = parseoptions(ui, cmdoptions, args) |
454 cmd.extend(args) |
454 cmd.extend(args) |
455 |
455 |
456 ui.status((bytes(cmd)), "\n") |
456 ui.status((bytes(cmd)), "\n") |
457 |
457 |
458 def deprecated(ui, repo, *args, **kwargs): |
458 def deprecated(ui, repo, *args, **kwargs): |
459 ui.warn(_('This command has been deprecated in the git project, ' + |
459 ui.warn(_('this command has been deprecated in the git project, ' + |
460 'thus isn\'t supported by this tool.\n\n')) |
460 'thus isn\'t supported by this tool.\n\n')) |
461 |
461 |
462 def diff(ui, repo, *args, **kwargs): |
462 def diff(ui, repo, *args, **kwargs): |
463 cmdoptions = [ |
463 cmdoptions = [ |
464 ('a', 'all', None, ''), |
464 ('a', 'all', None, ''), |
654 args = ['A', 'B'] |
654 args = ['A', 'B'] |
655 |
655 |
656 cmd = Command("log -T '{node}\\n' -r 'ancestor(%s,%s)'" |
656 cmd = Command("log -T '{node}\\n' -r 'ancestor(%s,%s)'" |
657 % (args[0], args[1])) |
657 % (args[0], args[1])) |
658 |
658 |
659 ui.status(_('NOTE: ancestors() is part of the revset language.\n'), |
659 ui.status(_('note: ancestors() is part of the revset language.\n'), |
660 _("Learn more about revsets with 'hg help revsets'\n\n")) |
660 _("(learn more about revsets with 'hg help revsets')\n\n")) |
661 ui.status((bytes(cmd)), "\n") |
661 ui.status((bytes(cmd)), "\n") |
662 |
662 |
663 def mergetool(ui, repo, *args, **kwargs): |
663 def mergetool(ui, repo, *args, **kwargs): |
664 cmdoptions = [] |
664 cmdoptions = [] |
665 args, opts = parseoptions(ui, cmdoptions, args) |
665 args, opts = parseoptions(ui, cmdoptions, args) |
774 ui.status(_("note: if you're trying to lift a commit off one branch, " + |
774 ui.status(_("note: if you're trying to lift a commit off one branch, " + |
775 "try hg rebase -d <destination commit> -s <commit to be lifted>" + |
775 "try hg rebase -d <destination commit> -s <commit to be lifted>" + |
776 "\n\n")) |
776 "\n\n")) |
777 cmd['-d'] = convert(opts.get('onto')) |
777 cmd['-d'] = convert(opts.get('onto')) |
778 if len(args) < 2: |
778 if len(args) < 2: |
779 raise error.Abort(_("Expected format: git rebase --onto X Y Z")) |
779 raise error.Abort(_("expected format: git rebase --onto X Y Z")) |
780 cmd['-s'] = "'::%s - ::%s'" % (convert(args[1]), convert(args[0])) |
780 cmd['-s'] = "'::%s - ::%s'" % (convert(args[1]), convert(args[0])) |
781 else: |
781 else: |
782 if len(args) == 1: |
782 if len(args) == 1: |
783 cmd['-d'] = convert(args[0]) |
783 cmd['-d'] = convert(args[0]) |
784 elif len(args) == 2: |
784 elif len(args) == 2: |
813 |
813 |
814 commit = convert(args[0] if len(args) > 0 else '.') |
814 commit = convert(args[0] if len(args) > 0 else '.') |
815 hard = opts.get('hard') |
815 hard = opts.get('hard') |
816 |
816 |
817 if opts.get('mixed'): |
817 if opts.get('mixed'): |
818 ui.status(_('NOTE: --mixed has no meaning since Mercurial has no ' |
818 ui.status(_('note: --mixed has no meaning since Mercurial has no ' |
819 'staging area\n\n')) |
819 'staging area\n\n')) |
820 if opts.get('soft'): |
820 if opts.get('soft'): |
821 ui.status(_('NOTE: --soft has no meaning since Mercurial has no ' |
821 ui.status(_('note: --soft has no meaning since Mercurial has no ' |
822 'staging area\n\n')) |
822 'staging area\n\n')) |
823 |
823 |
824 cmd = Command('update') |
824 cmd = Command('update') |
825 if hard: |
825 if hard: |
826 cmd.append('--clean') |
826 cmd.append('--clean') |