##// END OF EJS Templates
githelp: do not concatenate i18n messages dynamically so they can be collected
Yuya Nishihara -
r38143:c65931d2 default
parent child Browse files
Show More
@@ -395,7 +395,7 b' def clone(ui, repo, *args, **kwargs):'
395
395
396 if opts.get('bare'):
396 if opts.get('bare'):
397 cmd['-U'] = None
397 cmd['-U'] = None
398 ui.status(_("note: Mercurial does not have bare clones. " +
398 ui.status(_("note: Mercurial does not have bare clones. "
399 "-U will clone the repo without checking out a commit\n\n"))
399 "-U will clone the repo without checking out a commit\n\n"))
400 elif opts.get('no_checkout'):
400 elif opts.get('no_checkout'):
401 cmd['-U'] = None
401 cmd['-U'] = None
@@ -438,8 +438,8 b' def commit(ui, repo, *args, **kwargs):'
438 cmd['-m'] = "'%s'" % (opts.get('message'),)
438 cmd['-m'] = "'%s'" % (opts.get('message'),)
439
439
440 if opts.get('all'):
440 if opts.get('all'):
441 ui.status(_("note: Mercurial doesn't have a staging area, " +
441 ui.status(_("note: Mercurial doesn't have a staging area, "
442 "so there is no --all. -A will add and remove files " +
442 "so there is no --all. -A will add and remove files "
443 "for you though.\n\n"))
443 "for you though.\n\n"))
444
444
445 if opts.get('file'):
445 if opts.get('file'):
@@ -456,7 +456,7 b' def commit(ui, repo, *args, **kwargs):'
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):
@@ -470,7 +470,7 b' def diff(ui, repo, *args, **kwargs):'
470 cmd = Command('diff')
470 cmd = Command('diff')
471
471
472 if opts.get('cached'):
472 if opts.get('cached'):
473 ui.status(_('note: Mercurial has no concept of a staging area, ' +
473 ui.status(_('note: Mercurial has no concept of a staging area, '
474 'so --cached does nothing.\n\n'))
474 'so --cached does nothing.\n\n'))
475
475
476 if opts.get('reverse'):
476 if opts.get('reverse'):
@@ -507,10 +507,10 b' def fetch(ui, repo, *args, **kwargs):'
507 if len(args) > 0:
507 if len(args) > 0:
508 cmd.append(args[0])
508 cmd.append(args[0])
509 if len(args) > 1:
509 if len(args) > 1:
510 ui.status(_("note: Mercurial doesn't have refspecs. " +
510 ui.status(_("note: Mercurial doesn't have refspecs. "
511 "-r can be used to specify which commits you want to pull. " +
511 "-r can be used to specify which commits you want to "
512 "-B can be used to specify which bookmark you want to pull." +
512 "pull. -B can be used to specify which bookmark you "
513 "\n\n"))
513 "want to pull.\n\n"))
514 for v in args[1:]:
514 for v in args[1:]:
515 if v in repo._bookmarks:
515 if v in repo._bookmarks:
516 cmd['-B'] = v
516 cmd['-B'] = v
@@ -558,9 +558,9 b' def log(ui, repo, *args, **kwargs):'
558 ('p', 'patch', None, ''),
558 ('p', 'patch', None, ''),
559 ]
559 ]
560 args, opts = parseoptions(ui, cmdoptions, args)
560 args, opts = parseoptions(ui, cmdoptions, args)
561 ui.status(_('note: -v prints the entire commit message like Git does. To ' +
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'))
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 " +
563 ui.status(_("note: see hg help revset for information on how to filter "
564 "log output.\n\n"))
564 "log output.\n\n"))
565
565
566 cmd = Command('log')
566 cmd = Command('log')
@@ -580,13 +580,13 b' def log(ui, repo, *args, **kwargs):'
580 if opts.get('pretty') or opts.get('format') or opts.get('oneline'):
580 if opts.get('pretty') or opts.get('format') or opts.get('oneline'):
581 format = opts.get('format', '')
581 format = opts.get('format', '')
582 if 'format:' in format:
582 if 'format:' in format:
583 ui.status(_("note: --format format:??? equates to Mercurial's " +
583 ui.status(_("note: --format format:??? equates to Mercurial's "
584 "--template. See hg help templates for more info.\n\n"))
584 "--template. See hg help templates for more info.\n\n"))
585 cmd['--template'] = '???'
585 cmd['--template'] = '???'
586 else:
586 else:
587 ui.status(_("note: --pretty/format/oneline equate to Mercurial's " +
587 ui.status(_("note: --pretty/format/oneline equate to Mercurial's "
588 "--style or --template. See hg help templates for more info." +
588 "--style or --template. See hg help templates for "
589 "\n\n"))
589 "more info.\n\n"))
590 cmd['--style'] = '???'
590 cmd['--style'] = '???'
591
591
592 if len(args) > 0:
592 if len(args) > 0:
@@ -699,10 +699,10 b' def pull(ui, repo, *args, **kwargs):'
699 if len(args) > 0:
699 if len(args) > 0:
700 cmd.append(args[0])
700 cmd.append(args[0])
701 if len(args) > 1:
701 if len(args) > 1:
702 ui.status(_("note: Mercurial doesn't have refspecs. " +
702 ui.status(_("note: Mercurial doesn't have refspecs. "
703 "-r can be used to specify which commits you want to pull. " +
703 "-r can be used to specify which commits you want to "
704 "-B can be used to specify which bookmark you want to pull." +
704 "pull. -B can be used to specify which bookmark you "
705 "\n\n"))
705 "want to pull.\n\n"))
706 for v in args[1:]:
706 for v in args[1:]:
707 if v in repo._bookmarks:
707 if v in repo._bookmarks:
708 cmd['-B'] = v
708 cmd['-B'] = v
@@ -723,10 +723,10 b' def push(ui, repo, *args, **kwargs):'
723 if len(args) > 0:
723 if len(args) > 0:
724 cmd.append(args[0])
724 cmd.append(args[0])
725 if len(args) > 1:
725 if len(args) > 1:
726 ui.status(_("note: Mercurial doesn't have refspecs. " +
726 ui.status(_("note: Mercurial doesn't have refspecs. "
727 "-r can be used to specify which commits you want to push. " +
727 "-r can be used to specify which commits you want "
728 "-B can be used to specify which bookmark you want to push." +
728 "to push. -B can be used to specify which bookmark "
729 "\n\n"))
729 "you want to push.\n\n"))
730 for v in args[1:]:
730 for v in args[1:]:
731 if v in repo._bookmarks:
731 if v in repo._bookmarks:
732 cmd['-B'] = v
732 cmd['-B'] = v
@@ -750,7 +750,7 b' def rebase(ui, repo, *args, **kwargs):'
750 args, opts = parseoptions(ui, cmdoptions, args)
750 args, opts = parseoptions(ui, cmdoptions, args)
751
751
752 if opts.get('interactive'):
752 if opts.get('interactive'):
753 ui.status(_("note: hg histedit does not perform a rebase. " +
753 ui.status(_("note: hg histedit does not perform a rebase. "
754 "It just edits history.\n\n"))
754 "It just edits history.\n\n"))
755 cmd = Command('histedit')
755 cmd = Command('histedit')
756 if len(args) > 0:
756 if len(args) > 0:
@@ -771,9 +771,9 b' def rebase(ui, repo, *args, **kwargs):'
771 cmd['--abort'] = None
771 cmd['--abort'] = None
772
772
773 if opts.get('onto'):
773 if opts.get('onto'):
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 "
776 "\n\n"))
776 "lifted>\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"))
@@ -835,7 +835,7 b' def revert(ui, repo, *args, **kwargs):'
835 args, opts = parseoptions(ui, cmdoptions, args)
835 args, opts = parseoptions(ui, cmdoptions, args)
836
836
837 if len(args) > 1:
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 "once\n\n"))
839 "once\n\n"))
840
840
841 cmd = Command('backout')
841 cmd = Command('backout')
@@ -932,7 +932,7 b' def stash(ui, repo, *args, **kwargs):'
932 cmd['--keep'] = None
932 cmd['--keep'] = None
933 elif (action == 'branch' or action == 'show' or action == 'clear'
933 elif (action == 'branch' or action == 'show' or action == 'clear'
934 or action == 'create'):
934 or action == 'create'):
935 ui.status(_("note: Mercurial doesn't have equivalents to the " +
935 ui.status(_("note: Mercurial doesn't have equivalents to the "
936 "git stash branch, show, clear, or create actions.\n\n"))
936 "git stash branch, show, clear, or create actions.\n\n"))
937 return
937 return
938 else:
938 else:
General Comments 0
You need to be logged in to leave comments. Login now