--- a/hgext/mq.py Tue Jun 26 20:37:15 2007 +0200
+++ b/hgext/mq.py Tue Jun 26 22:38:57 2007 +0200
@@ -2080,44 +2080,49 @@
seriesopts = [('s', 'summary', None, _('print first line of patch header'))]
cmdtable = {
- "qapplied": (applied, [] + seriesopts, 'hg qapplied [-s] [PATCH]'),
- "qclone": (clone,
- [('', 'pull', None, _('use pull protocol to copy metadata')),
- ('U', 'noupdate', None, _('do not update the new working directories')),
- ('', 'uncompressed', None,
- _('use uncompressed transfer (fast over LAN)')),
- ('e', 'ssh', '', _('specify ssh command to use')),
- ('p', 'patches', '', _('location of source patch repo')),
- ('', 'remotecmd', '',
- _('specify hg command to run on the remote side'))],
- 'hg qclone [OPTION]... SOURCE [DEST]'),
+ "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')),
+ "qclone":
+ (clone,
+ [('', 'pull', None, _('use pull protocol to copy metadata')),
+ ('U', 'noupdate', None, _('do not update the new working directories')),
+ ('', 'uncompressed', None,
+ _('use uncompressed transfer (fast over LAN)')),
+ ('e', 'ssh', '', _('specify ssh command to use')),
+ ('p', 'patches', '', _('location of source patch repo')),
+ ('', 'remotecmd', '',
+ _('specify hg command to run on the remote side'))],
+ _('hg qclone [OPTION]... SOURCE [DEST]')),
"qcommit|qci":
(commit,
commands.table["^commit|ci"][1],
- 'hg qcommit [OPTION]... [FILE]...'),
- "^qdiff": (diff,
- [('g', 'git', None, _('use git extended diff format')),
- ('I', 'include', [], _('include names matching the given patterns')),
- ('X', 'exclude', [], _('exclude names matching the given patterns'))],
- 'hg qdiff [-I] [-X] [FILE]...'),
+ _('hg qcommit [OPTION]... [FILE]...')),
+ "^qdiff":
+ (diff,
+ [('g', 'git', None, _('use git extended diff format')),
+ ('I', 'include', [], _('include names matching the given patterns')),
+ ('X', 'exclude', [], _('exclude names matching the given patterns'))],
+ _('hg qdiff [-I] [-X] [-g] [FILE]...')),
"qdelete|qremove|qrm":
(delete,
[('k', 'keep', None, _('keep patch file')),
('r', 'rev', [], _('stop managing a revision'))],
- 'hg qdelete [-k] [-r REV]... PATCH...'),
+ _('hg qdelete [-k] [-r REV]... PATCH...')),
'qfold':
(fold,
[('e', 'edit', None, _('edit patch header')),
- ('k', 'keep', None, _('keep folded patch files'))
- ] + commands.commitopts,
- 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'),
- 'qgoto': (goto, [('f', 'force', None, _('overwrite any local changes'))],
- 'hg qgoto [OPT]... PATCH'),
- 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')),
- ('n', 'none', None, _('drop all guards'))],
- 'hg qguard [PATCH] [+GUARD]... [-GUARD]...'),
- 'qheader': (header, [],
- _('hg qheader [PATCH]')),
+ ('k', 'keep', None, _('keep folded patch files')),
+ ] + commands.commitopts,
+ _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')),
+ 'qgoto':
+ (goto,
+ [('f', 'force', None, _('overwrite any local changes'))],
+ _('hg qgoto [OPTION]... PATCH')),
+ 'qguard':
+ (guard,
+ [('l', 'list', None, _('list all patches and guards')),
+ ('n', 'none', None, _('drop all guards'))],
+ _('hg qguard [-l] [-n] [PATCH] [+GUARD]... [-GUARD]...')),
+ 'qheader': (header, [], _('hg qheader [PATCH]')),
"^qimport":
(qimport,
[('e', 'existing', None, 'import file in patch dir'),
@@ -2125,75 +2130,76 @@
('f', 'force', None, 'overwrite existing files'),
('r', 'rev', [], 'place existing revisions under mq control'),
('g', 'git', None, _('use git extended diff format'))],
- 'hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...'),
+ _('hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...')),
"^qinit":
(init,
[('c', 'create-repo', None, 'create queue repository')],
- 'hg qinit [-c]'),
+ _('hg qinit [-c]')),
"qnew":
(new,
[('e', 'edit', None, _('edit commit message')),
('f', 'force', None, _('import uncommitted changes into patch')),
('I', 'include', [], _('include names matching the given patterns')),
- ('X', 'exclude', [], _('exclude names matching the given patterns'))
+ ('X', 'exclude', [], _('exclude names matching the given patterns')),
] + commands.commitopts,
- 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...'),
- "qnext": (next, [] + seriesopts, 'hg qnext [-s]'),
- "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'),
+ _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')),
+ "qnext": (next, [] + seriesopts, _('hg qnext [-s]')),
+ "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')),
"^qpop":
(pop,
- [('a', 'all', None, 'pop all patches'),
- ('n', 'name', '', 'queue name to pop'),
- ('f', 'force', None, 'forget any local changes')],
- 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'),
+ [('a', 'all', None, _('pop all patches')),
+ ('n', 'name', '', _('queue name to pop')),
+ ('f', 'force', None, _('forget any local changes'))],
+ _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')),
"^qpush":
(push,
- [('f', 'force', None, 'apply if the patch has rejects'),
- ('l', 'list', None, 'list patch name in commit text'),
- ('a', 'all', None, 'apply all patches'),
- ('m', 'merge', None, 'merge from another queue'),
- ('n', 'name', '', 'merge queue name')],
- 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'),
+ [('f', 'force', None, _('apply if the patch has rejects')),
+ ('l', 'list', None, _('list patch name in commit text')),
+ ('a', 'all', None, _('apply all patches')),
+ ('m', 'merge', None, _('merge from another queue')),
+ ('n', 'name', '', _('merge queue name'))],
+ _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]')),
"^qrefresh":
(refresh,
[('e', 'edit', None, _('edit commit message')),
('g', 'git', None, _('use git extended diff format')),
- ('s', 'short', None, 'refresh only files already in the patch'),
+ ('s', 'short', None, _('refresh only files already in the patch')),
('I', 'include', [], _('include names matching the given patterns')),
- ('X', 'exclude', [], _('exclude names matching the given patterns'))
+ ('X', 'exclude', [], _('exclude names matching the given patterns')),
] + commands.commitopts,
- 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'),
+ _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
'qrename|qmv':
- (rename, [], 'hg qrename PATCH1 [PATCH2]'),
+ (rename, [], _('hg qrename PATCH1 [PATCH2]')),
"qrestore":
(restore,
- [('d', 'delete', None, 'delete save entry'),
- ('u', 'update', None, 'update queue working dir')],
- 'hg qrestore [-d] [-u] REV'),
+ [('d', 'delete', None, _('delete save entry')),
+ ('u', 'update', None, _('update queue working dir'))],
+ _('hg qrestore [-d] [-u] REV')),
"qsave":
(save,
- [('c', 'copy', None, 'copy patch directory'),
- ('n', 'name', '', 'copy directory name'),
- ('e', 'empty', None, 'clear queue status file'),
- ('f', 'force', None, 'force copy')] + commands.commitopts,
- 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'),
- "qselect": (select,
- [('n', 'none', None, _('disable all guards')),
- ('s', 'series', None, _('list all guards in series file')),
- ('', 'pop', None,
- _('pop to before first guarded applied patch')),
- ('', 'reapply', None, _('pop, then reapply patches'))],
- 'hg qselect [OPTION]... [GUARD]...'),
+ [('c', 'copy', None, _('copy patch directory')),
+ ('n', 'name', '', _('copy directory name')),
+ ('e', 'empty', None, _('clear queue status file')),
+ ('f', 'force', None, _('force copy'))] + commands.commitopts,
+ _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')),
+ "qselect":
+ (select,
+ [('n', 'none', None, _('disable all guards')),
+ ('s', 'series', None, _('list all guards in series file')),
+ ('', 'pop', None, _('pop to before first guarded applied patch')),
+ ('', 'reapply', None, _('pop, then reapply patches'))],
+ _('hg qselect [OPTION]... [GUARD]...')),
"qseries":
(series,
- [('m', 'missing', None, 'print patches not in series')] + seriesopts,
- 'hg qseries [-ms]'),
+ [('m', 'missing', None, _('print patches not in series')),
+ ] + seriesopts,
+ _('hg qseries [-ms]')),
"^strip":
(strip,
- [('f', 'force', None, 'force multi-head removal'),
- ('b', 'backup', None, 'bundle unrelated changesets'),
- ('n', 'nobackup', None, 'no backups')],
- 'hg strip [-f] [-b] [-n] REV'),
- "qtop": (top, [] + seriesopts, 'hg qtop [-s]'),
- "qunapplied": (unapplied, [] + seriesopts, 'hg qunapplied [-s] [PATCH]'),
+ [('f', 'force', None, _('force multi-head removal')),
+ ('b', 'backup', None, _('bundle unrelated changesets')),
+ ('n', 'nobackup', None, _('no backups'))],
+ _('hg strip [-f] [-b] [-n] REV')),
+ "qtop": (top, [] + seriesopts, _('hg qtop [-s]')),
+ "qunapplied": (unapplied, [] + seriesopts, _('hg qunapplied [-s] [PATCH]')),
}