Show More
@@ -189,4 +189,4 b' def uisetup(ui):' | |||||
189 | return mydiff |
|
189 | return mydiff | |
190 | cmdtable[cmd] = (save(cmd, path, diffopts), |
|
190 | cmdtable[cmd] = (save(cmd, path, diffopts), | |
191 | cmdtable['extdiff'][1][1:], |
|
191 | cmdtable['extdiff'][1][1:], | |
192 | _('hg %s [OPT]... [FILE]...') % cmd) |
|
192 | _('hg %s [OPTION]... [FILE]...') % cmd) |
@@ -85,14 +85,14 b" def fetch(ui, repo, source='default', **" | |||||
85 |
|
85 | |||
86 | cmdtable = { |
|
86 | cmdtable = { | |
87 | 'fetch': |
|
87 | 'fetch': | |
88 | (fetch, |
|
88 | (fetch, | |
89 | [('e', 'ssh', '', _('specify ssh command to use')), |
|
89 | [('e', 'ssh', '', _('specify ssh command to use')), | |
90 | ('m', 'message', '', _('use <text> as commit message')), |
|
90 | ('m', 'message', '', _('use <text> as commit message')), | |
91 | ('l', 'logfile', '', _('read the commit message from <file>')), |
|
91 | ('l', 'logfile', '', _('read the commit message from <file>')), | |
92 | ('d', 'date', '', _('record datecode as commit date')), |
|
92 | ('d', 'date', '', _('record datecode as commit date')), | |
93 | ('u', 'user', '', _('record user as commiter')), |
|
93 | ('u', 'user', '', _('record user as commiter')), | |
94 | ('r', 'rev', [], _('a specific revision you would like to pull')), |
|
94 | ('r', 'rev', [], _('a specific revision you would like to pull')), | |
95 | ('f', 'force-editor', None, _('edit commit message')), |
|
95 | ('f', 'force-editor', None, _('edit commit message')), | |
96 | ('', 'remotecmd', '', _('hg command to run on the remote side'))], |
|
96 | ('', 'remotecmd', '', _('hg command to run on the remote side'))], | |
97 | 'hg fetch [SOURCE]'), |
|
97 | _('hg fetch [SOURCE]')), | |
98 | } |
|
98 | } |
@@ -266,14 +266,14 b' def node2txt(repo, node, ver):' | |||||
266 | cmdtable = { |
|
266 | cmdtable = { | |
267 | "sign": |
|
267 | "sign": | |
268 | (sign, |
|
268 | (sign, | |
269 |
[('l', 'local', None, _( |
|
269 | [('l', 'local', None, _('make the signature local')), | |
270 |
('f', 'force', None, _( |
|
270 | ('f', 'force', None, _('sign even if the sigfile is modified')), | |
271 |
('', 'no-commit', None, _( |
|
271 | ('', 'no-commit', None, _('do not commit the sigfile after signing')), | |
272 |
('m', 'message', |
|
272 | ('m', 'message', '', _('commit message')), | |
273 |
('d', 'date', |
|
273 | ('d', 'date', '', _('date code')), | |
274 |
('u', 'user', |
|
274 | ('u', 'user', '', _('user')), | |
275 |
('k', 'key', |
|
275 | ('k', 'key', '', _('the key id to sign with'))], | |
276 |
_( |
|
276 | _('hg sign [OPTION]... [REVISION]...')), | |
277 | "sigcheck": (check, [], _('hg sigcheck REVISION')), |
|
277 | "sigcheck": (check, [], _('hg sigcheck REVISION')), | |
278 | "sigs": (sigs, [], _('hg sigs')), |
|
278 | "sigs": (sigs, [], _('hg sigs')), | |
279 | } |
|
279 | } |
@@ -255,11 +255,11 b' def graphlog(ui, repo, *args, **opts):' | |||||
255 |
|
255 | |||
256 | cmdtable = { |
|
256 | cmdtable = { | |
257 | "glog": |
|
257 | "glog": | |
258 | (graphlog, |
|
258 | (graphlog, | |
259 |
[( |
|
259 | [('l', 'limit', '', _('limit number of changes displayed')), | |
260 |
( |
|
260 | ('p', 'patch', False, _('show patch')), | |
261 |
( |
|
261 | ('r', 'rev', [], _('show the specified revision or range')), | |
262 |
( |
|
262 | ('', 'style', '', _('display using template map file')), | |
263 |
( |
|
263 | ('', 'template', '', _('display with template'))], | |
264 |
|
|
264 | _('hg glog [OPTION]...')), | |
265 | } |
|
265 | } |
@@ -275,25 +275,34 b' def view(ui, repo, *etc, **opts):' | |||||
275 | util.system(cmd) |
|
275 | util.system(cmd) | |
276 |
|
276 | |||
277 | cmdtable = { |
|
277 | cmdtable = { | |
278 |
"^view": |
|
278 | "^view": | |
279 | [('l', 'limit', '', 'limit number of changes displayed')], |
|
279 | (view, | |
280 | 'hg view [-l LIMIT] [REVRANGE]'), |
|
280 | [('l', 'limit', '', 'limit number of changes displayed')], | |
281 | "debug-diff-tree": (difftree, [('p', 'patch', None, 'generate patch'), |
|
281 | 'hg view [-l LIMIT] [REVRANGE]'), | |
282 | ('r', 'recursive', None, 'recursive'), |
|
282 | "debug-diff-tree": | |
283 | ('P', 'pretty', None, 'pretty'), |
|
283 | (difftree, | |
284 | ('s', 'stdin', None, 'stdin'), |
|
284 | [('p', 'patch', None, 'generate patch'), | |
285 |
|
|
285 | ('r', 'recursive', None, 'recursive'), | |
286 | ('S', 'search', "", 'search')], |
|
286 | ('P', 'pretty', None, 'pretty'), | |
287 | "hg git-diff-tree [options] node1 node2 [files...]"), |
|
287 | ('s', 'stdin', None, 'stdin'), | |
288 | "debug-cat-file": (catfile, [('s', 'stdin', None, 'stdin')], |
|
288 | ('C', 'copy', None, 'detect copies'), | |
289 | "hg debug-cat-file [options] type file"), |
|
289 | ('S', 'search', "", 'search')], | |
290 | "debug-merge-base": (base, [], "hg debug-merge-base node node"), |
|
290 | 'hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]...'), | |
291 | 'debug-rev-parse': (revparse, |
|
291 | "debug-cat-file": | |
292 | [('', 'default', '', 'ignored')], |
|
292 | (catfile, | |
293 | "hg debug-rev-parse rev"), |
|
293 | [('s', 'stdin', None, 'stdin')], | |
294 | "debug-rev-list": (revlist, [('H', 'header', None, 'header'), |
|
294 | 'hg debug-cat-file [OPTION]... TYPE FILE'), | |
295 | ('t', 'topo-order', None, 'topo-order'), |
|
295 | "debug-merge-base": | |
296 | ('p', 'parents', None, 'parents'), |
|
296 | (base, [], 'hg debug-merge-base node node'), | |
297 | ('n', 'max-count', 0, 'max-count')], |
|
297 | "debug-rev-parse": | |
298 | "hg debug-rev-list [options] revs"), |
|
298 | (revparse, | |
|
299 | [('', 'default', '', 'ignored')], | |||
|
300 | 'hg debug-rev-parse REV'), | |||
|
301 | "debug-rev-list": | |||
|
302 | (revlist, | |||
|
303 | [('H', 'header', None, 'header'), | |||
|
304 | ('t', 'topo-order', None, 'topo-order'), | |||
|
305 | ('p', 'parents', None, 'parents'), | |||
|
306 | ('n', 'max-count', 0, 'max-count')], | |||
|
307 | 'hg debug-rev-list [options] revs'), | |||
299 | } |
|
308 | } |
@@ -2080,44 +2080,49 b' def reposetup(ui, repo):' | |||||
2080 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] |
|
2080 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] | |
2081 |
|
2081 | |||
2082 | cmdtable = { |
|
2082 | cmdtable = { | |
2083 | "qapplied": (applied, [] + seriesopts, 'hg qapplied [-s] [PATCH]'), |
|
2083 | "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')), | |
2084 |
"qclone": |
|
2084 | "qclone": | |
2085 | [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
2085 | (clone, | |
2086 | ('U', 'noupdate', None, _('do not update the new working directories')), |
|
2086 | [('', 'pull', None, _('use pull protocol to copy metadata')), | |
2087 | ('', 'uncompressed', None, |
|
2087 | ('U', 'noupdate', None, _('do not update the new working directories')), | |
2088 | _('use uncompressed transfer (fast over LAN)')), |
|
2088 | ('', 'uncompressed', None, | |
2089 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
2089 | _('use uncompressed transfer (fast over LAN)')), | |
2090 | ('p', 'patches', '', _('location of source patch repo')), |
|
2090 | ('e', 'ssh', '', _('specify ssh command to use')), | |
2091 | ('', 'remotecmd', '', |
|
2091 | ('p', 'patches', '', _('location of source patch repo')), | |
2092 | _('specify hg command to run on the remote side'))], |
|
2092 | ('', 'remotecmd', '', | |
2093 | 'hg qclone [OPTION]... SOURCE [DEST]'), |
|
2093 | _('specify hg command to run on the remote side'))], | |
|
2094 | _('hg qclone [OPTION]... SOURCE [DEST]')), | |||
2094 | "qcommit|qci": |
|
2095 | "qcommit|qci": | |
2095 | (commit, |
|
2096 | (commit, | |
2096 | commands.table["^commit|ci"][1], |
|
2097 | commands.table["^commit|ci"][1], | |
2097 | 'hg qcommit [OPTION]... [FILE]...'), |
|
2098 | _('hg qcommit [OPTION]... [FILE]...')), | |
2098 |
"^qdiff": |
|
2099 | "^qdiff": | |
2099 | [('g', 'git', None, _('use git extended diff format')), |
|
2100 | (diff, | |
2100 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2101 | [('g', 'git', None, _('use git extended diff format')), | |
2101 |
|
|
2102 | ('I', 'include', [], _('include names matching the given patterns')), | |
2102 | 'hg qdiff [-I] [-X] [FILE]...'), |
|
2103 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
|
2104 | _('hg qdiff [-I] [-X] [-g] [FILE]...')), | |||
2103 | "qdelete|qremove|qrm": |
|
2105 | "qdelete|qremove|qrm": | |
2104 | (delete, |
|
2106 | (delete, | |
2105 | [('k', 'keep', None, _('keep patch file')), |
|
2107 | [('k', 'keep', None, _('keep patch file')), | |
2106 | ('r', 'rev', [], _('stop managing a revision'))], |
|
2108 | ('r', 'rev', [], _('stop managing a revision'))], | |
2107 |
|
|
2109 | _('hg qdelete [-k] [-r REV]... PATCH...')), | |
2108 | 'qfold': |
|
2110 | 'qfold': | |
2109 | (fold, |
|
2111 | (fold, | |
2110 | [('e', 'edit', None, _('edit patch header')), |
|
2112 | [('e', 'edit', None, _('edit patch header')), | |
2111 | ('k', 'keep', None, _('keep folded patch files')) |
|
2113 | ('k', 'keep', None, _('keep folded patch files')), | |
2112 |
|
|
2114 | ] + commands.commitopts, | |
2113 |
'hg qfold [-e] [- |
|
2115 | _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')), | |
2114 | 'qgoto': (goto, [('f', 'force', None, _('overwrite any local changes'))], |
|
2116 | 'qgoto': | |
2115 | 'hg qgoto [OPT]... PATCH'), |
|
2117 | (goto, | |
2116 | 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')), |
|
2118 | [('f', 'force', None, _('overwrite any local changes'))], | |
2117 | ('n', 'none', None, _('drop all guards'))], |
|
2119 | _('hg qgoto [OPTION]... PATCH')), | |
2118 | 'hg qguard [PATCH] [+GUARD]... [-GUARD]...'), |
|
2120 | 'qguard': | |
2119 | 'qheader': (header, [], |
|
2121 | (guard, | |
2120 | _('hg qheader [PATCH]')), |
|
2122 | [('l', 'list', None, _('list all patches and guards')), | |
|
2123 | ('n', 'none', None, _('drop all guards'))], | |||
|
2124 | _('hg qguard [-l] [-n] [PATCH] [+GUARD]... [-GUARD]...')), | |||
|
2125 | 'qheader': (header, [], _('hg qheader [PATCH]')), | |||
2121 | "^qimport": |
|
2126 | "^qimport": | |
2122 | (qimport, |
|
2127 | (qimport, | |
2123 | [('e', 'existing', None, 'import file in patch dir'), |
|
2128 | [('e', 'existing', None, 'import file in patch dir'), | |
@@ -2125,75 +2130,76 b' cmdtable = {' | |||||
2125 | ('f', 'force', None, 'overwrite existing files'), |
|
2130 | ('f', 'force', None, 'overwrite existing files'), | |
2126 | ('r', 'rev', [], 'place existing revisions under mq control'), |
|
2131 | ('r', 'rev', [], 'place existing revisions under mq control'), | |
2127 | ('g', 'git', None, _('use git extended diff format'))], |
|
2132 | ('g', 'git', None, _('use git extended diff format'))], | |
2128 | 'hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...'), |
|
2133 | _('hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...')), | |
2129 | "^qinit": |
|
2134 | "^qinit": | |
2130 | (init, |
|
2135 | (init, | |
2131 | [('c', 'create-repo', None, 'create queue repository')], |
|
2136 | [('c', 'create-repo', None, 'create queue repository')], | |
2132 | 'hg qinit [-c]'), |
|
2137 | _('hg qinit [-c]')), | |
2133 | "qnew": |
|
2138 | "qnew": | |
2134 | (new, |
|
2139 | (new, | |
2135 | [('e', 'edit', None, _('edit commit message')), |
|
2140 | [('e', 'edit', None, _('edit commit message')), | |
2136 | ('f', 'force', None, _('import uncommitted changes into patch')), |
|
2141 | ('f', 'force', None, _('import uncommitted changes into patch')), | |
2137 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2142 | ('I', 'include', [], _('include names matching the given patterns')), | |
2138 | ('X', 'exclude', [], _('exclude names matching the given patterns')) |
|
2143 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2139 | ] + commands.commitopts, |
|
2144 | ] + commands.commitopts, | |
2140 | 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...'), |
|
2145 | _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')), | |
2141 | "qnext": (next, [] + seriesopts, 'hg qnext [-s]'), |
|
2146 | "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), | |
2142 | "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'), |
|
2147 | "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), | |
2143 | "^qpop": |
|
2148 | "^qpop": | |
2144 | (pop, |
|
2149 | (pop, | |
2145 | [('a', 'all', None, 'pop all patches'), |
|
2150 | [('a', 'all', None, _('pop all patches')), | |
2146 | ('n', 'name', '', 'queue name to pop'), |
|
2151 | ('n', 'name', '', _('queue name to pop')), | |
2147 | ('f', 'force', None, 'forget any local changes')], |
|
2152 | ('f', 'force', None, _('forget any local changes'))], | |
2148 | 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'), |
|
2153 | _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')), | |
2149 | "^qpush": |
|
2154 | "^qpush": | |
2150 | (push, |
|
2155 | (push, | |
2151 | [('f', 'force', None, 'apply if the patch has rejects'), |
|
2156 | [('f', 'force', None, _('apply if the patch has rejects')), | |
2152 | ('l', 'list', None, 'list patch name in commit text'), |
|
2157 | ('l', 'list', None, _('list patch name in commit text')), | |
2153 | ('a', 'all', None, 'apply all patches'), |
|
2158 | ('a', 'all', None, _('apply all patches')), | |
2154 | ('m', 'merge', None, 'merge from another queue'), |
|
2159 | ('m', 'merge', None, _('merge from another queue')), | |
2155 | ('n', 'name', '', 'merge queue name')], |
|
2160 | ('n', 'name', '', _('merge queue name'))], | |
2156 | 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), |
|
2161 | _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]')), | |
2157 | "^qrefresh": |
|
2162 | "^qrefresh": | |
2158 | (refresh, |
|
2163 | (refresh, | |
2159 | [('e', 'edit', None, _('edit commit message')), |
|
2164 | [('e', 'edit', None, _('edit commit message')), | |
2160 | ('g', 'git', None, _('use git extended diff format')), |
|
2165 | ('g', 'git', None, _('use git extended diff format')), | |
2161 | ('s', 'short', None, 'refresh only files already in the patch'), |
|
2166 | ('s', 'short', None, _('refresh only files already in the patch')), | |
2162 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2167 | ('I', 'include', [], _('include names matching the given patterns')), | |
2163 | ('X', 'exclude', [], _('exclude names matching the given patterns')) |
|
2168 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2164 | ] + commands.commitopts, |
|
2169 | ] + commands.commitopts, | |
2165 | 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'), |
|
2170 | _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')), | |
2166 | 'qrename|qmv': |
|
2171 | 'qrename|qmv': | |
2167 | (rename, [], 'hg qrename PATCH1 [PATCH2]'), |
|
2172 | (rename, [], _('hg qrename PATCH1 [PATCH2]')), | |
2168 | "qrestore": |
|
2173 | "qrestore": | |
2169 | (restore, |
|
2174 | (restore, | |
2170 | [('d', 'delete', None, 'delete save entry'), |
|
2175 | [('d', 'delete', None, _('delete save entry')), | |
2171 | ('u', 'update', None, 'update queue working dir')], |
|
2176 | ('u', 'update', None, _('update queue working dir'))], | |
2172 | 'hg qrestore [-d] [-u] REV'), |
|
2177 | _('hg qrestore [-d] [-u] REV')), | |
2173 | "qsave": |
|
2178 | "qsave": | |
2174 | (save, |
|
2179 | (save, | |
2175 | [('c', 'copy', None, 'copy patch directory'), |
|
2180 | [('c', 'copy', None, _('copy patch directory')), | |
2176 | ('n', 'name', '', 'copy directory name'), |
|
2181 | ('n', 'name', '', _('copy directory name')), | |
2177 | ('e', 'empty', None, 'clear queue status file'), |
|
2182 | ('e', 'empty', None, _('clear queue status file')), | |
2178 | ('f', 'force', None, 'force copy')] + commands.commitopts, |
|
2183 | ('f', 'force', None, _('force copy'))] + commands.commitopts, | |
2179 | 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), |
|
2184 | _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')), | |
2180 |
"qselect": |
|
2185 | "qselect": | |
2181 | [('n', 'none', None, _('disable all guards')), |
|
2186 | (select, | |
2182 |
|
|
2187 | [('n', 'none', None, _('disable all guards')), | |
2183 | ('', 'pop', None, |
|
2188 | ('s', 'series', None, _('list all guards in series file')), | |
2184 |
|
|
2189 | ('', 'pop', None, _('pop to before first guarded applied patch')), | |
2185 |
|
|
2190 | ('', 'reapply', None, _('pop, then reapply patches'))], | |
2186 |
|
|
2191 | _('hg qselect [OPTION]... [GUARD]...')), | |
2187 | "qseries": |
|
2192 | "qseries": | |
2188 | (series, |
|
2193 | (series, | |
2189 |
[('m', 'missing', None, 'print patches not in series') |
|
2194 | [('m', 'missing', None, _('print patches not in series')), | |
2190 |
|
|
2195 | ] + seriesopts, | |
|
2196 | _('hg qseries [-ms]')), | |||
2191 | "^strip": |
|
2197 | "^strip": | |
2192 | (strip, |
|
2198 | (strip, | |
2193 | [('f', 'force', None, 'force multi-head removal'), |
|
2199 | [('f', 'force', None, _('force multi-head removal')), | |
2194 | ('b', 'backup', None, 'bundle unrelated changesets'), |
|
2200 | ('b', 'backup', None, _('bundle unrelated changesets')), | |
2195 | ('n', 'nobackup', None, 'no backups')], |
|
2201 | ('n', 'nobackup', None, _('no backups'))], | |
2196 | 'hg strip [-f] [-b] [-n] REV'), |
|
2202 | _('hg strip [-f] [-b] [-n] REV')), | |
2197 | "qtop": (top, [] + seriesopts, 'hg qtop [-s]'), |
|
2203 | "qtop": (top, [] + seriesopts, _('hg qtop [-s]')), | |
2198 | "qunapplied": (unapplied, [] + seriesopts, 'hg qunapplied [-s] [PATCH]'), |
|
2204 | "qunapplied": (unapplied, [] + seriesopts, _('hg qunapplied [-s] [PATCH]')), | |
2199 | } |
|
2205 | } |
@@ -410,26 +410,31 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
410 | mailer.sendmail(sender, to + bcc + cc, m.as_string(0)) |
|
410 | mailer.sendmail(sender, to + bcc + cc, m.as_string(0)) | |
411 |
|
411 | |||
412 | cmdtable = { |
|
412 | cmdtable = { | |
413 |
|
|
413 | "email": | |
414 | (patchbomb, |
|
414 | (patchbomb, | |
415 | [('a', 'attach', None, 'send patches as inline attachments'), |
|
415 | [('a', 'attach', None, _('send patches as inline attachments')), | |
416 | ('', 'bcc', [], 'email addresses of blind copy recipients'), |
|
416 | ('', 'bcc', [], _('email addresses of blind copy recipients')), | |
417 | ('c', 'cc', [], 'email addresses of copy recipients'), |
|
417 | ('c', 'cc', [], _('email addresses of copy recipients')), | |
418 | ('d', 'diffstat', None, 'add diffstat output to messages'), |
|
418 | ('d', 'diffstat', None, _('add diffstat output to messages')), | |
419 | ('', 'date', '', _('use the given date as the sending date')), |
|
419 | ('', 'date', '', _('use the given date as the sending date')), | |
420 | ('g', 'git', None, _('use git extended diff format')), |
|
420 | ('g', 'git', None, _('use git extended diff format')), | |
421 | ('f', 'from', '', 'email address of sender'), |
|
421 | ('f', 'from', '', _('email address of sender')), | |
422 | ('', 'plain', None, 'omit hg patch header'), |
|
422 | ('', 'plain', None, _('omit hg patch header')), | |
423 | ('n', 'test', None, 'print messages that would be sent'), |
|
423 | ('n', 'test', None, _('print messages that would be sent')), | |
424 | ('m', 'mbox', '', 'write messages to mbox file instead of sending them'), |
|
424 | ('m', 'mbox', '', | |
425 | ('o', 'outgoing', None, _('send changes not found in the target repository')), |
|
425 | _('write messages to mbox file instead of sending them')), | |
426 | ('b', 'bundle', None, _('send changes not in target as a binary bundle')), |
|
426 | ('o', 'outgoing', None, | |
427 | ('r', 'rev', [], _('a revision to send')), |
|
427 | _('send changes not found in the target repository')), | |
428 | ('s', 'subject', '', 'subject of first message (intro or single patch)'), |
|
428 | ('b', 'bundle', None, | |
429 | ('t', 'to', [], 'email addresses of recipients'), |
|
429 | _('send changes not in target as a binary bundle')), | |
430 | ('', 'force', None, _('run even when remote repository is unrelated (with -b)')), |
|
430 | ('r', 'rev', [], _('a revision to send')), | |
431 |
('', ' |
|
431 | ('s', 'subject', '', | |
432 | _('a base changeset to specify instead of a destination (with -b)'))] |
|
432 | _('subject of first message (intro or single patch)')), | |
433 | + commands.remoteopts, |
|
433 | ('t', 'to', [], _('email addresses of recipients')), | |
434 | "hg email [OPTION]... [DEST]...") |
|
434 | ('', 'force', None, | |
435 | } |
|
435 | _('run even when remote repository is unrelated (with -b)')), | |
|
436 | ('', 'base', [], | |||
|
437 | _('a base changeset to specify instead of a destination (with -b)')), | |||
|
438 | ] + commands.remoteopts, | |||
|
439 | _('hg email [OPTION]... [DEST]...')) | |||
|
440 | } |
@@ -2768,14 +2768,16 b' table = {' | |||||
2768 | ('r', 'rev', '', _('revision to backout')), |
|
2768 | ('r', 'rev', '', _('revision to backout')), | |
2769 | ] + walkopts + commitopts, |
|
2769 | ] + walkopts + commitopts, | |
2770 | _('hg backout [OPTION]... [-r] REV')), |
|
2770 | _('hg backout [OPTION]... [-r] REV')), | |
2771 |
"branch": |
|
2771 | "branch": | |
2772 | [('f', 'force', None, |
|
2772 | (branch, | |
2773 | _('set branch name even if it shadows an existing branch'))], |
|
2773 | [('f', 'force', None, | |
2774 | _('hg branch [NAME]')), |
|
2774 | _('set branch name even if it shadows an existing branch'))], | |
2775 | "branches": (branches, |
|
2775 | _('hg branch [NAME]')), | |
2776 | [('a', 'active', False, |
|
2776 | "branches": | |
2777 | _("show only branches that have unmerged heads"))], |
|
2777 | (branches, | |
2778 | _('hg branches [-a]')), |
|
2778 | [('a', 'active', False, | |
|
2779 | _('show only branches that have unmerged heads'))], | |||
|
2780 | _('hg branches [-a]')), | |||
2779 | "bundle": |
|
2781 | "bundle": | |
2780 | (bundle, |
|
2782 | (bundle, | |
2781 | [('f', 'force', None, |
|
2783 | [('f', 'force', None, | |
@@ -2837,9 +2839,10 b' table = {' | |||||
2837 | "debugdata": (debugdata, [], _('debugdata FILE REV')), |
|
2839 | "debugdata": (debugdata, [], _('debugdata FILE REV')), | |
2838 | "debugindex": (debugindex, [], _('debugindex FILE')), |
|
2840 | "debugindex": (debugindex, [], _('debugindex FILE')), | |
2839 | "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')), |
|
2841 | "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')), | |
2840 |
"debugrename": |
|
2842 | "debugrename": | |
2841 | [('r', 'rev', '', _('revision to debug'))], |
|
2843 | (debugrename, | |
2842 | _('debugrename [-r REV] FILE')), |
|
2844 | [('r', 'rev', '', _('revision to debug'))], | |
|
2845 | _('debugrename [-r REV] FILE')), | |||
2843 | "debugwalk": (debugwalk, walkopts, _('debugwalk [OPTION]... [FILE]...')), |
|
2846 | "debugwalk": (debugwalk, walkopts, _('debugwalk [OPTION]... [FILE]...')), | |
2844 | "^diff": |
|
2847 | "^diff": | |
2845 | (diff, |
|
2848 | (diff, |
@@ -5,7 +5,7 b' Only in a: a' | |||||
5 | making snapshot of 0 files from rev 000000000000 |
|
5 | making snapshot of 0 files from rev 000000000000 | |
6 | making snapshot of 1 files from working dir |
|
6 | making snapshot of 1 files from working dir | |
7 | diffing a.000000000000 a |
|
7 | diffing a.000000000000 a | |
8 | hg falabala [OPT]... [FILE]... |
|
8 | hg falabala [OPTION]... [FILE]... | |
9 |
|
9 | |||
10 | use 'echo' to diff repository (or selected files) |
|
10 | use 'echo' to diff repository (or selected files) | |
11 |
|
11 |
General Comments 0
You need to be logged in to leave comments.
Login now