--- a/mercurial/commands.py Fri Nov 27 18:26:25 2009 +0000
+++ b/mercurial/commands.py Sat Nov 28 23:58:03 2009 +0100
@@ -470,9 +470,9 @@
elif hn not in repo.branchheads(tag, closed=False):
if not closed:
continue
- notice = ' (closed)'
+ notice = _(' (closed)')
else:
- notice = ' (inactive)'
+ notice = _(' (inactive)')
rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
data = encodedtag, rev, hexfunc(hn), notice
ui.write("%s %s:%s%s\n" % data)
@@ -3339,7 +3339,7 @@
('s', 'skip', False, _('skip testing changeset')),
('c', 'command', '', _('use command to check changeset state')),
('U', 'noupdate', False, _('do not update to target'))],
- _("[-gbsr] [-c CMD] [REV]")),
+ _("[-gbsr] [-U] [-c CMD] [REV]")),
"branch":
(branch,
[('f', 'force', None,
@@ -3352,7 +3352,7 @@
_('show only branches that have unmerged heads')),
('c', 'closed', False,
_('show normal and closed branches'))],
- _('[-a]')),
+ _('[-ac]')),
"bundle":
(bundle,
[('f', 'force', None,
@@ -3364,7 +3364,7 @@
('a', 'all', None, _('bundle all changesets in the repository')),
('t', 'type', 'bzip2', _('bundle compression type to use')),
] + remoteopts,
- _('[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
+ _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
"cat":
(cat,
[('o', 'output', '', _('print output to file with formatted name')),
@@ -3474,7 +3474,7 @@
('c', 'closed', False,
_('show normal and closed branch heads')),
] + templateopts,
- _('[-r STARTREV] [REV]...')),
+ _('[-ac] [-r STARTREV] [REV]...')),
"help": (help_, [], _('[TOPIC]')),
"identify|id":
(identify,
@@ -3551,7 +3551,7 @@
('r', 'rev', '', _('revision to merge')),
('P', 'preview', None,
_('review revisions to merge (no merge is performed)'))],
- _('[-f] [[-r] REV]')),
+ _('[-P] [-f] [[-r] REV]')),
"outgoing|out":
(outgoing,
[('f', 'force', None,
@@ -3671,14 +3671,14 @@
# -l/--local is already there, commitopts cannot be used
('m', 'message', '', _('use <text> as commit message')),
] + commitopts2,
- _('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
+ _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
"tags": (tags, [], ''),
"tip":
(tip,
[('p', 'patch', None, _('show patch')),
('g', 'git', None, _('use git extended diff format')),
] + templateopts,
- _('[-p]')),
+ _('[-p] [-g]')),
"unbundle":
(unbundle,
[('u', 'update', None,