hgext/mq.py
changeset 11321 40c06bbf58be
parent 11311 fcd06ecd4cb7
child 11327 6c469f2f9f12
equal deleted inserted replaced
11320:e4274f9f97c8 11321:40c06bbf58be
  2833         (clone,
  2833         (clone,
  2834          [('', 'pull', None, _('use pull protocol to copy metadata')),
  2834          [('', 'pull', None, _('use pull protocol to copy metadata')),
  2835           ('U', 'noupdate', None, _('do not update the new working directories')),
  2835           ('U', 'noupdate', None, _('do not update the new working directories')),
  2836           ('', 'uncompressed', None,
  2836           ('', 'uncompressed', None,
  2837            _('use uncompressed transfer (fast over LAN)')),
  2837            _('use uncompressed transfer (fast over LAN)')),
  2838           ('p', 'patches', '', _('location of source patch repository')),
  2838           ('p', 'patches', '',
       
  2839            _('location of source patch repository'), _('REPO')),
  2839          ] + commands.remoteopts,
  2840          ] + commands.remoteopts,
  2840          _('hg qclone [OPTION]... SOURCE [DEST]')),
  2841          _('hg qclone [OPTION]... SOURCE [DEST]')),
  2841     "qcommit|qci":
  2842     "qcommit|qci":
  2842         (commit,
  2843         (commit,
  2843          commands.table["^commit|ci"][1],
  2844          commands.table["^commit|ci"][1],
  2847          commands.diffopts + commands.diffopts2 + commands.walkopts,
  2848          commands.diffopts + commands.diffopts2 + commands.walkopts,
  2848          _('hg qdiff [OPTION]... [FILE]...')),
  2849          _('hg qdiff [OPTION]... [FILE]...')),
  2849     "qdelete|qremove|qrm":
  2850     "qdelete|qremove|qrm":
  2850         (delete,
  2851         (delete,
  2851          [('k', 'keep', None, _('keep patch file')),
  2852          [('k', 'keep', None, _('keep patch file')),
  2852           ('r', 'rev', [], _('stop managing a revision (DEPRECATED)'))],
  2853           ('r', 'rev', [],
       
  2854            _('stop managing a revision (DEPRECATED)'), _('REV'))],
  2853          _('hg qdelete [-k] [-r REV]... [PATCH]...')),
  2855          _('hg qdelete [-k] [-r REV]... [PATCH]...')),
  2854     'qfold':
  2856     'qfold':
  2855         (fold,
  2857         (fold,
  2856          [('e', 'edit', None, _('edit patch header')),
  2858          [('e', 'edit', None, _('edit patch header')),
  2857           ('k', 'keep', None, _('keep folded patch files')),
  2859           ('k', 'keep', None, _('keep folded patch files')),
  2868          _('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]')),
  2870          _('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]')),
  2869     'qheader': (header, [], _('hg qheader [PATCH]')),
  2871     'qheader': (header, [], _('hg qheader [PATCH]')),
  2870     "qimport":
  2872     "qimport":
  2871         (qimport,
  2873         (qimport,
  2872          [('e', 'existing', None, _('import file in patch directory')),
  2874          [('e', 'existing', None, _('import file in patch directory')),
  2873           ('n', 'name', '', _('name of patch file')),
  2875           ('n', 'name', '',
       
  2876            _('name of patch file'), _('NAME')),
  2874           ('f', 'force', None, _('overwrite existing files')),
  2877           ('f', 'force', None, _('overwrite existing files')),
  2875           ('r', 'rev', [], _('place existing revisions under mq control')),
  2878           ('r', 'rev', [],
       
  2879            _('place existing revisions under mq control'), _('REV')),
  2876           ('g', 'git', None, _('use git extended diff format')),
  2880           ('g', 'git', None, _('use git extended diff format')),
  2877           ('P', 'push', None, _('qpush after importing'))],
  2881           ('P', 'push', None, _('qpush after importing'))],
  2878          _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')),
  2882          _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')),
  2879     "^qinit":
  2883     "^qinit":
  2880         (init,
  2884         (init,
  2884         (new,
  2888         (new,
  2885          [('e', 'edit', None, _('edit commit message')),
  2889          [('e', 'edit', None, _('edit commit message')),
  2886           ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')),
  2890           ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')),
  2887           ('g', 'git', None, _('use git extended diff format')),
  2891           ('g', 'git', None, _('use git extended diff format')),
  2888           ('U', 'currentuser', None, _('add "From: <current user>" to patch')),
  2892           ('U', 'currentuser', None, _('add "From: <current user>" to patch')),
  2889           ('u', 'user', '', _('add "From: <given user>" to patch')),
  2893           ('u', 'user', '',
       
  2894            _('add "From: <USER>" to patch'), _('USER')),
  2890           ('D', 'currentdate', None, _('add "Date: <current date>" to patch')),
  2895           ('D', 'currentdate', None, _('add "Date: <current date>" to patch')),
  2891           ('d', 'date', '', _('add "Date: <given date>" to patch'))
  2896           ('d', 'date', '',
       
  2897            _('add "Date: <DATE>" to patch'), _('DATE'))
  2892           ] + commands.walkopts + commands.commitopts,
  2898           ] + commands.walkopts + commands.commitopts,
  2893          _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')),
  2899          _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')),
  2894     "qnext": (next, [] + seriesopts, _('hg qnext [-s]')),
  2900     "qnext": (next, [] + seriesopts, _('hg qnext [-s]')),
  2895     "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')),
  2901     "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')),
  2896     "^qpop":
  2902     "^qpop":
  2897         (pop,
  2903         (pop,
  2898          [('a', 'all', None, _('pop all patches')),
  2904          [('a', 'all', None, _('pop all patches')),
  2899           ('n', 'name', '', _('queue name to pop (DEPRECATED)')),
  2905           ('n', 'name', '',
       
  2906            _('queue name to pop (DEPRECATED)'), _('NAME')),
  2900           ('f', 'force', None, _('forget any local changes to patched files'))],
  2907           ('f', 'force', None, _('forget any local changes to patched files'))],
  2901          _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')),
  2908          _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')),
  2902     "^qpush":
  2909     "^qpush":
  2903         (push,
  2910         (push,
  2904          [('f', 'force', None, _('apply if the patch has rejects')),
  2911          [('f', 'force', None, _('apply if the patch has rejects')),
  2905           ('l', 'list', None, _('list patch name in commit text')),
  2912           ('l', 'list', None, _('list patch name in commit text')),
  2906           ('a', 'all', None, _('apply all patches')),
  2913           ('a', 'all', None, _('apply all patches')),
  2907           ('m', 'merge', None, _('merge from another queue (DEPRECATED)')),
  2914           ('m', 'merge', None, _('merge from another queue (DEPRECATED)')),
  2908           ('n', 'name', '', _('merge queue name (DEPRECATED)')),
  2915           ('n', 'name', '',
       
  2916            _('merge queue name (DEPRECATED)'), _('NAME')),
  2909           ('', 'move', None, _('reorder patch series and apply only the patch'))],
  2917           ('', 'move', None, _('reorder patch series and apply only the patch'))],
  2910          _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]')),
  2918          _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]')),
  2911     "^qrefresh":
  2919     "^qrefresh":
  2912         (refresh,
  2920         (refresh,
  2913          [('e', 'edit', None, _('edit commit message')),
  2921          [('e', 'edit', None, _('edit commit message')),
  2915           ('s', 'short', None,
  2923           ('s', 'short', None,
  2916            _('refresh only files already in the patch and specified files')),
  2924            _('refresh only files already in the patch and specified files')),
  2917           ('U', 'currentuser', None,
  2925           ('U', 'currentuser', None,
  2918            _('add/update author field in patch with current user')),
  2926            _('add/update author field in patch with current user')),
  2919           ('u', 'user', '',
  2927           ('u', 'user', '',
  2920            _('add/update author field in patch with given user')),
  2928            _('add/update author field in patch with given user'), _('USER')),
  2921           ('D', 'currentdate', None,
  2929           ('D', 'currentdate', None,
  2922            _('add/update date field in patch with current date')),
  2930            _('add/update date field in patch with current date')),
  2923           ('d', 'date', '',
  2931           ('d', 'date', '',
  2924            _('add/update date field in patch with given date'))
  2932            _('add/update date field in patch with given date'), _('DATE'))
  2925           ] + commands.walkopts + commands.commitopts,
  2933           ] + commands.walkopts + commands.commitopts,
  2926          _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
  2934          _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
  2927     'qrename|qmv':
  2935     'qrename|qmv':
  2928         (rename, [], _('hg qrename PATCH1 [PATCH2]')),
  2936         (rename, [], _('hg qrename PATCH1 [PATCH2]')),
  2929     "qrestore":
  2937     "qrestore":
  2932           ('u', 'update', None, _('update queue working directory'))],
  2940           ('u', 'update', None, _('update queue working directory'))],
  2933          _('hg qrestore [-d] [-u] REV')),
  2941          _('hg qrestore [-d] [-u] REV')),
  2934     "qsave":
  2942     "qsave":
  2935         (save,
  2943         (save,
  2936          [('c', 'copy', None, _('copy patch directory')),
  2944          [('c', 'copy', None, _('copy patch directory')),
  2937           ('n', 'name', '', _('copy directory name')),
  2945           ('n', 'name', '',
       
  2946            _('copy directory name'), _('NAME')),
  2938           ('e', 'empty', None, _('clear queue status file')),
  2947           ('e', 'empty', None, _('clear queue status file')),
  2939           ('f', 'force', None, _('force copy'))] + commands.commitopts,
  2948           ('f', 'force', None, _('force copy'))] + commands.commitopts,
  2940          _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')),
  2949          _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')),
  2941     "qselect":
  2950     "qselect":
  2942         (select,
  2951         (select,