diff --git a/hgext/children.py b/hgext/children.py --- a/hgext/children.py +++ b/hgext/children.py @@ -35,7 +35,7 @@ def children(ui, repo, file_=None, **opt cmdtable = { "children": (children, - [('r', 'rev', '', _('show children of the specified rev')), + [('r', 'rev', '', _('show children of the specified revision')), ] + templateopts, _('hg children [-r REV] [FILE]')), } diff --git a/hgext/churn.py b/hgext/churn.py --- a/hgext/churn.py +++ b/hgext/churn.py @@ -150,7 +150,7 @@ cmdtable = { "churn": (churn, [('r', 'rev', [], _('count rate for the specified revision or range')), - ('d', 'date', '', _('count rate for revs matching date spec')), + ('d', 'date', '', _('count rate for revisions matching date spec')), ('t', 'template', '{author|email}', _('template to group changesets')), ('f', 'dateformat', '', _('strftime-compatible format for grouping by date')), diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py +++ b/hgext/convert/cvsps.py @@ -370,7 +370,7 @@ def createlog(ui, directory=None, root=" e.revision[-1] == 1 and # 1.1 or 1.1.x.1 len(e.comment) == 1 and file_added_re.match(e.comment[0])): - ui.debug(_('found synthetic rev in %s: %r\n') + ui.debug(_('found synthetic revision in %s: %r\n') % (e.rcs, e.comment[0])) e.synthetic = True diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -2178,7 +2178,7 @@ def rename(ui, repo, patch, name=None, * q.save_dirty() def restore(ui, repo, rev, **opts): - """restore the queue state saved by a rev""" + """restore the queue state saved by a revision""" rev = repo.lookup(rev) q = repo.mq q.restore(repo, rev, delete=opts['delete'], diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3220,7 +3220,7 @@ table = { _('follow changeset history, or file history across copies and renames')), ('i', 'ignore-case', None, _('ignore case when matching')), ('l', 'files-with-matches', None, - _('print only filenames and revs that match')), + _('print only filenames and revisions that match')), ('n', 'line-number', None, _('print matching line numbers')), ('r', 'rev', [], _('search in given revision range')), ('u', 'user', None, _('list the author (long with -v)')), @@ -3237,7 +3237,7 @@ table = { "help": (help_, [], _('[TOPIC]')), "identify|id": (identify, - [('r', 'rev', '', _('identify the specified rev')), + [('r', 'rev', '', _('identify the specified revision')), ('n', 'num', None, _('show local revision number')), ('i', 'id', None, _('show global revision id')), ('b', 'branch', None, _('show branch')), @@ -3288,13 +3288,13 @@ table = { _('follow changeset history, or file history across copies and renames')), ('', 'follow-first', None, _('only follow the first parent of merge changesets')), - ('d', 'date', '', _('show revs matching date spec')), + ('d', 'date', '', _('show revisions matching date spec')), ('C', 'copies', None, _('show copied files')), ('k', 'keyword', [], _('do case-insensitive search for a keyword')), ('r', 'rev', [], _('show the specified revision or range')), - ('', 'removed', None, _('include revs where files were removed')), + ('', 'removed', None, _('include revisions where files were removed')), ('m', 'only-merges', None, _('show only merges')), - ('u', 'user', [], _('revs committed by user')), + ('u', 'user', [], _('revisions committed by user')), ('b', 'only-branch', [], _('show only changesets within the given named branch')), ('P', 'prune', [], _('do not display revision or any of its ancestors')), @@ -3321,7 +3321,7 @@ table = { _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), "^parents": (parents, - [('r', 'rev', '', _('show parents from the specified rev')), + [('r', 'rev', '', _('show parents from the specified revision')), ] + templateopts, _('hg parents [-r REV] [FILE]')), "paths": (paths, [], _('[NAME]')), diff --git a/tests/test-mq.out b/tests/test-mq.out --- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -43,7 +43,7 @@ list of commands: qpush push the next patch onto the stack qrefresh update the current patch qrename rename a patch - qrestore restore the queue state saved by a rev + qrestore restore the queue state saved by a revision qsave save current queue state qselect set or print guarded patches to push qseries print the entire series file