| hg-reviewers |
This patch fixes the handling of keyword arguments to functions on Python 3. On
python3, the keys of keyword arguments need to str which is unicode. So any
keyword argument will get will have str keys and any dictionary we pass as
kwargs must have all the keys as str.
This patch uses pycompat.(strkwargs|byteskwargs) to do so conversion between
bytes keys and str keys and use r'' if there are very less uses and conversion
can be prevented.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| ] + seriesopts, | ] + seriesopts, | ||||
| _('hg qapplied [-1] [-s] [PATCH]')) | _('hg qapplied [-1] [-s] [PATCH]')) | ||||
| def applied(ui, repo, patch=None, **opts): | def applied(ui, repo, patch=None, **opts): | ||||
| """print the patches already applied | """print the patches already applied | ||||
| Returns 0 on success.""" | Returns 0 on success.""" | ||||
| q = repo.mq | q = repo.mq | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| if patch: | if patch: | ||||
| if patch not in q.series: | if patch not in q.series: | ||||
| raise error.Abort(_("patch %s is not in series file") % patch) | raise error.Abort(_("patch %s is not in series file") % patch) | ||||
| end = q.series.index(patch) + 1 | end = q.series.index(patch) + 1 | ||||
| else: | else: | ||||
| end = q.seriesend(True) | end = q.seriesend(True) | ||||
| [('1', 'first', None, _('show only the first patch'))] + seriesopts, | [('1', 'first', None, _('show only the first patch'))] + seriesopts, | ||||
| _('hg qunapplied [-1] [-s] [PATCH]')) | _('hg qunapplied [-1] [-s] [PATCH]')) | ||||
| def unapplied(ui, repo, patch=None, **opts): | def unapplied(ui, repo, patch=None, **opts): | ||||
| """print the patches not yet applied | """print the patches not yet applied | ||||
| Returns 0 on success.""" | Returns 0 on success.""" | ||||
| q = repo.mq | q = repo.mq | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| if patch: | if patch: | ||||
| if patch not in q.series: | if patch not in q.series: | ||||
| raise error.Abort(_("patch %s is not in series file") % patch) | raise error.Abort(_("patch %s is not in series file") % patch) | ||||
| start = q.series.index(patch) + 1 | start = q.series.index(patch) + 1 | ||||
| else: | else: | ||||
| start = q.seriesend(True) | start = q.seriesend(True) | ||||
| if start == len(q.series) and opts.get('first'): | if start == len(q.series) and opts.get('first'): | ||||
| using the --name flag. | using the --name flag. | ||||
| To import an existing patch while renaming it:: | To import an existing patch while renaming it:: | ||||
| hg qimport -e existing-patch -n new-name | hg qimport -e existing-patch -n new-name | ||||
| Returns 0 if import succeeded. | Returns 0 if import succeeded. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| with repo.lock(): # cause this may move phase | with repo.lock(): # cause this may move phase | ||||
| q = repo.mq | q = repo.mq | ||||
| try: | try: | ||||
| imported = q.qimport( | imported = q.qimport( | ||||
| repo, filename, patchname=opts.get('name'), | repo, filename, patchname=opts.get('name'), | ||||
| existing=opts.get('existing'), force=opts.get('force'), | existing=opts.get('existing'), force=opts.get('force'), | ||||
| rev=opts.get('rev'), git=opts.get('git')) | rev=opts.get('rev'), git=opts.get('git')) | ||||
| finally: | finally: | ||||
| The queue repository is unversioned by default. If | The queue repository is unversioned by default. If | ||||
| -c/--create-repo is specified, qinit will create a separate nested | -c/--create-repo is specified, qinit will create a separate nested | ||||
| repository for patches (qinit -c may also be run later to convert | repository for patches (qinit -c may also be run later to convert | ||||
| an unversioned patch repository into a versioned one). You can use | an unversioned patch repository into a versioned one). You can use | ||||
| qcommit to commit changes to this queue repository. | qcommit to commit changes to this queue repository. | ||||
| This command is deprecated. Without -c, it's implied by other relevant | This command is deprecated. Without -c, it's implied by other relevant | ||||
| commands. With -c, use :hg:`init --mq` instead.""" | commands. With -c, use :hg:`init --mq` instead.""" | ||||
| return qinit(ui, repo, create=opts.get('create_repo')) | return qinit(ui, repo, create=opts.get(r'create_repo')) | ||||
| @command("qclone", | @command("qclone", | ||||
| [('', 'pull', None, _('use pull protocol to copy metadata')), | [('', 'pull', None, _('use pull protocol to copy metadata')), | ||||
| ('U', 'noupdate', None, | ('U', 'noupdate', None, | ||||
| _('do not update the new working directories')), | _('do not update the new working directories')), | ||||
| ('', 'uncompressed', None, | ('', 'uncompressed', None, | ||||
| _('use uncompressed transfer (fast over LAN)')), | _('use uncompressed transfer (fast over LAN)')), | ||||
| ('p', 'patches', '', | ('p', 'patches', '', | ||||
| Source patch repository is looked for in <src>/.hg/patches by | Source patch repository is looked for in <src>/.hg/patches by | ||||
| default. Use -p <url> to change. | default. Use -p <url> to change. | ||||
| The patch directory must be a nested Mercurial repository, as | The patch directory must be a nested Mercurial repository, as | ||||
| would be created by :hg:`init --mq`. | would be created by :hg:`init --mq`. | ||||
| Return 0 on success. | Return 0 on success. | ||||
| ''' | ''' | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| def patchdir(repo): | def patchdir(repo): | ||||
| """compute a patch repo url from a repo object""" | """compute a patch repo url from a repo object""" | ||||
| url = repo.url() | url = repo.url() | ||||
| if url.endswith('/'): | if url.endswith('/'): | ||||
| url = url[:-1] | url = url[:-1] | ||||
| return url + '/.hg/patches' | return url + '/.hg/patches' | ||||
| # main repo (destination and sources) | # main repo (destination and sources) | ||||
| @command("qseries", | @command("qseries", | ||||
| [('m', 'missing', None, _('print patches not in series')), | [('m', 'missing', None, _('print patches not in series')), | ||||
| ] + seriesopts, | ] + seriesopts, | ||||
| _('hg qseries [-ms]')) | _('hg qseries [-ms]')) | ||||
| def series(ui, repo, **opts): | def series(ui, repo, **opts): | ||||
| """print the entire series file | """print the entire series file | ||||
| Returns 0 on success.""" | Returns 0 on success.""" | ||||
| repo.mq.qseries(repo, missing=opts.get('missing'), | repo.mq.qseries(repo, missing=opts.get(r'missing'), | ||||
| summary=opts.get('summary')) | summary=opts.get(r'summary')) | ||||
| return 0 | return 0 | ||||
| @command("qtop", seriesopts, _('hg qtop [-s]')) | @command("qtop", seriesopts, _('hg qtop [-s]')) | ||||
| def top(ui, repo, **opts): | def top(ui, repo, **opts): | ||||
| """print the name of the current patch | """print the name of the current patch | ||||
| Returns 0 on success.""" | Returns 0 on success.""" | ||||
| q = repo.mq | q = repo.mq | ||||
| if q.applied: | if q.applied: | ||||
| t = q.seriesend(True) | t = q.seriesend(True) | ||||
| else: | else: | ||||
| t = 0 | t = 0 | ||||
| if t: | if t: | ||||
| q.qseries(repo, start=t - 1, length=1, status='A', | q.qseries(repo, start=t - 1, length=1, status='A', | ||||
| summary=opts.get('summary')) | summary=opts.get(r'summary')) | ||||
| else: | else: | ||||
| ui.write(_("no patches applied\n")) | ui.write(_("no patches applied\n")) | ||||
| return 1 | return 1 | ||||
| @command("qnext", seriesopts, _('hg qnext [-s]')) | @command("qnext", seriesopts, _('hg qnext [-s]')) | ||||
| def next(ui, repo, **opts): | def next(ui, repo, **opts): | ||||
| """print the name of the next pushable patch | """print the name of the next pushable patch | ||||
| Returns 0 on success.""" | Returns 0 on success.""" | ||||
| q = repo.mq | q = repo.mq | ||||
| end = q.seriesend() | end = q.seriesend() | ||||
| if end == len(q.series): | if end == len(q.series): | ||||
| ui.write(_("all patches applied\n")) | ui.write(_("all patches applied\n")) | ||||
| return 1 | return 1 | ||||
| q.qseries(repo, start=end, length=1, summary=opts.get('summary')) | q.qseries(repo, start=end, length=1, summary=opts.get(r'summary')) | ||||
| @command("qprev", seriesopts, _('hg qprev [-s]')) | @command("qprev", seriesopts, _('hg qprev [-s]')) | ||||
| def prev(ui, repo, **opts): | def prev(ui, repo, **opts): | ||||
| """print the name of the preceding applied patch | """print the name of the preceding applied patch | ||||
| Returns 0 on success.""" | Returns 0 on success.""" | ||||
| q = repo.mq | q = repo.mq | ||||
| l = len(q.applied) | l = len(q.applied) | ||||
| if l == 1: | if l == 1: | ||||
| ui.write(_("only one patch applied\n")) | ui.write(_("only one patch applied\n")) | ||||
| return 1 | return 1 | ||||
| if not l: | if not l: | ||||
| ui.write(_("no patches applied\n")) | ui.write(_("no patches applied\n")) | ||||
| return 1 | return 1 | ||||
| idx = q.series.index(q.applied[-2].name) | idx = q.series.index(q.applied[-2].name) | ||||
| q.qseries(repo, start=idx, length=1, status='A', | q.qseries(repo, start=idx, length=1, status='A', | ||||
| summary=opts.get('summary')) | summary=opts.get(r'summary')) | ||||
| def setupheaderopts(ui, opts): | def setupheaderopts(ui, opts): | ||||
| if not opts.get('user') and opts.get('currentuser'): | if not opts.get('user') and opts.get('currentuser'): | ||||
| opts['user'] = ui.username() | opts['user'] = ui.username() | ||||
| if not opts.get('date') and opts.get('currentdate'): | if not opts.get('date') and opts.get('currentdate'): | ||||
| opts['date'] = "%d %d" % util.makedate() | opts['date'] = "%d %d" % util.makedate() | ||||
| @command("^qnew", | @command("^qnew", | ||||
| Use the -g/--git option to keep the patch in the git extended diff | Use the -g/--git option to keep the patch in the git extended diff | ||||
| format. Read the diffs help topic for more information on why this | format. Read the diffs help topic for more information on why this | ||||
| is important for preserving permission changes and copy/rename | is important for preserving permission changes and copy/rename | ||||
| information. | information. | ||||
| Returns 0 on successful creation of a new patch. | Returns 0 on successful creation of a new patch. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| msg = cmdutil.logmessage(ui, opts) | msg = cmdutil.logmessage(ui, opts) | ||||
| q = repo.mq | q = repo.mq | ||||
| opts['msg'] = msg | opts['msg'] = msg | ||||
| setupheaderopts(ui, opts) | setupheaderopts(ui, opts) | ||||
| q.new(repo, patch, *args, **opts) | q.new(repo, patch, *args, **pycompat.strkwargs(opts)) | ||||
| q.savedirty() | q.savedirty() | ||||
| return 0 | return 0 | ||||
| @command("^qrefresh", | @command("^qrefresh", | ||||
| [('e', 'edit', None, _('invoke editor on commit messages')), | [('e', 'edit', None, _('invoke editor on commit messages')), | ||||
| ('g', 'git', None, _('use git extended diff format')), | ('g', 'git', None, _('use git extended diff format')), | ||||
| ('s', 'short', None, | ('s', 'short', None, | ||||
| _('refresh only files already in the patch and specified files')), | _('refresh only files already in the patch and specified files')), | ||||
| hg add/remove/copy/rename work as usual, though you might want to | hg add/remove/copy/rename work as usual, though you might want to | ||||
| use git-style patches (-g/--git or [diff] git=1) to track copies | use git-style patches (-g/--git or [diff] git=1) to track copies | ||||
| and renames. See the diffs help topic for more information on the | and renames. See the diffs help topic for more information on the | ||||
| git diff format. | git diff format. | ||||
| Returns 0 on success. | Returns 0 on success. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| q = repo.mq | q = repo.mq | ||||
| message = cmdutil.logmessage(ui, opts) | message = cmdutil.logmessage(ui, opts) | ||||
| setupheaderopts(ui, opts) | setupheaderopts(ui, opts) | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| ret = q.refresh(repo, pats, msg=message, **opts) | ret = q.refresh(repo, pats, msg=message, **pycompat.strkwargs(opts)) | ||||
| q.savedirty() | q.savedirty() | ||||
| return ret | return ret | ||||
| @command("^qdiff", | @command("^qdiff", | ||||
| cmdutil.diffopts + cmdutil.diffopts2 + cmdutil.walkopts, | cmdutil.diffopts + cmdutil.diffopts2 + cmdutil.walkopts, | ||||
| _('hg qdiff [OPTION]... [FILE]...'), | _('hg qdiff [OPTION]... [FILE]...'), | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def diff(ui, repo, *pats, **opts): | def diff(ui, repo, *pats, **opts): | ||||
| """diff of the current patch and subsequent modifications | """diff of the current patch and subsequent modifications | ||||
| Shows a diff which includes the current patch as well as any | Shows a diff which includes the current patch as well as any | ||||
| changes which have been made in the working directory since the | changes which have been made in the working directory since the | ||||
| last refresh (thus showing what the current patch would become | last refresh (thus showing what the current patch would become | ||||
| after a qrefresh). | after a qrefresh). | ||||
| Use :hg:`diff` if you only want to see the changes made since the | Use :hg:`diff` if you only want to see the changes made since the | ||||
| last qrefresh, or :hg:`export qtip` if you want to see changes | last qrefresh, or :hg:`export qtip` if you want to see changes | ||||
| made by the current patch without including changes made since the | made by the current patch without including changes made since the | ||||
| qrefresh. | qrefresh. | ||||
| Returns 0 on success. | Returns 0 on success. | ||||
| """ | """ | ||||
| ui.pager('qdiff') | ui.pager('qdiff') | ||||
| repo.mq.diff(repo, pats, opts) | repo.mq.diff(repo, pats, pycompat.byteskwargs(opts)) | ||||
| return 0 | return 0 | ||||
| @command('qfold', | @command('qfold', | ||||
| [('e', 'edit', None, _('invoke editor on commit messages')), | [('e', 'edit', None, _('invoke editor on commit messages')), | ||||
| ('k', 'keep', None, _('keep folded patch files')), | ('k', 'keep', None, _('keep folded patch files')), | ||||
| ] + cmdutil.commitopts, | ] + cmdutil.commitopts, | ||||
| _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')) | _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')) | ||||
| def fold(ui, repo, *files, **opts): | def fold(ui, repo, *files, **opts): | ||||
| """fold the named patches into the current patch | """fold the named patches into the current patch | ||||
| Patches must not yet be applied. Each patch will be successively | Patches must not yet be applied. Each patch will be successively | ||||
| applied to the current patch in the order given. If all the | applied to the current patch in the order given. If all the | ||||
| patches apply successfully, the current patch will be refreshed | patches apply successfully, the current patch will be refreshed | ||||
| with the new cumulative patch, and the folded patches will be | with the new cumulative patch, and the folded patches will be | ||||
| deleted. With -k/--keep, the folded patch files will not be | deleted. With -k/--keep, the folded patch files will not be | ||||
| removed afterwards. | removed afterwards. | ||||
| The header for each folded patch will be concatenated with the | The header for each folded patch will be concatenated with the | ||||
| current patch header, separated by a line of ``* * *``. | current patch header, separated by a line of ``* * *``. | ||||
| Returns 0 on success.""" | Returns 0 on success.""" | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| q = repo.mq | q = repo.mq | ||||
| if not files: | if not files: | ||||
| raise error.Abort(_('qfold requires at least one patch name')) | raise error.Abort(_('qfold requires at least one patch name')) | ||||
| if not q.checktoppatch(repo)[0]: | if not q.checktoppatch(repo)[0]: | ||||
| raise error.Abort(_('no patches applied')) | raise error.Abort(_('no patches applied')) | ||||
| q.checklocalchanges(repo) | q.checklocalchanges(repo) | ||||
| message = cmdutil.logmessage(ui, opts) | message = cmdutil.logmessage(ui, opts) | ||||
| _('tolerate non-conflicting local changes')), | _('tolerate non-conflicting local changes')), | ||||
| ('f', 'force', None, _('overwrite any local changes')), | ('f', 'force', None, _('overwrite any local changes')), | ||||
| ('', 'no-backup', None, _('do not save backup copies of files'))], | ('', 'no-backup', None, _('do not save backup copies of files'))], | ||||
| _('hg qgoto [OPTION]... PATCH')) | _('hg qgoto [OPTION]... PATCH')) | ||||
| def goto(ui, repo, patch, **opts): | def goto(ui, repo, patch, **opts): | ||||
| '''push or pop patches until named patch is at top of stack | '''push or pop patches until named patch is at top of stack | ||||
| Returns 0 on success.''' | Returns 0 on success.''' | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| opts = fixkeepchangesopts(ui, opts) | opts = fixkeepchangesopts(ui, opts) | ||||
| q = repo.mq | q = repo.mq | ||||
| patch = q.lookup(patch) | patch = q.lookup(patch) | ||||
| nobackup = opts.get('no_backup') | nobackup = opts.get('no_backup') | ||||
| keepchanges = opts.get('keep_changes') | keepchanges = opts.get('keep_changes') | ||||
| if q.isapplied(patch): | if q.isapplied(patch): | ||||
| ret = q.pop(repo, patch, force=opts.get('force'), nobackup=nobackup, | ret = q.pop(repo, patch, force=opts.get('force'), nobackup=nobackup, | ||||
| keepchanges=keepchanges) | keepchanges=keepchanges) | ||||
| ui.write(guard, label='qguard.unguarded') | ui.write(guard, label='qguard.unguarded') | ||||
| if i != len(guards) - 1: | if i != len(guards) - 1: | ||||
| ui.write(' ') | ui.write(' ') | ||||
| ui.write('\n') | ui.write('\n') | ||||
| q = repo.mq | q = repo.mq | ||||
| applied = set(p.name for p in q.applied) | applied = set(p.name for p in q.applied) | ||||
| patch = None | patch = None | ||||
| args = list(args) | args = list(args) | ||||
| if opts.get('list'): | if opts.get(r'list'): | ||||
| if args or opts.get('none'): | if args or opts.get('none'): | ||||
| raise error.Abort(_('cannot mix -l/--list with options or ' | raise error.Abort(_('cannot mix -l/--list with options or ' | ||||
| 'arguments')) | 'arguments')) | ||||
| for i in xrange(len(q.series)): | for i in xrange(len(q.series)): | ||||
| status(i) | status(i) | ||||
| return | return | ||||
| if not args or args[0][0:1] in '-+': | if not args or args[0][0:1] in '-+': | ||||
| if not q.applied: | if not q.applied: | ||||
| overlap with patched files. With -f/--force, backup and patch over | overlap with patched files. With -f/--force, backup and patch over | ||||
| uncommitted changes. | uncommitted changes. | ||||
| Return 0 on success. | Return 0 on success. | ||||
| """ | """ | ||||
| q = repo.mq | q = repo.mq | ||||
| mergeq = None | mergeq = None | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| opts = fixkeepchangesopts(ui, opts) | opts = fixkeepchangesopts(ui, opts) | ||||
| if opts.get('merge'): | if opts.get('merge'): | ||||
| if opts.get('name'): | if opts.get('name'): | ||||
| newpath = repo.vfs.join(opts.get('name')) | newpath = repo.vfs.join(opts.get('name')) | ||||
| else: | else: | ||||
| newpath, i = lastsavename(q.path) | newpath, i = lastsavename(q.path) | ||||
| if not newpath: | if not newpath: | ||||
| ui.warn(_("no saved queues found, please use -n\n")) | ui.warn(_("no saved queues found, please use -n\n")) | ||||
| By default, abort if the working directory contains uncommitted | By default, abort if the working directory contains uncommitted | ||||
| changes. With --keep-changes, abort only if the uncommitted files | changes. With --keep-changes, abort only if the uncommitted files | ||||
| overlap with patched files. With -f/--force, backup and discard | overlap with patched files. With -f/--force, backup and discard | ||||
| changes made to such files. | changes made to such files. | ||||
| Return 0 on success. | Return 0 on success. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| opts = fixkeepchangesopts(ui, opts) | opts = fixkeepchangesopts(ui, opts) | ||||
| localupdate = True | localupdate = True | ||||
| if opts.get('name'): | if opts.get('name'): | ||||
| q = queue(ui, repo.baseui, repo.path, repo.vfs.join(opts.get('name'))) | q = queue(ui, repo.baseui, repo.path, repo.vfs.join(opts.get('name'))) | ||||
| ui.warn(_('using patch queue: %s\n') % q.path) | ui.warn(_('using patch queue: %s\n') % q.path) | ||||
| localupdate = False | localupdate = False | ||||
| else: | else: | ||||
| q = repo.mq | q = repo.mq | ||||
| ('u', 'update', None, _('update queue working directory'))], | ('u', 'update', None, _('update queue working directory'))], | ||||
| _('hg qrestore [-d] [-u] REV')) | _('hg qrestore [-d] [-u] REV')) | ||||
| def restore(ui, repo, rev, **opts): | def restore(ui, repo, rev, **opts): | ||||
| """restore the queue state saved by a revision (DEPRECATED) | """restore the queue state saved by a revision (DEPRECATED) | ||||
| This command is deprecated, use :hg:`rebase` instead.""" | This command is deprecated, use :hg:`rebase` instead.""" | ||||
| rev = repo.lookup(rev) | rev = repo.lookup(rev) | ||||
| q = repo.mq | q = repo.mq | ||||
| q.restore(repo, rev, delete=opts.get('delete'), | q.restore(repo, rev, delete=opts.get(r'delete'), | ||||
| qupdate=opts.get('update')) | qupdate=opts.get(r'update')) | ||||
| q.savedirty() | q.savedirty() | ||||
| return 0 | return 0 | ||||
| @command("qsave", | @command("qsave", | ||||
| [('c', 'copy', None, _('copy patch directory')), | [('c', 'copy', None, _('copy patch directory')), | ||||
| ('n', 'name', '', | ('n', 'name', '', | ||||
| _('copy directory name'), _('NAME')), | _('copy directory name'), _('NAME')), | ||||
| ('e', 'empty', None, _('clear queue status file')), | ('e', 'empty', None, _('clear queue status file')), | ||||
| ('f', 'force', None, _('force copy'))] + cmdutil.commitopts, | ('f', 'force', None, _('force copy'))] + cmdutil.commitopts, | ||||
| _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')) | _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')) | ||||
| def save(ui, repo, **opts): | def save(ui, repo, **opts): | ||||
| """save current queue state (DEPRECATED) | """save current queue state (DEPRECATED) | ||||
| This command is deprecated, use :hg:`rebase` instead.""" | This command is deprecated, use :hg:`rebase` instead.""" | ||||
| q = repo.mq | q = repo.mq | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| message = cmdutil.logmessage(ui, opts) | message = cmdutil.logmessage(ui, opts) | ||||
| ret = q.save(repo, msg=message) | ret = q.save(repo, msg=message) | ||||
| if ret: | if ret: | ||||
| return ret | return ret | ||||
| q.savedirty() # save to .hg/patches before copying | q.savedirty() # save to .hg/patches before copying | ||||
| if opts.get('copy'): | if opts.get('copy'): | ||||
| path = q.path | path = q.path | ||||
| if opts.get('name'): | if opts.get('name'): | ||||
| guarded patches. | guarded patches. | ||||
| Use -s/--series to print a list of all guards in the series file | Use -s/--series to print a list of all guards in the series file | ||||
| (no other arguments needed). Use -v for more information. | (no other arguments needed). Use -v for more information. | ||||
| Returns 0 on success.''' | Returns 0 on success.''' | ||||
| q = repo.mq | q = repo.mq | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| guards = q.active() | guards = q.active() | ||||
| pushable = lambda i: q.pushable(q.applied[i].name)[0] | pushable = lambda i: q.pushable(q.applied[i].name)[0] | ||||
| if args or opts.get('none'): | if args or opts.get('none'): | ||||
| old_unapplied = q.unapplied(repo) | old_unapplied = q.unapplied(repo) | ||||
| old_guarded = [i for i in xrange(len(q.applied)) if not pushable(i)] | old_guarded = [i for i in xrange(len(q.applied)) if not pushable(i)] | ||||
| q.setactive(args) | q.setactive(args) | ||||
| q.savedirty() | q.savedirty() | ||||
| if not args: | if not args: | ||||
| stack of applied patches. | stack of applied patches. | ||||
| This can be especially useful if your changes have been applied to | This can be especially useful if your changes have been applied to | ||||
| an upstream repository, or if you are about to push your changes | an upstream repository, or if you are about to push your changes | ||||
| to upstream. | to upstream. | ||||
| Returns 0 on success. | Returns 0 on success. | ||||
| """ | """ | ||||
| if not opts.get('applied') and not revrange: | if not opts.get(r'applied') and not revrange: | ||||
| raise error.Abort(_('no revisions specified')) | raise error.Abort(_('no revisions specified')) | ||||
| elif opts.get('applied'): | elif opts.get(r'applied'): | ||||
| revrange = ('qbase::qtip',) + revrange | revrange = ('qbase::qtip',) + revrange | ||||
| q = repo.mq | q = repo.mq | ||||
| if not q.applied: | if not q.applied: | ||||
| ui.status(_('no patches applied\n')) | ui.status(_('no patches applied\n')) | ||||
| return 0 | return 0 | ||||
| revs = scmutil.revrange(repo, revrange) | revs = scmutil.revrange(repo, revrange) | ||||
| fh = repo.vfs('patches.queues.new', 'w') | fh = repo.vfs('patches.queues.new', 'w') | ||||
| for queue in existing: | for queue in existing: | ||||
| if queue == name: | if queue == name: | ||||
| continue | continue | ||||
| fh.write('%s\n' % (queue,)) | fh.write('%s\n' % (queue,)) | ||||
| fh.close() | fh.close() | ||||
| repo.vfs.rename('patches.queues.new', _allqueues) | repo.vfs.rename('patches.queues.new', _allqueues) | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| if not name or opts.get('list') or opts.get('active'): | if not name or opts.get('list') or opts.get('active'): | ||||
| current = _getcurrent() | current = _getcurrent() | ||||
| if opts.get('active'): | if opts.get('active'): | ||||
| ui.write('%s\n' % (current,)) | ui.write('%s\n' % (current,)) | ||||
| return | return | ||||
| for queue in _getqueues(): | for queue in _getqueues(): | ||||
| ui.write('%s' % (queue,)) | ui.write('%s' % (queue,)) | ||||
| if queue == current and not ui.quiet: | if queue == current and not ui.quiet: | ||||
| if repo.local(): | if repo.local(): | ||||
| repo.__class__ = mqrepo | repo.__class__ = mqrepo | ||||
| repo._phasedefaults.append(mqphasedefaults) | repo._phasedefaults.append(mqphasedefaults) | ||||
| def mqimport(orig, ui, repo, *args, **kwargs): | def mqimport(orig, ui, repo, *args, **kwargs): | ||||
| if (util.safehasattr(repo, 'abortifwdirpatched') | if (util.safehasattr(repo, 'abortifwdirpatched') | ||||
| and not kwargs.get('no_commit', False)): | and not kwargs.get(r'no_commit', False)): | ||||
| repo.abortifwdirpatched(_('cannot import over an applied patch'), | repo.abortifwdirpatched(_('cannot import over an applied patch'), | ||||
| kwargs.get('force')) | kwargs.get(r'force')) | ||||
| return orig(ui, repo, *args, **kwargs) | return orig(ui, repo, *args, **kwargs) | ||||
| def mqinit(orig, ui, *args, **kwargs): | def mqinit(orig, ui, *args, **kwargs): | ||||
| mq = kwargs.pop('mq', None) | mq = kwargs.pop(r'mq', None) | ||||
| if not mq: | if not mq: | ||||
| return orig(ui, *args, **kwargs) | return orig(ui, *args, **kwargs) | ||||
| if args: | if args: | ||||
| repopath = args[0] | repopath = args[0] | ||||
| if not hg.islocal(repopath): | if not hg.islocal(repopath): | ||||
| raise error.Abort(_('only a local queue repository ' | raise error.Abort(_('only a local queue repository ' | ||||