hgext/mq.py
changeset 32375 04baab18d60a
parent 32347 f4aee989ebec
child 33489 870560c759ed
equal deleted inserted replaced
32374:194b0f781132 32375:04baab18d60a
  2405            _('do not update the new working directories')),
  2405            _('do not update the new working directories')),
  2406           ('', 'uncompressed', None,
  2406           ('', 'uncompressed', None,
  2407            _('use uncompressed transfer (fast over LAN)')),
  2407            _('use uncompressed transfer (fast over LAN)')),
  2408           ('p', 'patches', '',
  2408           ('p', 'patches', '',
  2409            _('location of source patch repository'), _('REPO')),
  2409            _('location of source patch repository'), _('REPO')),
  2410          ] + commands.remoteopts,
  2410          ] + cmdutil.remoteopts,
  2411          _('hg qclone [OPTION]... SOURCE [DEST]'),
  2411          _('hg qclone [OPTION]... SOURCE [DEST]'),
  2412          norepo=True)
  2412          norepo=True)
  2413 def clone(ui, source, dest=None, **opts):
  2413 def clone(ui, source, dest=None, **opts):
  2414     '''clone main and patch repository at same time
  2414     '''clone main and patch repository at same time
  2415 
  2415 
  2573           ('u', 'user', '',
  2573           ('u', 'user', '',
  2574            _('add "From: <USER>" to patch'), _('USER')),
  2574            _('add "From: <USER>" to patch'), _('USER')),
  2575           ('D', 'currentdate', None, _('add "Date: <current date>" to patch')),
  2575           ('D', 'currentdate', None, _('add "Date: <current date>" to patch')),
  2576           ('d', 'date', '',
  2576           ('d', 'date', '',
  2577            _('add "Date: <DATE>" to patch'), _('DATE'))
  2577            _('add "Date: <DATE>" to patch'), _('DATE'))
  2578           ] + commands.walkopts + commands.commitopts,
  2578           ] + cmdutil.walkopts + cmdutil.commitopts,
  2579          _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...'),
  2579          _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...'),
  2580          inferrepo=True)
  2580          inferrepo=True)
  2581 def new(ui, repo, patch, *args, **opts):
  2581 def new(ui, repo, patch, *args, **opts):
  2582     """create a new patch
  2582     """create a new patch
  2583 
  2583 
  2622            _('add/update author field in patch with given user'), _('USER')),
  2622            _('add/update author field in patch with given user'), _('USER')),
  2623           ('D', 'currentdate', None,
  2623           ('D', 'currentdate', None,
  2624            _('add/update date field in patch with current date')),
  2624            _('add/update date field in patch with current date')),
  2625           ('d', 'date', '',
  2625           ('d', 'date', '',
  2626            _('add/update date field in patch with given date'), _('DATE'))
  2626            _('add/update date field in patch with given date'), _('DATE'))
  2627           ] + commands.walkopts + commands.commitopts,
  2627           ] + cmdutil.walkopts + cmdutil.commitopts,
  2628          _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'),
  2628          _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...'),
  2629          inferrepo=True)
  2629          inferrepo=True)
  2630 def refresh(ui, repo, *pats, **opts):
  2630 def refresh(ui, repo, *pats, **opts):
  2631     """update the current patch
  2631     """update the current patch
  2632 
  2632 
  2655         ret = q.refresh(repo, pats, msg=message, **opts)
  2655         ret = q.refresh(repo, pats, msg=message, **opts)
  2656         q.savedirty()
  2656         q.savedirty()
  2657         return ret
  2657         return ret
  2658 
  2658 
  2659 @command("^qdiff",
  2659 @command("^qdiff",
  2660          commands.diffopts + commands.diffopts2 + commands.walkopts,
  2660          cmdutil.diffopts + cmdutil.diffopts2 + cmdutil.walkopts,
  2661          _('hg qdiff [OPTION]... [FILE]...'),
  2661          _('hg qdiff [OPTION]... [FILE]...'),
  2662          inferrepo=True)
  2662          inferrepo=True)
  2663 def diff(ui, repo, *pats, **opts):
  2663 def diff(ui, repo, *pats, **opts):
  2664     """diff of the current patch and subsequent modifications
  2664     """diff of the current patch and subsequent modifications
  2665 
  2665 
  2680     return 0
  2680     return 0
  2681 
  2681 
  2682 @command('qfold',
  2682 @command('qfold',
  2683          [('e', 'edit', None, _('invoke editor on commit messages')),
  2683          [('e', 'edit', None, _('invoke editor on commit messages')),
  2684           ('k', 'keep', None, _('keep folded patch files')),
  2684           ('k', 'keep', None, _('keep folded patch files')),
  2685          ] + commands.commitopts,
  2685          ] + cmdutil.commitopts,
  2686          _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...'))
  2686          _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...'))
  2687 def fold(ui, repo, *files, **opts):
  2687 def fold(ui, repo, *files, **opts):
  2688     """fold the named patches into the current patch
  2688     """fold the named patches into the current patch
  2689 
  2689 
  2690     Patches must not yet be applied. Each patch will be successively
  2690     Patches must not yet be applied. Each patch will be successively
  3042 @command("qsave",
  3042 @command("qsave",
  3043          [('c', 'copy', None, _('copy patch directory')),
  3043          [('c', 'copy', None, _('copy patch directory')),
  3044           ('n', 'name', '',
  3044           ('n', 'name', '',
  3045            _('copy directory name'), _('NAME')),
  3045            _('copy directory name'), _('NAME')),
  3046           ('e', 'empty', None, _('clear queue status file')),
  3046           ('e', 'empty', None, _('clear queue status file')),
  3047           ('f', 'force', None, _('force copy'))] + commands.commitopts,
  3047           ('f', 'force', None, _('force copy'))] + cmdutil.commitopts,
  3048          _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'))
  3048          _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'))
  3049 def save(ui, repo, **opts):
  3049 def save(ui, repo, **opts):
  3050     """save current queue state (DEPRECATED)
  3050     """save current queue state (DEPRECATED)
  3051 
  3051 
  3052     This command is deprecated, use :hg:`rebase` instead."""
  3052     This command is deprecated, use :hg:`rebase` instead."""