Show More
@@ -395,8 +395,8 b' def clone(ui, repo, *args, **kwargs):' | |||
|
395 | 395 | |
|
396 | 396 | if opts.get('bare'): |
|
397 | 397 | cmd['-U'] = None |
|
398 |
ui.status(_("note: Mercurial does not have bare clones. " |
|
|
399 | "-U will clone the repo without checking out a commit\n\n")) | |
|
398 | ui.status(_("note: Mercurial does not have bare clones. " | |
|
399 | "-U will clone the repo without checking out a commit\n\n")) | |
|
400 | 400 | elif opts.get('no_checkout'): |
|
401 | 401 | cmd['-U'] = None |
|
402 | 402 | |
@@ -438,9 +438,9 b' def commit(ui, repo, *args, **kwargs):' | |||
|
438 | 438 | cmd['-m'] = "'%s'" % (opts.get('message'),) |
|
439 | 439 | |
|
440 | 440 | if opts.get('all'): |
|
441 |
ui.status(_("note: Mercurial doesn't have a staging area, " |
|
|
442 |
"so there is no --all. -A will add and remove files " |
|
|
443 | "for you though.\n\n")) | |
|
441 | ui.status(_("note: Mercurial doesn't have a staging area, " | |
|
442 | "so there is no --all. -A will add and remove files " | |
|
443 | "for you though.\n\n")) | |
|
444 | 444 | |
|
445 | 445 | if opts.get('file'): |
|
446 | 446 | cmd['-l'] = opts.get('file') |
@@ -456,8 +456,8 b' def commit(ui, repo, *args, **kwargs):' | |||
|
456 | 456 | ui.status((bytes(cmd)), "\n") |
|
457 | 457 | |
|
458 | 458 | def deprecated(ui, repo, *args, **kwargs): |
|
459 |
ui.warn(_('this command has been deprecated in the git project, ' |
|
|
460 | 'thus isn\'t supported by this tool.\n\n')) | |
|
459 | ui.warn(_('this command has been deprecated in the git project, ' | |
|
460 | 'thus isn\'t supported by this tool.\n\n')) | |
|
461 | 461 | |
|
462 | 462 | def diff(ui, repo, *args, **kwargs): |
|
463 | 463 | cmdoptions = [ |
@@ -470,8 +470,8 b' def diff(ui, repo, *args, **kwargs):' | |||
|
470 | 470 | cmd = Command('diff') |
|
471 | 471 | |
|
472 | 472 | if opts.get('cached'): |
|
473 |
ui.status(_('note: Mercurial has no concept of a staging area, ' |
|
|
474 | 'so --cached does nothing.\n\n')) | |
|
473 | ui.status(_('note: Mercurial has no concept of a staging area, ' | |
|
474 | 'so --cached does nothing.\n\n')) | |
|
475 | 475 | |
|
476 | 476 | if opts.get('reverse'): |
|
477 | 477 | cmd['--reverse'] = None |
@@ -507,10 +507,10 b' def fetch(ui, repo, *args, **kwargs):' | |||
|
507 | 507 | if len(args) > 0: |
|
508 | 508 | cmd.append(args[0]) |
|
509 | 509 | if len(args) > 1: |
|
510 |
ui.status(_("note: Mercurial doesn't have refspecs. " |
|
|
511 |
"-r can be used to specify which commits you want to |
|
|
512 |
"-B can be used to specify which bookmark you |
|
|
513 | "\n\n")) | |
|
510 | ui.status(_("note: Mercurial doesn't have refspecs. " | |
|
511 | "-r can be used to specify which commits you want to " | |
|
512 | "pull. -B can be used to specify which bookmark you " | |
|
513 | "want to pull.\n\n")) | |
|
514 | 514 | for v in args[1:]: |
|
515 | 515 | if v in repo._bookmarks: |
|
516 | 516 | cmd['-B'] = v |
@@ -558,10 +558,10 b' def log(ui, repo, *args, **kwargs):' | |||
|
558 | 558 | ('p', 'patch', None, ''), |
|
559 | 559 | ] |
|
560 | 560 | args, opts = parseoptions(ui, cmdoptions, args) |
|
561 |
ui.status(_('note: -v prints the entire commit message like Git does. To ' |
|
|
562 | 'print just the first line, drop the -v.\n\n')) | |
|
563 |
ui.status(_("note: see hg help revset for information on how to filter " |
|
|
564 | "log output.\n\n")) | |
|
561 | ui.status(_('note: -v prints the entire commit message like Git does. To ' | |
|
562 | 'print just the first line, drop the -v.\n\n')) | |
|
563 | ui.status(_("note: see hg help revset for information on how to filter " | |
|
564 | "log output.\n\n")) | |
|
565 | 565 | |
|
566 | 566 | cmd = Command('log') |
|
567 | 567 | cmd['-v'] = None |
@@ -580,13 +580,13 b' def log(ui, repo, *args, **kwargs):' | |||
|
580 | 580 | if opts.get('pretty') or opts.get('format') or opts.get('oneline'): |
|
581 | 581 | format = opts.get('format', '') |
|
582 | 582 | if 'format:' in format: |
|
583 |
ui.status(_("note: --format format:??? equates to Mercurial's " |
|
|
584 | "--template. See hg help templates for more info.\n\n")) | |
|
583 | ui.status(_("note: --format format:??? equates to Mercurial's " | |
|
584 | "--template. See hg help templates for more info.\n\n")) | |
|
585 | 585 | cmd['--template'] = '???' |
|
586 | 586 | else: |
|
587 |
ui.status(_("note: --pretty/format/oneline equate to Mercurial's " |
|
|
588 |
"--style or --template. See hg help templates for |
|
|
589 | "\n\n")) | |
|
587 | ui.status(_("note: --pretty/format/oneline equate to Mercurial's " | |
|
588 | "--style or --template. See hg help templates for " | |
|
589 | "more info.\n\n")) | |
|
590 | 590 | cmd['--style'] = '???' |
|
591 | 591 | |
|
592 | 592 | if len(args) > 0: |
@@ -699,10 +699,10 b' def pull(ui, repo, *args, **kwargs):' | |||
|
699 | 699 | if len(args) > 0: |
|
700 | 700 | cmd.append(args[0]) |
|
701 | 701 | if len(args) > 1: |
|
702 |
ui.status(_("note: Mercurial doesn't have refspecs. " |
|
|
703 |
"-r can be used to specify which commits you want to |
|
|
704 |
"-B can be used to specify which bookmark you |
|
|
705 | "\n\n")) | |
|
702 | ui.status(_("note: Mercurial doesn't have refspecs. " | |
|
703 | "-r can be used to specify which commits you want to " | |
|
704 | "pull. -B can be used to specify which bookmark you " | |
|
705 | "want to pull.\n\n")) | |
|
706 | 706 | for v in args[1:]: |
|
707 | 707 | if v in repo._bookmarks: |
|
708 | 708 | cmd['-B'] = v |
@@ -723,10 +723,10 b' def push(ui, repo, *args, **kwargs):' | |||
|
723 | 723 | if len(args) > 0: |
|
724 | 724 | cmd.append(args[0]) |
|
725 | 725 | if len(args) > 1: |
|
726 |
ui.status(_("note: Mercurial doesn't have refspecs. " |
|
|
727 |
"-r can be used to specify which commits you want |
|
|
728 |
"-B can be used to specify which bookmark |
|
|
729 | "\n\n")) | |
|
726 | ui.status(_("note: Mercurial doesn't have refspecs. " | |
|
727 | "-r can be used to specify which commits you want " | |
|
728 | "to push. -B can be used to specify which bookmark " | |
|
729 | "you want to push.\n\n")) | |
|
730 | 730 | for v in args[1:]: |
|
731 | 731 | if v in repo._bookmarks: |
|
732 | 732 | cmd['-B'] = v |
@@ -750,8 +750,8 b' def rebase(ui, repo, *args, **kwargs):' | |||
|
750 | 750 | args, opts = parseoptions(ui, cmdoptions, args) |
|
751 | 751 | |
|
752 | 752 | if opts.get('interactive'): |
|
753 |
ui.status(_("note: hg histedit does not perform a rebase. " |
|
|
754 | "It just edits history.\n\n")) | |
|
753 | ui.status(_("note: hg histedit does not perform a rebase. " | |
|
754 | "It just edits history.\n\n")) | |
|
755 | 755 | cmd = Command('histedit') |
|
756 | 756 | if len(args) > 0: |
|
757 | 757 | ui.status(_("also note: 'hg histedit' will automatically detect" |
@@ -771,9 +771,9 b' def rebase(ui, repo, *args, **kwargs):' | |||
|
771 | 771 | cmd['--abort'] = None |
|
772 | 772 | |
|
773 | 773 | if opts.get('onto'): |
|
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 |
|
|
776 | "\n\n")) | |
|
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 " | |
|
776 | "lifted>\n\n")) | |
|
777 | 777 | cmd['-d'] = convert(opts.get('onto')) |
|
778 | 778 | if len(args) < 2: |
|
779 | 779 | raise error.Abort(_("expected format: git rebase --onto X Y Z")) |
@@ -835,7 +835,7 b' def revert(ui, repo, *args, **kwargs):' | |||
|
835 | 835 | args, opts = parseoptions(ui, cmdoptions, args) |
|
836 | 836 | |
|
837 | 837 | if len(args) > 1: |
|
838 |
ui.status(_("note: hg backout doesn't support multiple commits at " |
|
|
838 | ui.status(_("note: hg backout doesn't support multiple commits at " | |
|
839 | 839 | "once\n\n")) |
|
840 | 840 | |
|
841 | 841 | cmd = Command('backout') |
@@ -932,8 +932,8 b' def stash(ui, repo, *args, **kwargs):' | |||
|
932 | 932 | cmd['--keep'] = None |
|
933 | 933 | elif (action == 'branch' or action == 'show' or action == 'clear' |
|
934 | 934 | or action == 'create'): |
|
935 |
ui.status(_("note: Mercurial doesn't have equivalents to the " |
|
|
936 | "git stash branch, show, clear, or create actions.\n\n")) | |
|
935 | ui.status(_("note: Mercurial doesn't have equivalents to the " | |
|
936 | "git stash branch, show, clear, or create actions.\n\n")) | |
|
937 | 937 | return |
|
938 | 938 | else: |
|
939 | 939 | if len(args) > 0: |
General Comments 0
You need to be logged in to leave comments.
Login now