diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -467,6 +467,6 @@ cmdtable = { ('c', 'continue', False, _('continue an interrupted rebase')), ('a', 'abort', False, _('abort an interrupted rebase')),] + templateopts, - _('hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] ' + _('hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] ' '[--keepbranches] | [-c] | [-a]')), } diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3230,7 +3230,7 @@ table = { _('[OPTION]... PATTERN [FILE]...')), "heads": (heads, - [('r', 'rev', '', _('show only heads which are descendants of rev')), + [('r', 'rev', '', _('show only heads which are descendants of REV')), ('a', 'active', False, _('show only the active heads from open branches')), ] + templateopts, @@ -3276,7 +3276,7 @@ table = { _('[-e CMD] [--remotecmd CMD] [DEST]')), "locate": (locate, - [('r', 'rev', '', _('search the repository as it stood at rev')), + [('r', 'rev', '', _('search the repository as it stood at REV')), ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), ('f', 'fullpath', None, diff --git a/tests/test-rebase-parameters.out b/tests/test-rebase-parameters.out --- a/tests/test-rebase-parameters.out +++ b/tests/test-rebase-parameters.out @@ -2,7 +2,7 @@ % Use continue and abort hg rebase: cannot use both abort and continue -hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] +hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -30,7 +30,7 @@ use "hg -v help rebase" to show global o % Use continue and collapse hg rebase: cannot use collapse with continue or abort -hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] +hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -58,7 +58,7 @@ use "hg -v help rebase" to show global o % Use continue/abort and dest/source hg rebase: abort and continue do not allow specifying revisions -hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] +hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -86,7 +86,7 @@ use "hg -v help rebase" to show global o % Use source and base hg rebase: cannot specify both a revision and a base -hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] +hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch