Mercurial > hg
comparison hgext/mq.py @ 4730:eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 26 Jun 2007 22:38:57 +0200 |
parents | 487943b52a6c |
children | 04b2c1e27c26 |
comparison
equal
deleted
inserted
replaced
4729:9881abfc0e44 | 4730:eadfaa9ec487 |
---|---|
2078 repo.mq = queue(ui, repo.join("")) | 2078 repo.mq = queue(ui, repo.join("")) |
2079 | 2079 |
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": (clone, | 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": (diff, | 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 ('X', 'exclude', [], _('exclude names matching the given patterns'))], | 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 'hg qdelete [-k] [-r REV]... PATCH...'), | 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 ] + commands.commitopts, | 2114 ] + commands.commitopts, |
2113 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), | 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'), |
2124 ('n', 'name', '', 'patch file name'), | 2129 ('n', 'name', '', 'patch file name'), |
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": (select, | 2185 "qselect": |
2181 [('n', 'none', None, _('disable all guards')), | 2186 (select, |
2182 ('s', 'series', None, _('list all guards in series file')), | 2187 [('n', 'none', None, _('disable all guards')), |
2183 ('', 'pop', None, | 2188 ('s', 'series', None, _('list all guards in series file')), |
2184 _('pop to before first guarded applied patch')), | 2189 ('', 'pop', None, _('pop to before first guarded applied patch')), |
2185 ('', 'reapply', None, _('pop, then reapply patches'))], | 2190 ('', 'reapply', None, _('pop, then reapply patches'))], |
2186 'hg qselect [OPTION]... [GUARD]...'), | 2191 _('hg qselect [OPTION]... [GUARD]...')), |
2187 "qseries": | 2192 "qseries": |
2188 (series, | 2193 (series, |
2189 [('m', 'missing', None, 'print patches not in series')] + seriesopts, | 2194 [('m', 'missing', None, _('print patches not in series')), |
2190 'hg qseries [-ms]'), | 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 } |