comparison hgext/mq.py @ 8026:683d8ebcf434

expand "dir" to "directory" in help texts
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Apr 2009 22:47:56 +0200
parents 3c22fdc741d8
children 9c7ca86fc658
comparison
equal deleted inserted replaced
8025:1280934dd2dd 8026:683d8ebcf434
2216 return 0 2216 return 0
2217 2217
2218 def strip(ui, repo, rev, **opts): 2218 def strip(ui, repo, rev, **opts):
2219 """strip a revision and all its descendants from the repository 2219 """strip a revision and all its descendants from the repository
2220 2220
2221 If one of the working dir's parent revisions is stripped, the 2221 If one of the working directory's parent revisions is stripped, the
2222 working directory will be updated to the parent of the stripped 2222 working directory will be updated to the parent of the stripped
2223 revision. 2223 revision.
2224 """ 2224 """
2225 backup = 'all' 2225 backup = 'all'
2226 if opts['backup']: 2226 if opts['backup']:
2512 ('n', 'none', None, _('drop all guards'))], 2512 ('n', 'none', None, _('drop all guards'))],
2513 _('hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]...')), 2513 _('hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]...')),
2514 'qheader': (header, [], _('hg qheader [PATCH]')), 2514 'qheader': (header, [], _('hg qheader [PATCH]')),
2515 "^qimport": 2515 "^qimport":
2516 (qimport, 2516 (qimport,
2517 [('e', 'existing', None, _('import file in patch dir')), 2517 [('e', 'existing', None, _('import file in patch directory')),
2518 ('n', 'name', '', _('patch file name')), 2518 ('n', 'name', '', _('patch file name')),
2519 ('f', 'force', None, _('overwrite existing files')), 2519 ('f', 'force', None, _('overwrite existing files')),
2520 ('r', 'rev', [], _('place existing revisions under mq control')), 2520 ('r', 'rev', [], _('place existing revisions under mq control')),
2521 ('g', 'git', None, _('use git extended diff format'))], 2521 ('g', 'git', None, _('use git extended diff format'))],
2522 _('hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...')), 2522 _('hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...')),
2565 'qrename|qmv': 2565 'qrename|qmv':
2566 (rename, [], _('hg qrename PATCH1 [PATCH2]')), 2566 (rename, [], _('hg qrename PATCH1 [PATCH2]')),
2567 "qrestore": 2567 "qrestore":
2568 (restore, 2568 (restore,
2569 [('d', 'delete', None, _('delete save entry')), 2569 [('d', 'delete', None, _('delete save entry')),
2570 ('u', 'update', None, _('update queue working dir'))], 2570 ('u', 'update', None, _('update queue working directory'))],
2571 _('hg qrestore [-d] [-u] REV')), 2571 _('hg qrestore [-d] [-u] REV')),
2572 "qsave": 2572 "qsave":
2573 (save, 2573 (save,
2574 [('c', 'copy', None, _('copy patch directory')), 2574 [('c', 'copy', None, _('copy patch directory')),
2575 ('n', 'name', '', _('copy directory name')), 2575 ('n', 'name', '', _('copy directory name')),