Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 3857:f6f16f871049

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uniformisation of commit help for -m and -l. Addition of the -m and -l options for hg import. 'hg tag' still lacks the --logfile option which short form conflicts with its --local option.
author Mathieu Clabaut <mathieu.clabaut@gmail.com>
date Mon, 20 Nov 2006 23:37:21 +0100
parents b3b868113d24
children 22d18051f9e5
comparison
equal deleted inserted replaced
3856:f9e129684b5d 3857:f6f16f871049
2101 ('r', 'rev', [], _('stop managing a revision'))], 2101 ('r', 'rev', [], _('stop managing a revision'))],
2102 'hg qdelete [-k] [-r REV]... PATCH...'), 2102 'hg qdelete [-k] [-r REV]... PATCH...'),
2103 'qfold': 2103 'qfold':
2104 (fold, 2104 (fold,
2105 [('e', 'edit', None, _('edit patch header')), 2105 [('e', 'edit', None, _('edit patch header')),
2106 ('k', 'keep', None, _('keep folded patch files')), 2106 ('k', 'keep', None, _('keep folded patch files'))
2107 ('m', 'message', '', _('set patch header to <text>')), 2107 ] + commands.commitopts,
2108 ('l', 'logfile', '', _('set patch header to contents of <file>'))],
2109 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), 2108 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'),
2110 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')), 2109 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')),
2111 ('n', 'none', None, _('drop all guards'))], 2110 ('n', 'none', None, _('drop all guards'))],
2112 'hg qguard [PATCH] [+GUARD...] [-GUARD...]'), 2111 'hg qguard [PATCH] [+GUARD...] [-GUARD...]'),
2113 'qheader': (header, [], 2112 'qheader': (header, [],
2125 [('c', 'create-repo', None, 'create queue repository')], 2124 [('c', 'create-repo', None, 'create queue repository')],
2126 'hg qinit [-c]'), 2125 'hg qinit [-c]'),
2127 "qnew": 2126 "qnew":
2128 (new, 2127 (new,
2129 [('e', 'edit', None, _('edit commit message')), 2128 [('e', 'edit', None, _('edit commit message')),
2130 ('m', 'message', '', _('use <text> as commit message')), 2129 ('f', 'force', None, _('import uncommitted changes into patch'))
2131 ('l', 'logfile', '', _('read the commit message from <file>')), 2130 ] + commands.commitopts,
2132 ('f', 'force', None, _('import uncommitted changes into patch'))],
2133 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH'), 2131 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH'),
2134 "qnext": (next, [] + seriesopts, 'hg qnext [-s]'), 2132 "qnext": (next, [] + seriesopts, 'hg qnext [-s]'),
2135 "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'), 2133 "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'),
2136 "^qpop": 2134 "^qpop":
2137 (pop, 2135 (pop,
2148 ('n', 'name', '', 'merge queue name')], 2146 ('n', 'name', '', 'merge queue name')],
2149 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), 2147 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'),
2150 "^qrefresh": 2148 "^qrefresh":
2151 (refresh, 2149 (refresh,
2152 [('e', 'edit', None, _('edit commit message')), 2150 [('e', 'edit', None, _('edit commit message')),
2153 ('m', 'message', '', _('change commit message to <text>')),
2154 ('l', 'logfile', '', _('change commit message to <file> content')),
2155 ('g', 'git', None, _('use git extended diff format')), 2151 ('g', 'git', None, _('use git extended diff format')),
2156 ('s', 'short', None, 'refresh only files already in the patch'), 2152 ('s', 'short', None, 'refresh only files already in the patch'),
2157 ('I', 'include', [], _('include names matching the given patterns')), 2153 ('I', 'include', [], _('include names matching the given patterns')),
2158 ('X', 'exclude', [], _('exclude names matching the given patterns'))], 2154 ('X', 'exclude', [], _('exclude names matching the given patterns'))
2155 ] + commands.commitopts,
2159 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'), 2156 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'),
2160 'qrename|qmv': 2157 'qrename|qmv':
2161 (rename, [], 'hg qrename PATCH1 [PATCH2]'), 2158 (rename, [], 'hg qrename PATCH1 [PATCH2]'),
2162 "qrestore": 2159 "qrestore":
2163 (restore, 2160 (restore,
2164 [('d', 'delete', None, 'delete save entry'), 2161 [('d', 'delete', None, 'delete save entry'),
2165 ('u', 'update', None, 'update queue working dir')], 2162 ('u', 'update', None, 'update queue working dir')],
2166 'hg qrestore [-d] [-u] REV'), 2163 'hg qrestore [-d] [-u] REV'),
2167 "qsave": 2164 "qsave":
2168 (save, 2165 (save,
2169 [('m', 'message', '', _('use <text> as commit message')), 2166 [('c', 'copy', None, 'copy patch directory'),
2170 ('l', 'logfile', '', _('read the commit message from <file>')),
2171 ('c', 'copy', None, 'copy patch directory'),
2172 ('n', 'name', '', 'copy directory name'), 2167 ('n', 'name', '', 'copy directory name'),
2173 ('e', 'empty', None, 'clear queue status file'), 2168 ('e', 'empty', None, 'clear queue status file'),
2174 ('f', 'force', None, 'force copy')], 2169 ('f', 'force', None, 'force copy')] + commands.commitopts,
2175 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), 2170 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'),
2176 "qselect": (select, 2171 "qselect": (select,
2177 [('n', 'none', None, _('disable all guards')), 2172 [('n', 'none', None, _('disable all guards')),
2178 ('s', 'series', None, _('list all guards in series file')), 2173 ('s', 'series', None, _('list all guards in series file')),
2179 ('', 'pop', None, 2174 ('', 'pop', None,