Mercurial > hg-stable
comparison hgext/mq.py @ 6915:ef14c773b3d6
mq: fix docs for qrefresh -D (issue1234)
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Wed, 20 Aug 2008 10:30:53 +0200 |
parents | 71e339714586 |
children | b6fffcd97242 |
comparison
equal
deleted
inserted
replaced
6883:ee1d26bcd7c2 | 6915:ef14c773b3d6 |
---|---|
2275 repo.__class__ = mqrepo | 2275 repo.__class__ = mqrepo |
2276 repo.mq = queue(ui, repo.join("")) | 2276 repo.mq = queue(ui, repo.join("")) |
2277 | 2277 |
2278 seriesopts = [('s', 'summary', None, _('print first line of patch header'))] | 2278 seriesopts = [('s', 'summary', None, _('print first line of patch header'))] |
2279 | 2279 |
2280 headeropts = [ | |
2281 ('U', 'currentuser', None, _('add "From: <current user>" to patch')), | |
2282 ('u', 'user', '', _('add "From: <given user>" to patch')), | |
2283 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), | |
2284 ('d', 'date', '', _('add "Date: <given date>" to patch'))] | |
2285 | |
2286 cmdtable = { | 2280 cmdtable = { |
2287 "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')), | 2281 "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')), |
2288 "qclone": | 2282 "qclone": |
2289 (clone, | 2283 (clone, |
2290 [('', 'pull', None, _('use pull protocol to copy metadata')), | 2284 [('', 'pull', None, _('use pull protocol to copy metadata')), |
2340 "qnew": | 2334 "qnew": |
2341 (new, | 2335 (new, |
2342 [('e', 'edit', None, _('edit commit message')), | 2336 [('e', 'edit', None, _('edit commit message')), |
2343 ('f', 'force', None, _('import uncommitted changes into patch')), | 2337 ('f', 'force', None, _('import uncommitted changes into patch')), |
2344 ('g', 'git', None, _('use git extended diff format')), | 2338 ('g', 'git', None, _('use git extended diff format')), |
2345 ] + commands.walkopts + commands.commitopts + headeropts, | 2339 ('U', 'currentuser', None, _('add "From: <current user>" to patch')), |
2340 ('u', 'user', '', _('add "From: <given user>" to patch')), | |
2341 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), | |
2342 ('d', 'date', '', _('add "Date: <given date>" to patch')) | |
2343 ] + commands.walkopts + commands.commitopts, | |
2346 _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')), | 2344 _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')), |
2347 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), | 2345 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), |
2348 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), | 2346 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
2349 "^qpop": | 2347 "^qpop": |
2350 (pop, | 2348 (pop, |
2363 "^qrefresh": | 2361 "^qrefresh": |
2364 (refresh, | 2362 (refresh, |
2365 [('e', 'edit', None, _('edit commit message')), | 2363 [('e', 'edit', None, _('edit commit message')), |
2366 ('g', 'git', None, _('use git extended diff format')), | 2364 ('g', 'git', None, _('use git extended diff format')), |
2367 ('s', 'short', None, _('refresh only files already in the patch')), | 2365 ('s', 'short', None, _('refresh only files already in the patch')), |
2368 ] + commands.walkopts + commands.commitopts + headeropts, | 2366 ('U', 'currentuser', None, _('add/update "From: <current user>" in patch')), |
2367 ('u', 'user', '', _('add/update "From: <given user>" in patch')), | |
2368 ('D', 'currentdate', None, _('update "Date: <current date>" in patch (if present)')), | |
2369 ('d', 'date', '', _('update "Date: <given date>" in patch (if present)')) | |
2370 ] + commands.walkopts + commands.commitopts, | |
2369 _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')), | 2371 _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')), |
2370 'qrename|qmv': | 2372 'qrename|qmv': |
2371 (rename, [], _('hg qrename PATCH1 [PATCH2]')), | 2373 (rename, [], _('hg qrename PATCH1 [PATCH2]')), |
2372 "qrestore": | 2374 "qrestore": |
2373 (restore, | 2375 (restore, |