mercurial-scm/hg-stable: mercurial/commands.py comparison

comparison mercurial/commands.py @ 43076:2372284d9457

formatting: blacken the codebase This is using my patch to black (https://github.com/psf/black/pull/826) so we don't un-wrap collection literals. Done with: hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S # skip-blame mass-reformatting only # no-check-commit reformats foo_bar functions Differential Revision: https://phab.mercurial-scm.org/D6971

author	Augie Fackler <augie@google.com>
date	Sun, 06 Oct 2019 09:45:02 -0400
parents	c04e0836f039
children	687b865b95ad

comparison

equal deleted inserted replaced

-:57875cf423c9
+:2372284d9457
 INTENT_READONLY = registrar.INTENT_READONLY
 # common command options
 globalopts = [
-('R', 'repository', '',
+(
-_('repository root directory or name of overlay bundle file'),
+'R',
-_('REPO')),
+'repository',
-('', 'cwd', '',
+'',
-_('change working directory'), _('DIR')),
+_('repository root directory or name of overlay bundle file'),
-('y', 'noninteractive', None,
+_('REPO'),
-_('do not prompt, automatically pick the first choice for all prompts')),
+),
+('', 'cwd', '', _('change working directory'), _('DIR')),
+(
+'y',
+'noninteractive',
+None,
+_('do not prompt, automatically pick the first choice for all prompts'),
+),
 ('q', 'quiet', None, _('suppress output')),
 ('v', 'verbose', None, _('enable additional output')),
-('', 'color', '',
+(
-# i18n: 'always', 'auto', 'never', and 'debug' are keywords
+'',
-# and should not be translated
+'color',
-_("when to colorize (boolean, always, auto, never, or debug)"),
+'',
-_('TYPE')),
+# i18n: 'always', 'auto', 'never', and 'debug' are keywords
-('', 'config', [],
+# and should not be translated
-_('set/override config option (use \'section.name=value\')'),
+_("when to colorize (boolean, always, auto, never, or debug)"),
-_('CONFIG')),
+_('TYPE'),
+),
+(
+'',
+'config',
+[],
+_('set/override config option (use \'section.name=value\')'),
+_('CONFIG'),
+),
 ('', 'debug', None, _('enable debugging output')),
 ('', 'debugger', None, _('start debugger')),
-('', 'encoding', encoding.encoding, _('set the charset encoding'),
+(
-_('ENCODE')),
+'',
-('', 'encodingmode', encoding.encodingmode,
+'encoding',
-_('set the charset encoding mode'), _('MODE')),
+encoding.encoding,
+_('set the charset encoding'),
+_('ENCODE'),
+),
+(
+'',
+'encodingmode',
+encoding.encodingmode,
+_('set the charset encoding mode'),
+_('MODE'),
+),
 ('', 'traceback', None, _('always print a traceback on exception')),
 ('', 'time', None, _('time how long the command takes')),
 ('', 'profile', None, _('print command execution profile')),
 ('', 'version', None, _('output version information and exit')),
 ('h', 'help', None, _('display help and exit')),
 ('', 'hidden', False, _('consider hidden changesets')),
-('', 'pager', 'auto',
+(
-_("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
+'',
+'pager',
+'auto',
+_("when to paginate (boolean, always, auto, or never)"),
+_('TYPE'),
+),
 ]
 dryrunopts = cmdutil.dryrunopts
 remoteopts = cmdutil.remoteopts
 walkopts = cmdutil.walkopts
 subrepoopts = cmdutil.subrepoopts
 debugrevlogopts = cmdutil.debugrevlogopts
 # Commands start here, listed alphabetically
-@command('abort',
-dryrunopts, helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
+@command(
-helpbasic=True)
+'abort',
+dryrunopts,
+helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
+helpbasic=True,
+)
 def abort(ui, repo, **opts):
 """abort an unfinished operation (EXPERIMENTAL)
 Aborts a multistep operation like graft, histedit, rebase, merge,
 and unshelve if they are in an unfinished state.
 dryrun = opts.get(r'dry_run')
 abortstate = cmdutil.getunfinishedstate(repo)
 if not abortstate:
 raise error.Abort(_('no operation in progress'))
 if not abortstate.abortfunc:
-raise error.Abort((_("%s in progress but does not support 'hg abort'") %
+raise error.Abort(
-(abortstate._opname)), hint=abortstate.hint())
+(
+_("%s in progress but does not support 'hg abort'")
+% (abortstate._opname)
+),
+hint=abortstate.hint(),
+)
 if dryrun:
 ui.status(_('%s in progress, will be aborted\n') % (abortstate._opname))
 return
 return abortstate.abortfunc(ui, repo)
-@command('add',
+@command(
+'add',
 walkopts + subrepoopts + dryrunopts,
 _('[OPTION]... [FILE]...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
-helpbasic=True, inferrepo=True)
+helpbasic=True,
+inferrepo=True,
+)
 def add(ui, repo, *pats, **opts):
 """add the specified files on the next commit
 Schedule files to be version controlled and added to the
 repository.
 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
 rejected = cmdutil.add(ui, repo, m, "", uipathfn, False, **opts)
 return rejected and 1 or 0
-@command('addremove',
+@command(
+'addremove',
 similarityopts + subrepoopts + walkopts + dryrunopts,
 _('[OPTION]... [FILE]...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
-inferrepo=True)
+inferrepo=True,
+)
 def addremove(ui, repo, *pats, **opts):
 """add all new files, delete all missing files
 Add all new files and remove all missing files from the
 repository.
 matcher = scmutil.match(repo[None], pats, opts)
 relative = scmutil.anypats(pats, opts)
 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
 return scmutil.addremove(repo, matcher, "", uipathfn, opts)
-@command('annotate|blame',
-[('r', 'rev', '', _('annotate the specified revision'), _('REV')),
+@command(
-('', 'follow', None,
+'annotate|blame',
-_('follow copies/renames and list the filename (DEPRECATED)')),
+[
-('', 'no-follow', None, _("don't follow copies and renames")),
+('r', 'rev', '', _('annotate the specified revision'), _('REV')),
-('a', 'text', None, _('treat all files as text')),
+(
-('u', 'user', None, _('list the author (long with -v)')),
+'',
-('f', 'file', None, _('list the filename')),
+'follow',
-('d', 'date', None, _('list the date (short with -q)')),
+None,
-('n', 'number', None, _('list the revision number (default)')),
+_('follow copies/renames and list the filename (DEPRECATED)'),
-('c', 'changeset', None, _('list the changeset')),
+),
-('l', 'line-number', None, _('show line number at the first appearance')),
+('', 'no-follow', None, _("don't follow copies and renames")),
-('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
+('a', 'text', None, _('treat all files as text')),
-] + diffwsopts + walkopts + formatteropts,
+('u', 'user', None, _('list the author (long with -v)')),
+('f', 'file', None, _('list the filename')),
+('d', 'date', None, _('list the date (short with -q)')),
+('n', 'number', None, _('list the revision number (default)')),
+('c', 'changeset', None, _('list the changeset')),
+(
+'l',
+'line-number',
+None,
+_('show line number at the first appearance'),
+),
+('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
+]
++ diffwsopts
++ walkopts
++ formatteropts,
 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
 helpcategory=command.CATEGORY_FILE_CONTENTS,
-helpbasic=True, inferrepo=True)
+helpbasic=True,
+inferrepo=True,
+)
 def annotate(ui, repo, *pats, **opts):
 """show changeset information by line for each file
 List changes in files, showing the revision id responsible for
 each line.
 if opts.get('follow'):
 # --follow is deprecated and now just an alias for -f/--file
 # to mimic the behavior of Mercurial before version 1.5
 opts['file'] = True
-if (not opts.get('user') and not opts.get('changeset')
+if (
-and not opts.get('date') and not opts.get('file')):
+not opts.get('user')
+and not opts.get('changeset')
+and not opts.get('date')
+and not opts.get('file')
+):
 opts['number'] = True
 linenumber = opts.get('line_number') is not None
 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
 raise error.Abort(_('at least one of -n/-c is required for -l'))
 ui.pager('annotate')
 rootfm = ui.formatter('annotate', opts)
 if ui.debugflag:
 shorthex = pycompat.identity
 else:
 def shorthex(h):
 return h[:12]
 if ui.quiet:
 datefunc = dateutil.shortdate
 else:
 datefunc = dateutil.datestr
 if ctx.rev() is None:
 def formatrev(rev):
 if rev == wdirrev:
 return '%d' % ctx.p1().rev()
 else:
 return '%d' % rev
 else:
 def formatrev(rev):
 if rev == wdirrev:
 return '%d+' % ctx.p1().rev()
 else:
 return '%d ' % rev
 def formathex(h):
 if h == wdirhex:
 return '%s+' % shorthex(hex(ctx.p1().node()))
 else:
 return '%s ' % shorthex(h)
 else:
 formatrev = b'%d'.__mod__
 formathex = shorthex
 opmap = [
 'path': 'file',
 'lineno': 'line_number',
 }
 if rootfm.isplain():
 def makefunc(get, fmt):
 return lambda x: fmt(get(x))
 else:
 def makefunc(get, fmt):
 return get
 datahint = rootfm.datahint()
-funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
+funcmap = [
-if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
+(makefunc(get, fmt), sep)
-funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
+for fn, sep, get, fmt in opmap
-fields = ' '.join(fn for fn, sep, get, fmt in opmap
+if opts.get(opnamemap.get(fn, fn)) or fn in datahint
-if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
+]
+funcmap[0] = (funcmap[0][0], '')  # no separator in front of first column
+fields = ' '.join(
+fn
+for fn, sep, get, fmt in opmap
+if opts.get(opnamemap.get(fn, fn)) or fn in datahint
+)
 def bad(x, y):
 raise error.Abort("%s: %s" % (x, y))
 m = scmutil.match(ctx, pats, opts, badfn=bad)
 follow = not opts.get('no_follow')
-diffopts = patch.difffeatureopts(ui, opts, section='annotate',
+diffopts = patch.difffeatureopts(
-whitespace=True)
+ui, opts, section='annotate', whitespace=True
+)
 skiprevs = opts.get('skip')
 if skiprevs:
 skiprevs = scmutil.revrange(repo, skiprevs)
 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
 if not opts.get('text') and fctx.isbinary():
 rootfm.plain(_("%s: binary file\n") % uipathfn(abs))
 continue
 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
-lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
+lines = fctx.annotate(
-diffopts=diffopts)
+follow=follow, skiprevs=skiprevs, diffopts=diffopts
+)
 if not lines:
 fm.end()
 continue
 formats = []
 pieces = []
 fm.plain('\n')
 fm.end()
 rootfm.end()
-@command('archive',
-[('', 'no-decode', None, _('do not pass files through decoders')),
+@command(
-('p', 'prefix', '', _('directory prefix for files in archive'),
+'archive',
-_('PREFIX')),
+[
-('r', 'rev', '', _('revision to distribute'), _('REV')),
+('', 'no-decode', None, _('do not pass files through decoders')),
-('t', 'type', '', _('type of distribution to create'), _('TYPE')),
+(
-] + subrepoopts + walkopts,
+'p',
+'prefix',
+'',
+_('directory prefix for files in archive'),
+_('PREFIX'),
+),
+('r', 'rev', '', _('revision to distribute'), _('REV')),
+('t', 'type', '', _('type of distribution to create'), _('TYPE')),
+]
++ subrepoopts
++ walkopts,
 _('[OPTION]... DEST'),
-helpcategory=command.CATEGORY_IMPORT_EXPORT)
+helpcategory=command.CATEGORY_IMPORT_EXPORT,
+)
 def archive(ui, repo, dest, **opts):
 '''create an unversioned archive of a repository revision
 By default, the revision used is the parent of the working
 directory; use -r/--rev to specify a different revision.
 if not prefix:
 prefix = os.path.basename(repo.root) + '-%h'
 prefix = cmdutil.makefilename(ctx, prefix)
 match = scmutil.match(ctx, [], opts)
-archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
+archival.archive(
-match, prefix, subrepos=opts.get('subrepos'))
+repo,
+dest,
-@command('backout',
+node,
-[('', 'merge', None, _('merge with old dirstate parent after backout')),
+kind,
-('', 'commit', None,
+not opts.get('no_decode'),
-_('commit if no conflicts were encountered (DEPRECATED)')),
+match,
-('', 'no-commit', None, _('do not commit')),
+prefix,
-('', 'parent', '',
+subrepos=opts.get('subrepos'),
-_('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
+)
-('r', 'rev', '', _('revision to backout'), _('REV')),
-('e', 'edit', False, _('invoke editor on commit messages')),
-] + mergetoolopts + walkopts + commitopts + commitopts2,
+@command(
+'backout',
+[
+('', 'merge', None, _('merge with old dirstate parent after backout')),
+(
+'',
+'commit',
+None,
+_('commit if no conflicts were encountered (DEPRECATED)'),
+),
+('', 'no-commit', None, _('do not commit')),
+(
+'',
+'parent',
+'',
+_('parent to choose when backing out merge (DEPRECATED)'),
+_('REV'),
+),
+('r', 'rev', '', _('revision to backout'), _('REV')),
+('e', 'edit', False, _('invoke editor on commit messages')),
+]
++ mergetoolopts
++ walkopts
++ commitopts
++ commitopts2,
 _('[OPTION]... [-r] REV'),
-helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
+helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
+)
 def backout(ui, repo, node=None, rev=None, **opts):
 '''reverse effect of earlier changeset
 Prepare a new changeset with the effect of REV undone in the
 current working directory. If no conflicts were encountered,
 Returns 0 on success, 1 if nothing to backout or there are unresolved
 files.
 '''
 with repo.wlock(), repo.lock():
 return _dobackout(ui, repo, node, rev, **opts)
 def _dobackout(ui, repo, node=None, rev=None, **opts):
 opts = pycompat.byteskwargs(opts)
 if opts.get('commit') and opts.get('no_commit'):
 raise error.Abort(_("cannot use --commit with --no-commit"))
 if p2 != nullid:
 if not opts.get('parent'):
 raise error.Abort(_('cannot backout a merge changeset'))
 p = repo.lookup(opts['parent'])
 if p not in (p1, p2):
-raise error.Abort(_('%s is not a parent of %s') %
+raise error.Abort(
-(short(p), short(node)))
+_('%s is not a parent of %s') % (short(p), short(node))
+)
 parent = p
 else:
 if opts.get('parent'):
 raise error.Abort(_('cannot use --parent on non-merge changeset'))
 parent = p1
 rctx = scmutil.revsingle(repo, hex(parent))
 if not opts.get('merge') and op1 != node:
 with dirstateguard.dirstateguard(repo, 'backout'):
 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
 with ui.configoverride(overrides, 'backout'):
-stats = mergemod.update(repo, parent, branchmerge=True,
+stats = mergemod.update(
-force=True, ancestor=node,
+repo,
-mergeancestor=False)
+parent,
+branchmerge=True,
+force=True,
+ancestor=node,
+mergeancestor=False,
+)
 repo.setparents(op1, op2)
 hg._showstats(repo, stats)
 if stats.unresolvedcount:
-repo.ui.status(_("use 'hg resolve' to retry unresolved "
+repo.ui.status(
-"file merges\n"))
+_("use 'hg resolve' to retry unresolved " "file merges\n")
+)
 return 1
 else:
 hg.clean(repo, node, show_stats=False)
 repo.dirstate.setbranch(branch)
 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
 if opts.get('no_commit'):
-msg = _("changeset %s backed out, "
+msg = _("changeset %s backed out, " "don't forget to commit.\n")
-"don't forget to commit.\n")
 ui.status(msg % short(node))
 return 0
 def commitfunc(ui, repo, message, match, opts):
 editform = 'backout'
-e = cmdutil.getcommiteditor(editform=editform,
+e = cmdutil.getcommiteditor(
-**pycompat.strkwargs(opts))
+editform=editform, **pycompat.strkwargs(opts)
+)
 if not message:
 # we don't translate commit messages
 message = "Backed out changeset %s" % short(node)
 e = cmdutil.getcommiteditor(edit=True, editform=editform)
-return repo.commit(message, opts.get('user'), opts.get('date'),
+return repo.commit(
-match, editor=e)
+message, opts.get('user'), opts.get('date'), match, editor=e
+)
 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
 if not newnode:
 ui.status(_("nothing changed\n"))
 return 1
 cmdutil.commitstatus(repo, newnode, branch, bheads)
 def nice(node):
 return '%d:%s' % (repo.changelog.rev(node), short(node))
-ui.status(_('changeset %s backs out changeset %s\n') %
-(nice(repo.changelog.tip()), nice(node)))
+ui.status(
+_('changeset %s backs out changeset %s\n')
+% (nice(repo.changelog.tip()), nice(node))
+)
 if opts.get('merge') and op1 != node:
 hg.clean(repo, op1, show_stats=False)
-ui.status(_('merging with changeset %s\n')
+ui.status(_('merging with changeset %s\n') % nice(repo.changelog.tip()))
-% nice(repo.changelog.tip()))
 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
 with ui.configoverride(overrides, 'backout'):
 return hg.merge(repo, hex(repo.changelog.tip()))
 return 0
-@command('bisect',
-[('r', 'reset', False, _('reset bisect state')),
+@command(
-('g', 'good', False, _('mark changeset good')),
+'bisect',
-('b', 'bad', False, _('mark changeset bad')),
+[
-('s', 'skip', False, _('skip testing changeset')),
+('r', 'reset', False, _('reset bisect state')),
-('e', 'extend', False, _('extend the bisect range')),
+('g', 'good', False, _('mark changeset good')),
-('c', 'command', '', _('use command to check changeset state'), _('CMD')),
+('b', 'bad', False, _('mark changeset bad')),
-('U', 'noupdate', False, _('do not update to target'))],
+('s', 'skip', False, _('skip testing changeset')),
+('e', 'extend', False, _('extend the bisect range')),
+(
+'c',
+'command',
+'',
+_('use command to check changeset state'),
+_('CMD'),
+),
+('U', 'noupdate', False, _('do not update to target')),
+],
 _("[-gbsr] [-U] [-c CMD] [REV]"),
-helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
+helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
-def bisect(ui, repo, rev=None, extra=None, command=None,
+)
-reset=None, good=None, bad=None, skip=None, extend=None,
+def bisect(
-noupdate=None):
+ui,
+repo,
+rev=None,
+extra=None,
+command=None,
+reset=None,
+good=None,
+bad=None,
+skip=None,
+extend=None,
+noupdate=None,
+):
 """subdivision search of changesets
 This command helps to find changesets which introduce problems. To
 use, mark the earliest changeset you know exhibits the problem as
 bad, then mark the latest changeset which is free from the problem
 }
 enabled = [x for x in incompatibles if incompatibles[x]]
 if len(enabled) > 1:
-raise error.Abort(_('%s and %s are incompatible') %
+raise error.Abort(
-tuple(sorted(enabled)[0:2]))
+_('%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
+)
 if reset:
 hbisect.resetstate(repo)
 return
 changesets = 1
 if noupdate:
 try:
 node = state['current'][0]
 except LookupError:
-raise error.Abort(_('current bisect revision is unknown - '
+raise error.Abort(
-'start a new bisect to fix'))
+_(
+'current bisect revision is unknown - '
+'start a new bisect to fix'
+)
+)
 else:
 node, p2 = repo.dirstate.parents()
 if p2 != nullid:
 raise error.Abort(_('current bisect revision is a merge'))
 if rev:
 try:
 while changesets:
 # update state
 state['current'] = [node]
 hbisect.save_state(repo, state)
-status = ui.system(command, environ={'HG_NODE': hex(node)},
+status = ui.system(
-blockedtag='bisect_check')
+command,
+environ={'HG_NODE': hex(node)},
+blockedtag='bisect_check',
+)
 if status == 125:
 transition = "skip"
 elif status == 0:
 transition = "good"
 # status < 0 means process was killed
 raise error.Abort(_("%s killed") % command)
 else:
 transition = "bad"
 state[transition].append(node)
 ctx = repo[node]
-ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
+ui.status(
-transition))
+_('changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition)
+)
 hbisect.checkstate(state)
 # bisect
 nodes, changesets, bgood = hbisect.bisect(repo, state)
 # update to next check
 node = nodes[0]
 nodes, changesets, good = hbisect.bisect(repo, state)
 if extend:
 if not changesets:
 extendnode = hbisect.extendrange(repo, state, nodes, good)
 if extendnode is not None:
-ui.write(_("Extending search to changeset %d:%s\n")
+ui.write(
-% (extendnode.rev(), extendnode))
+_("Extending search to changeset %d:%s\n")
+% (extendnode.rev(), extendnode)
+)
 state['current'] = [extendnode.node()]
 hbisect.save_state(repo, state)
 return mayupdate(repo, extendnode.node())
 raise error.Abort(_("nothing to extend"))
 if changesets == 0:
 hbisect.printresult(ui, repo, state, displayer, nodes, good)
 else:
-assert len(nodes) == 1 # only a single node can be tested next
+assert len(nodes) == 1  # only a single node can be tested next
 node = nodes[0]
 # compute the approximate number of remaining tests
 tests, size = 0, 2
 while size <= changesets:
 tests, size = tests + 1, size * 2
 rev = repo.changelog.rev(node)
-ui.write(_("Testing changeset %d:%s "
+ui.write(
-"(%d changesets remaining, ~%d tests)\n")
+_(
-% (rev, short(node), changesets, tests))
+"Testing changeset %d:%s "
+"(%d changesets remaining, ~%d tests)\n"
+)
+% (rev, short(node), changesets, tests)
+)
 state['current'] = [node]
 hbisect.save_state(repo, state)
 return mayupdate(repo, node)
-@command('bookmarks|bookmark',
-[('f', 'force', False, _('force')),
+@command(
-('r', 'rev', '', _('revision for bookmark action'), _('REV')),
+'bookmarks|bookmark',
-('d', 'delete', False, _('delete a given bookmark')),
+[
-('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
+('f', 'force', False, _('force')),
-('i', 'inactive', False, _('mark a bookmark inactive')),
+('r', 'rev', '', _('revision for bookmark action'), _('REV')),
-('l', 'list', False, _('list existing bookmarks')),
+('d', 'delete', False, _('delete a given bookmark')),
-] + formatteropts,
+('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
+('i', 'inactive', False, _('mark a bookmark inactive')),
+('l', 'list', False, _('list existing bookmarks')),
+]
++ formatteropts,
 _('hg bookmarks [OPTIONS]... [NAME]...'),
-helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
+)
 def bookmark(ui, repo, *names, **opts):
 '''create a new bookmark or list existing bookmarks
 Bookmarks are labels on changesets to help track lines of development.
 Bookmarks are unversioned and can be moved, renamed and deleted.
 rev = opts.get('rev')
 inactive = opts.get('inactive')  # meaning add/rename to inactive bookmark
 selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
 if len(selactions) > 1:
-raise error.Abort(_('--%s and --%s are incompatible')
+raise error.Abort(
-% tuple(selactions[:2]))
+_('--%s and --%s are incompatible') % tuple(selactions[:2])
+)
 if selactions:
 action = selactions[0]
 elif names or rev:
 action = 'add'
 elif inactive:
 with ui.formatter('bookmarks', opts) as fm:
 bookmarks.printbookmarks(ui, repo, fm, names)
 else:
 raise error.ProgrammingError('invalid action: %s' % action)
-@command('branch',
-[('f', 'force', None,
+@command(
-_('set branch name even if it shadows an existing branch')),
+'branch',
-('C', 'clean', None, _('reset branch name to parent branch name')),
+[
-('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
+(
+'f',
+'force',
+None,
+_('set branch name even if it shadows an existing branch'),
+),
+('C', 'clean', None, _('reset branch name to parent branch name')),
+('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
 ],
 _('[-fC] [NAME]'),
-helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
+)
 def branch(ui, repo, label=None, **opts):
 """set or show the current branch name
 .. note::
 if revs:
 return cmdutil.changebranch(ui, repo, revs, label)
 if not opts.get('force') and label in repo.branchmap():
 if label not in [p.branch() for p in repo[None].parents()]:
-raise error.Abort(_('a branch of the same name already'
+raise error.Abort(
-' exists'),
+_('a branch of the same name already' ' exists'),
 # i18n: "it" refers to an existing branch
-hint=_("use 'hg update' to switch to it"))
+hint=_("use 'hg update' to switch to it"),
+)
 repo.dirstate.setbranch(label)
 ui.status(_('marked working directory as branch %s\n') % label)
 # find any open named branches aside from default
 for n, h, t, c in repo.branchmap().iterbranches():
 if n != "default" and not c:
 return 0
-ui.status(_('(branches are permanent and global, '
+ui.status(
-'did you want a bookmark?)\n'))
+_(
+'(branches are permanent and global, '
-@command('branches',
+'did you want a bookmark?)\n'
-[('a', 'active', False,
+)
-_('show only branches that have unmerged heads (DEPRECATED)')),
+)
-('c', 'closed', False, _('show normal and closed branches')),
-('r', 'rev', [], _('show branch name(s) of the given rev'))
-] + formatteropts,
+@command(
+'branches',
+[
+(
+'a',
+'active',
+False,
+_('show only branches that have unmerged heads (DEPRECATED)'),
+),
+('c', 'closed', False, _('show normal and closed branches')),
+('r', 'rev', [], _('show branch name(s) of the given rev')),
+]
++ formatteropts,
 _('[-c]'),
 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def branches(ui, repo, active=False, closed=False, **opts):
 """list repository named branches
 List the repository's named branches, indicating which ones are
 inactive. If -c/--closed is specified, also list branches which have
 isactive = False
 if not isclosed:
 openheads = set(repo.branchmap().iteropen(heads))
 isactive = bool(openheads & allheads)
 branches.append((tag, repo[tip], isactive, not isclosed))
-branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
+branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
-reverse=True)
 for tag, ctx, isactive, isopen in branches:
 if active and not isactive:
 continue
 if isactive:
 label = 'branches.closed'
 notice = _(' (closed)')
 else:
 label = 'branches.inactive'
 notice = _(' (inactive)')
-current = (tag == repo.dirstate.branch())
+current = tag == repo.dirstate.branch()
 if current:
 label = 'branches.current'
 fm.startitem()
 fm.write('branch', '%s', tag, label=label)
 rev = ctx.rev()
 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
 fmt = ' ' * padsize + ' %d:%s'
-fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
+fm.condwrite(
-label='log.changeset changeset.%s' % ctx.phasestr())
+not ui.quiet,
+'rev node',
+fmt,
+rev,
+hexfunc(ctx.node()),
+label='log.changeset changeset.%s' % ctx.phasestr(),
+)
 fm.context(ctx=ctx)
 fm.data(active=isactive, closed=not isopen, current=current)
 if not ui.quiet:
 fm.plain(notice)
 fm.plain('\n')
 fm.end()
-@command('bundle',
-[('f', 'force', None, _('run even when the destination is unrelated')),
+@command(
-('r', 'rev', [], _('a changeset intended to be added to the destination'),
+'bundle',
-_('REV')),
+[
-('b', 'branch', [], _('a specific branch you would like to bundle'),
+('f', 'force', None, _('run even when the destination is unrelated')),
-_('BRANCH')),
+(
-('', 'base', [],
+'r',
-_('a base changeset assumed to be available at the destination'),
+'rev',
-_('REV')),
+[],
-('a', 'all', None, _('bundle all changesets in the repository')),
+_('a changeset intended to be added to the destination'),
-('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
+_('REV'),
-] + remoteopts,
+),
+(
+'b',
+'branch',
+[],
+_('a specific branch you would like to bundle'),
+_('BRANCH'),
+),
+(
+'',
+'base',
+[],
+_('a base changeset assumed to be available at the destination'),
+_('REV'),
+),
+('a', 'all', None, _('bundle all changesets in the repository')),
+('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
+]
++ remoteopts,
 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
-helpcategory=command.CATEGORY_IMPORT_EXPORT)
+helpcategory=command.CATEGORY_IMPORT_EXPORT,
+)
 def bundle(ui, repo, fname, dest=None, **opts):
 """create a bundle file
 Generate a bundle file containing data to be transferred to another
 repository.
 bundletype = opts.get('type', 'bzip2').lower()
 try:
 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
 except error.UnsupportedBundleSpecification as e:
-raise error.Abort(pycompat.bytestr(e),
+raise error.Abort(
-hint=_("see 'hg help bundlespec' for supported "
+pycompat.bytestr(e),
-"values for --type"))
+hint=_(
+"see 'hg help bundlespec' for supported " "values for --type"
+),
+)
 cgversion = bundlespec.contentopts["cg.version"]
 # Packed bundles are a pseudo bundle format for now.
 if cgversion == 's1':
-raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
+raise error.Abort(
-hint=_("use 'hg debugcreatestreamclonebundle'"))
+_('packed bundles cannot be produced by "hg bundle"'),
+hint=_("use 'hg debugcreatestreamclonebundle'"),
+)
 if opts.get('all'):
 if dest:
-raise error.Abort(_("--all is incompatible with specifying "
+raise error.Abort(
-"a destination"))
+_("--all is incompatible with specifying " "a destination")
+)
 if opts.get('base'):
 ui.warn(_("ignoring --base because --all was specified\n"))
 base = [nullrev]
 else:
 base = scmutil.revrange(repo, opts.get('base'))
 if cgversion not in changegroup.supportedoutgoingversions(repo):
-raise error.Abort(_("repository does not support bundle version %s") %
+raise error.Abort(
-cgversion)
+_("repository does not support bundle version %s") % cgversion
+)
 if base:
 if dest:
-raise error.Abort(_("--base is incompatible with specifying "
+raise error.Abort(
-"a destination"))
+_("--base is incompatible with specifying " "a destination")
+)
 common = [repo[rev].node() for rev in base]
 heads = [repo[r].node() for r in revs] if revs else None
 outgoing = discovery.outgoing(repo, common, heads)
 else:
 dest = ui.expandpath(dest or 'default-push', dest or 'default')
 dest, branches = hg.parseurl(dest, opts.get('branch'))
 other = hg.peer(repo, opts, dest)
 revs = [repo[r].hex() for r in revs]
 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
-outgoing = discovery.findcommonoutgoing(repo, other,
+outgoing = discovery.findcommonoutgoing(
-onlyheads=heads,
+repo, other, onlyheads=heads, force=opts.get('force'), portable=True
-force=opts.get('force'),
+)
-portable=True)
 if not outgoing.missing:
 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
 return 1
-if cgversion == '01': #bundle1
+if cgversion == '01':  # bundle1
 bversion = 'HG10' + bundlespec.wirecompression
 bcompression = None
 elif cgversion in ('02', '03'):
 bversion = 'HG20'
 bcompression = bundlespec.wirecompression
 else:
 raise error.ProgrammingError(
-'bundle: unexpected changegroup version %s' % cgversion)
+'bundle: unexpected changegroup version %s' % cgversion
+)
 # TODO compression options should be derived from bundlespec parsing.
 # This is a temporary hack to allow adjusting bundle compression
 # level without a) formalizing the bundlespec changes to declare it
 # b) introducing a command flag.
 compopts = {}
-complevel = ui.configint('experimental',
+complevel = ui.configint(
-'bundlecomplevel.' + bundlespec.compression)
+'experimental', 'bundlecomplevel.' + bundlespec.compression
+)
 if complevel is None:
 complevel = ui.configint('experimental', 'bundlecomplevel')
 if complevel is not None:
 compopts['level'] = complevel
 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
 bundlespec.contentopts['obsolescence'] = True
 if repo.ui.configbool('experimental', 'bundle-phases'):
 bundlespec.contentopts['phases'] = True
-bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
+bundle2.writenewbundle(
-bundlespec.contentopts, compression=bcompression,
+ui,
-compopts=compopts)
+repo,
+'bundle',
-@command('cat',
+fname,
-[('o', 'output', '',
+bversion,
-_('print output to file with formatted name'), _('FORMAT')),
+outgoing,
-('r', 'rev', '', _('print the given revision'), _('REV')),
+bundlespec.contentopts,
-('', 'decode', None, _('apply any matching decode filter')),
+compression=bcompression,
-] + walkopts + formatteropts,
+compopts=compopts,
+)
+@command(
+'cat',
+[
+(
+'o',
+'output',
+'',
+_('print output to file with formatted name'),
+_('FORMAT'),
+),
+('r', 'rev', '', _('print the given revision'), _('REV')),
+('', 'decode', None, _('apply any matching decode filter')),
+]
++ walkopts
++ formatteropts,
 _('[OPTION]... FILE...'),
 helpcategory=command.CATEGORY_FILE_CONTENTS,
 inferrepo=True,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def cat(ui, repo, file1, *pats, **opts):
 """output the current or given revision of files
 Print the specified files as they were at the given revision. If
 no revision is given, the parent of the working directory is used.
 fm = formatter.nullformatter(ui, 'cat', opts)
 else:
 ui.pager('cat')
 fm = ui.formatter('cat', opts)
 with fm:
-return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
+return cmdutil.cat(
-**pycompat.strkwargs(opts))
+ui, repo, ctx, m, fm, fntemplate, '', **pycompat.strkwargs(opts)
+)
-@command('clone',
-[('U', 'noupdate', None, _('the clone will include an empty working '
-'directory (only a repository)')),
+@command(
-('u', 'updaterev', '', _('revision, tag, or branch to check out'),
+'clone',
-_('REV')),
+[
-('r', 'rev', [], _('do not clone everything, but include this changeset'
+(
-' and its ancestors'), _('REV')),
+'U',
-('b', 'branch', [], _('do not clone everything, but include this branch\'s'
+'noupdate',
-' changesets and their ancestors'), _('BRANCH')),
+None,
-('', 'pull', None, _('use pull protocol to copy metadata')),
+_(
-('', 'uncompressed', None,
+'the clone will include an empty working '
-_('an alias to --stream (DEPRECATED)')),
+'directory (only a repository)'
-('', 'stream', None,
+),
-_('clone with minimal data processing')),
+),
-] + remoteopts,
+(
+'u',
+'updaterev',
+'',
+_('revision, tag, or branch to check out'),
+_('REV'),
+),
+(
+'r',
+'rev',
+[],
+_(
+'do not clone everything, but include this changeset'
+' and its ancestors'
+),
+_('REV'),
+),
+(
+'b',
+'branch',
+[],
+_(
+'do not clone everything, but include this branch\'s'
+' changesets and their ancestors'
+),
+_('BRANCH'),
+),
+('', 'pull', None, _('use pull protocol to copy metadata')),
+('', 'uncompressed', None, _('an alias to --stream (DEPRECATED)')),
+('', 'stream', None, _('clone with minimal data processing')),
+]
++ remoteopts,
 _('[OPTION]... SOURCE [DEST]'),
 helpcategory=command.CATEGORY_REPO_CREATION,
-helpbasic=True, norepo=True)
+helpbasic=True,
+norepo=True,
+)
 def clone(ui, source, dest=None, **opts):
 """make a copy of an existing repository
 Create a copy of an existing repository in a new directory.
 if opts.get('include'):
 includepats = narrowspec.parsepatterns(opts.get('include'))
 if opts.get('exclude'):
 excludepats = narrowspec.parsepatterns(opts.get('exclude'))
-r = hg.clone(ui, opts, source, dest,
+r = hg.clone(
-pull=opts.get('pull'),
+ui,
-stream=opts.get('stream') or opts.get('uncompressed'),
+opts,
-revs=opts.get('rev'),
+source,
-update=opts.get('updaterev') or not opts.get('noupdate'),
+dest,
-branch=opts.get('branch'),
+pull=opts.get('pull'),
-shareopts=opts.get('shareopts'),
+stream=opts.get('stream') or opts.get('uncompressed'),
-storeincludepats=includepats,
+revs=opts.get('rev'),
-storeexcludepats=excludepats,
+update=opts.get('updaterev') or not opts.get('noupdate'),
-depth=opts.get('depth') or None)
+branch=opts.get('branch'),
+shareopts=opts.get('shareopts'),
+storeincludepats=includepats,
+storeexcludepats=excludepats,
+depth=opts.get('depth') or None,
+)
 return r is None
-@command('commit|ci',
-[('A', 'addremove', None,
+@command(
-_('mark new/missing files as added/removed before committing')),
+'commit|ci',
-('', 'close-branch', None,
+[
-_('mark a branch head as closed')),
+(
-('', 'amend', None, _('amend the parent of the working directory')),
+'A',
-('s', 'secret', None, _('use the secret phase for committing')),
+'addremove',
-('e', 'edit', None, _('invoke editor on commit messages')),
+None,
-('', 'force-close-branch', None,
+_('mark new/missing files as added/removed before committing'),
-_('forcibly close branch from a non-head changeset (ADVANCED)')),
+),
-('i', 'interactive', None, _('use interactive mode')),
+('', 'close-branch', None, _('mark a branch head as closed')),
-] + walkopts + commitopts + commitopts2 + subrepoopts,
+('', 'amend', None, _('amend the parent of the working directory')),
+('s', 'secret', None, _('use the secret phase for committing')),
+('e', 'edit', None, _('invoke editor on commit messages')),
+(
+'',
+'force-close-branch',
+None,
+_('forcibly close branch from a non-head changeset (ADVANCED)'),
+),
+('i', 'interactive', None, _('use interactive mode')),
+]
++ walkopts
++ commitopts
++ commitopts2
++ subrepoopts,
 _('[OPTION]... [FILE]...'),
-helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
+helpcategory=command.CATEGORY_COMMITTING,
-inferrepo=True)
+helpbasic=True,
+inferrepo=True,
+)
 def commit(ui, repo, *pats, **opts):
 """commit the specified files or all outstanding changes
 Commit changes to the given files into the repository. Unlike a
 centralized SCM, this operation is a local operation. See
 hg commit --amend --date now
 """
 with repo.wlock(), repo.lock():
 return _docommit(ui, repo, *pats, **opts)
 def _docommit(ui, repo, *pats, **opts):
 if opts.get(r'interactive'):
 opts.pop(r'interactive')
-ret = cmdutil.dorecord(ui, repo, commit, None, False,
+ret = cmdutil.dorecord(
-cmdutil.recordfilter, *pats,
+ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
-**opts)
+)
 # ret can be 0 (no changes to record) or the value returned by
 # commit(), 1 if nothing changed or None on success.
 return 1 if ret == 0 else ret
 opts = pycompat.byteskwargs(opts)
 extra = {}
 if opts.get('close_branch') or opts.get('force_close_branch'):
 extra['close'] = '1'
 if repo['.'].closesbranch():
-raise error.Abort(_('current revision is already a branch closing'
+raise error.Abort(
-' head'))
+_('current revision is already a branch closing' ' head')
+)
 elif not bheads:
 raise error.Abort(_('branch "%s" has no heads to close') % branch)
-elif (branch == repo['.'].branch() and repo['.'].node() not in bheads
+elif (
-and not opts.get('force_close_branch')):
+branch == repo['.'].branch()
-hint = _('use --force-close-branch to close branch from a non-head'
+and repo['.'].node() not in bheads
-' changeset')
+and not opts.get('force_close_branch')
+):
+hint = _(
+'use --force-close-branch to close branch from a non-head'
+' changeset'
+)
 raise error.Abort(_('can only close branch heads'), hint=hint)
 elif opts.get('amend'):
-if (repo['.'].p1().branch() != branch and
+if (
-repo['.'].p2().branch() != branch):
+repo['.'].p1().branch() != branch
+and repo['.'].p2().branch() != branch
+):
 raise error.Abort(_('can only close branch heads'))
 if opts.get('amend'):
 if ui.configbool('ui', 'commitsubrepos'):
 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
 if node == old.node():
 ui.status(_("nothing changed\n"))
 return 1
 else:
 def commitfunc(ui, repo, message, match, opts):
 overrides = {}
 if opts.get('secret'):
 overrides[('phases', 'new-commit')] = 'secret'
 baseui = repo.baseui
 with baseui.configoverride(overrides, 'commit'):
 with ui.configoverride(overrides, 'commit'):
-editform = cmdutil.mergeeditform(repo[None],
+editform = cmdutil.mergeeditform(
-'commit.normal')
+repo[None], 'commit.normal'
+)
 editor = cmdutil.getcommiteditor(
-editform=editform, **pycompat.strkwargs(opts))
+editform=editform, **pycompat.strkwargs(opts)
-return repo.commit(message,
+)
-opts.get('user'),
+return repo.commit(
-opts.get('date'),
+message,
-match,
+opts.get('user'),
-editor=editor,
+opts.get('date'),
-extra=extra)
+match,
+editor=editor,
+extra=extra,
+)
 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
 if not node:
 stat = cmdutil.postcommitstatus(repo, pats, opts)
 if stat[3]:
-ui.status(_("nothing changed (%d missing files, see "
+ui.status(
-"'hg status')\n") % len(stat[3]))
+_(
+"nothing changed (%d missing files, see "
+"'hg status')\n"
+)
+% len(stat[3])
+)
 else:
 ui.status(_("nothing changed\n"))
 return 1
 cmdutil.commitstatus(repo, node, branch, bheads, opts)
 if not ui.quiet and ui.configbool('commands', 'commit.post-status'):
-status(ui, repo, modified=True, added=True, removed=True, deleted=True,
+status(
-unknown=True, subrepos=opts.get('subrepos'))
+ui,
+repo,
-@command('config|showconfig|debugconfig',
+modified=True,
-[('u', 'untrusted', None, _('show untrusted configuration options')),
+added=True,
-('e', 'edit', None, _('edit user config')),
+removed=True,
-('l', 'local', None, _('edit repository config')),
+deleted=True,
-('g', 'global', None, _('edit global config'))] + formatteropts,
+unknown=True,
+subrepos=opts.get('subrepos'),
+)
+@command(
+'config|showconfig|debugconfig',
+[
+('u', 'untrusted', None, _('show untrusted configuration options')),
+('e', 'edit', None, _('edit user config')),
+('l', 'local', None, _('edit repository config')),
+('g', 'global', None, _('edit global config')),
+]
++ formatteropts,
 _('[-u] [NAME]...'),
 helpcategory=command.CATEGORY_HELP,
 optionalrepo=True,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def config(ui, repo, *values, **opts):
 """show combined config settings from all hgrc files
 With no arguments, print names and values of all config items.
 fp = open(f, "wb")
 fp.write(util.tonativeeol(samplehgrc))
 fp.close()
 editor = ui.geteditor()
-ui.system("%s \"%s\"" % (editor, f),
+ui.system(
-onerr=error.Abort, errprefix=_("edit failed"),
+"%s \"%s\"" % (editor, f),
-blockedtag='config_edit')
+onerr=error.Abort,
+errprefix=_("edit failed"),
+blockedtag='config_edit',
+)
 return
 ui.pager('config')
 fm = ui.formatter('config', opts)
 for t, f in rcutil.rccomponents():
 if t == 'path':
 selsections = selentries = []
 if values:
 selsections = [v for v in values if '.' not in v]
 selentries = [v for v in values if '.' in v]
-uniquesel = (len(selentries) == 1 and not selsections)
+uniquesel = len(selentries) == 1 and not selsections
 selsections = set(selsections)
 selentries = set(selentries)
 matched = False
 for section, name, value in ui.walkconfig(untrusted=untrusted):
 fm.end()
 if matched:
 return 0
 return 1
-@command('continue',
-dryrunopts, helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
+@command(
-helpbasic=True)
+'continue',
+dryrunopts,
+helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
+helpbasic=True,
+)
 def continuecmd(ui, repo, **opts):
 """resumes an interrupted operation (EXPERIMENTAL)
 Finishes a multistep operation like graft, histedit, rebase, merge,
 and unshelve if they are in an interrupted state.
 dryrun = opts.get(r'dry_run')
 contstate = cmdutil.getunfinishedstate(repo)
 if not contstate:
 raise error.Abort(_('no operation in progress'))
 if not contstate.continuefunc:
-raise error.Abort((_("%s in progress but does not support "
+raise error.Abort(
-"'hg continue'") % (contstate._opname)),
+(
-hint=contstate.continuemsg())
+_("%s in progress but does not support " "'hg continue'")
+% (contstate._opname)
+),
+hint=contstate.continuemsg(),
+)
 if dryrun:
 ui.status(_('%s in progress, will be resumed\n') % (contstate._opname))
 return
 return contstate.continuefunc(ui, repo)
-@command('copy|cp',
-[('A', 'after', None, _('record a copy that has already occurred')),
+@command(
-('f', 'force', None, _('forcibly copy over an existing managed file')),
+'copy|cp',
-] + walkopts + dryrunopts,
+[
+('A', 'after', None, _('record a copy that has already occurred')),
+('f', 'force', None, _('forcibly copy over an existing managed file')),
+]
++ walkopts
++ dryrunopts,
 _('[OPTION]... SOURCE... DEST'),
-helpcategory=command.CATEGORY_FILE_CONTENTS)
+helpcategory=command.CATEGORY_FILE_CONTENTS,
+)
 def copy(ui, repo, *pats, **opts):
 """mark files as copied for the next commit
 Mark dest as having copies of source files. If dest is a
 directory, copies are put in that directory. If dest is a file,
 """
 opts = pycompat.byteskwargs(opts)
 with repo.wlock(False):
 return cmdutil.copy(ui, repo, pats, opts)
 @command(
-'debugcommands', [], _('[COMMAND]'),
+'debugcommands',
+[],
+_('[COMMAND]'),
 helpcategory=command.CATEGORY_HELP,
-norepo=True)
+norepo=True,
+)
 def debugcommands(ui, cmd='', *args):
 """list all available commands and options"""
 for cmd, vals in sorted(table.iteritems()):
 cmd = cmd.split('|')[0]
 opts = ', '.join([i[1] for i in vals[1]])
 ui.write('%s: %s\n' % (cmd, opts))
-@command('debugcomplete',
+@command(
+'debugcomplete',
 [('o', 'options', None, _('show the command options'))],
 _('[-o] CMD'),
 helpcategory=command.CATEGORY_HELP,
-norepo=True)
+norepo=True,
+)
 def debugcomplete(ui, cmd='', **opts):
 """returns the completion list associated with the given command"""
 if opts.get(r'options'):
 options = []
 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
 if ui.verbose:
 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
-@command('diff',
-[('r', 'rev', [], _('revision'), _('REV')),
+@command(
-('c', 'change', '', _('change made by revision'), _('REV'))
+'diff',
-] + diffopts + diffopts2 + walkopts + subrepoopts,
+[
+('r', 'rev', [], _('revision'), _('REV')),
+('c', 'change', '', _('change made by revision'), _('REV')),
+]
++ diffopts
++ diffopts2
++ walkopts
++ subrepoopts,
 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
 helpcategory=command.CATEGORY_FILE_CONTENTS,
-helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
+helpbasic=True,
+inferrepo=True,
+intents={INTENT_READONLY},
+)
 def diff(ui, repo, *pats, **opts):
 """diff repository (or selected files)
 Show differences between revisions for the specified files.
 diffopts = patch.diffallopts(ui, opts)
 m = scmutil.match(ctx2, pats, opts)
 m = repo.narrowmatch(m)
 ui.pager('diff')
-logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
+logcmdutil.diffordiffstat(
-listsubrepos=opts.get('subrepos'),
+ui,
-root=opts.get('root'))
+repo,
+diffopts,
-@command('export',
+node1,
-[('B', 'bookmark', '',
+node2,
-_('export changes only reachable by given bookmark'), _('BOOKMARK')),
+m,
-('o', 'output', '',
+stat=stat,
-_('print output to file with formatted name'), _('FORMAT')),
+listsubrepos=opts.get('subrepos'),
-('', 'switch-parent', None, _('diff against the second parent')),
+root=opts.get('root'),
-('r', 'rev', [], _('revisions to export'), _('REV')),
+)
-] + diffopts + formatteropts,
+@command(
+'export',
+[
+(
+'B',
+'bookmark',
+'',
+_('export changes only reachable by given bookmark'),
+_('BOOKMARK'),
+),
+(
+'o',
+'output',
+'',
+_('print output to file with formatted name'),
+_('FORMAT'),
+),
+('', 'switch-parent', None, _('diff against the second parent')),
+('r', 'rev', [], _('revisions to export'), _('REV')),
+]
++ diffopts
++ formatteropts,
 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
 helpcategory=command.CATEGORY_IMPORT_EXPORT,
-helpbasic=True, intents={INTENT_READONLY})
+helpbasic=True,
+intents={INTENT_READONLY},
+)
 def export(ui, repo, *changesets, **opts):
 """dump the header and diffs for one or more changesets
 Print the changeset header and diffs for one or more revisions.
 If no revision is given, the parent of the working directory is used.
 fm = formatter.nullformatter(ui, 'export', opts)
 else:
 ui.pager('export')
 fm = ui.formatter('export', opts)
 with fm:
-cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
+cmdutil.export(
-switch_parent=opts.get('switch_parent'),
+repo,
-opts=patch.diffallopts(ui, opts))
+revs,
+fm,
-@command('files',
+fntemplate=fntemplate,
-[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
+switch_parent=opts.get('switch_parent'),
-('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
+opts=patch.diffallopts(ui, opts),
-] + walkopts + formatteropts + subrepoopts,
+)
+@command(
+'files',
+[
+('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
+('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
+]
++ walkopts
++ formatteropts
++ subrepoopts,
 _('[OPTION]... [FILE]...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def files(ui, repo, *pats, **opts):
 """list tracked files
 Print files under Mercurial control in the working directory or
 specified revision for given files (excluding removed files).
 m = scmutil.match(ctx, pats, opts)
 ui.pager('files')
 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
 with ui.formatter('files', opts) as fm:
-return cmdutil.files(ui, ctx, m, uipathfn, fm, fmt,
+return cmdutil.files(
-opts.get('subrepos'))
+ui, ctx, m, uipathfn, fm, fmt, opts.get('subrepos')
+)
 @command(
 'forget',
-[('i', 'interactive', None, _('use interactive mode')),
+[('i', 'interactive', None, _('use interactive mode')),]
-] + walkopts + dryrunopts,
++ walkopts
++ dryrunopts,
 _('[OPTION]... FILE...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
-helpbasic=True, inferrepo=True)
+helpbasic=True,
+inferrepo=True,
+)
 def forget(ui, repo, *pats, **opts):
 """forget the specified files on the next commit
 Mark the specified files so they will no longer be tracked
 after the next commit.
 raise error.Abort(_('no files specified'))
 m = scmutil.match(repo[None], pats, opts)
 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
-rejected = cmdutil.forget(ui, repo, m, prefix="", uipathfn=uipathfn,
+rejected = cmdutil.forget(
-explicitonly=False, dryrun=dryrun,
+ui,
-interactive=interactive)[0]
+repo,
+m,
+prefix="",
+uipathfn=uipathfn,
+explicitonly=False,
+dryrun=dryrun,
+interactive=interactive,
+)[0]
 return rejected and 1 or 0
 @command(
 'graft',
-[('r', 'rev', [], _('revisions to graft'), _('REV')),
+[
-('', 'base', '',
+('r', 'rev', [], _('revisions to graft'), _('REV')),
-_('base revision when doing the graft merge (ADVANCED)'), _('REV')),
+(
-('c', 'continue', False, _('resume interrupted graft')),
+'',
-('', 'stop', False, _('stop interrupted graft')),
+'base',
-('', 'abort', False, _('abort interrupted graft')),
+'',
-('e', 'edit', False, _('invoke editor on commit messages')),
+_('base revision when doing the graft merge (ADVANCED)'),
-('', 'log', None, _('append graft info to log message')),
+_('REV'),
-('', 'no-commit', None,
+),
-_("don't commit, just apply the changes in working directory")),
+('c', 'continue', False, _('resume interrupted graft')),
-('f', 'force', False, _('force graft')),
+('', 'stop', False, _('stop interrupted graft')),
-('D', 'currentdate', False,
+('', 'abort', False, _('abort interrupted graft')),
-_('record the current date as commit date')),
+('e', 'edit', False, _('invoke editor on commit messages')),
-('U', 'currentuser', False,
+('', 'log', None, _('append graft info to log message')),
-_('record the current user as committer'))]
+(
-+ commitopts2 + mergetoolopts  + dryrunopts,
+'',
+'no-commit',
+None,
+_("don't commit, just apply the changes in working directory"),
+),
+('f', 'force', False, _('force graft')),
+(
+'D',
+'currentdate',
+False,
+_('record the current date as commit date'),
+),
+('U', 'currentuser', False, _('record the current user as committer')),
+]
++ commitopts2
++ mergetoolopts
++ dryrunopts,
 _('[OPTION]... [-r REV]... REV...'),
-helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
+helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
+)
 def graft(ui, repo, *revs, **opts):
 '''copy changes from other branches onto the current branch
 This command uses Mercurial's merge logic to copy individual
 changes from other branches without merging branches in the
 Returns 0 on successful completion.
 '''
 with repo.wlock():
 return _dograft(ui, repo, *revs, **opts)
 def _dograft(ui, repo, *revs, **opts):
 opts = pycompat.byteskwargs(opts)
 if revs and opts.get('rev'):
-ui.warn(_('warning: inconsistent use of --rev might give unexpected '
+ui.warn(
-'revision ordering!\n'))
+_(
+'warning: inconsistent use of --rev might give unexpected '
+'revision ordering!\n'
+)
+)
 revs = list(revs)
 revs.extend(opts.get('rev'))
 basectx = None
 if opts.get('base'):
 if not opts.get('user') and opts.get('currentuser'):
 opts['user'] = ui.username()
 if not opts.get('date') and opts.get('currentdate'):
 opts['date'] = "%d %d" % dateutil.makedate()
-editor = cmdutil.getcommiteditor(editform='graft',
+editor = cmdutil.getcommiteditor(
-**pycompat.strkwargs(opts))
+editform='graft', **pycompat.strkwargs(opts)
+)
 cont = False
 if opts.get('no_commit'):
 if opts.get('edit'):
-raise error.Abort(_("cannot specify --no-commit and "
+raise error.Abort(
-"--edit together"))
+_("cannot specify --no-commit and " "--edit together")
+)
 if opts.get('currentuser'):
-raise error.Abort(_("cannot specify --no-commit and "
+raise error.Abort(
-"--currentuser together"))
+_("cannot specify --no-commit and " "--currentuser together")
+)
 if opts.get('currentdate'):
-raise error.Abort(_("cannot specify --no-commit and "
+raise error.Abort(
-"--currentdate together"))
+_("cannot specify --no-commit and " "--currentdate together")
+)
 if opts.get('log'):
-raise error.Abort(_("cannot specify --no-commit and "
+raise error.Abort(
-"--log together"))
+_("cannot specify --no-commit and " "--log together")
+)
 graftstate = statemod.cmdstate(repo, 'graftstate')
 if opts.get('stop'):
 if opts.get('continue'):
-raise error.Abort(_("cannot use '--continue' and "
+raise error.Abort(
-"'--stop' together"))
+_("cannot use '--continue' and " "'--stop' together")
+)
 if opts.get('abort'):
 raise error.Abort(_("cannot use '--abort' and '--stop' together"))
-if any((opts.get('edit'), opts.get('log'), opts.get('user'),
+if any(
-opts.get('date'), opts.get('currentdate'),
+(
-opts.get('currentuser'), opts.get('rev'))):
+opts.get('edit'),
+opts.get('log'),
+opts.get('user'),
+opts.get('date'),
+opts.get('currentdate'),
+opts.get('currentuser'),
+opts.get('rev'),
+)
+):
 raise error.Abort(_("cannot specify any other flag with '--stop'"))
 return _stopgraft(ui, repo, graftstate)
 elif opts.get('abort'):
 if opts.get('continue'):
-raise error.Abort(_("cannot use '--continue' and "
+raise error.Abort(
-"'--abort' together"))
+_("cannot use '--continue' and " "'--abort' together")
-if any((opts.get('edit'), opts.get('log'), opts.get('user'),
+)
-opts.get('date'), opts.get('currentdate'),
+if any(
-opts.get('currentuser'), opts.get('rev'))):
+(
+opts.get('edit'),
+opts.get('log'),
+opts.get('user'),
+opts.get('date'),
+opts.get('currentdate'),
+opts.get('currentuser'),
+opts.get('rev'),
+)
+):
 raise error.Abort(_("cannot specify any other flag with '--abort'"))
 return cmdutil.abortgraft(ui, repo, graftstate)
 elif opts.get('continue'):
 cont = True
 ancestors = repo.changelog.ancestors([crev], inclusive=True)
 # XXX make this lazy in the future
 # don't mutate while iterating, create a copy
 for rev in list(revs):
 if rev in ancestors:
-ui.warn(_('skipping ancestor revision %d:%s\n') %
+ui.warn(
-(rev, repo[rev]))
+_('skipping ancestor revision %d:%s\n') % (rev, repo[rev])
+)
 # XXX remove on list is slow
 revs.remove(rev)
 if not revs:
 return -1
 try:
 r = repo[n].rev()
 except error.RepoLookupError:
 r = None
 if r in revs:
-ui.warn(_('skipping revision %d:%s '
+ui.warn(
-'(already grafted to %d:%s)\n')
+_(
-% (r, repo[r], rev, ctx))
+'skipping revision %d:%s '
+'(already grafted to %d:%s)\n'
+)
+% (r, repo[r], rev, ctx)
+)
 revs.remove(r)
 elif ids[n] in revs:
 if r is None:
-ui.warn(_('skipping already grafted revision %d:%s '
+ui.warn(
-'(%d:%s also has unknown origin %s)\n')
+_(
-% (ids[n], repo[ids[n]], rev, ctx, n[:12]))
+'skipping already grafted revision %d:%s '
+'(%d:%s also has unknown origin %s)\n'
+)
+% (ids[n], repo[ids[n]], rev, ctx, n[:12])
+)
 else:
-ui.warn(_('skipping already grafted revision %d:%s '
+ui.warn(
-'(%d:%s also has origin %d:%s)\n')
+_(
-% (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
+'skipping already grafted revision %d:%s '
+'(%d:%s also has origin %d:%s)\n'
+)
+% (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
+)
 revs.remove(ids[n])
 elif ctx.hex() in ids:
 r = ids[ctx.hex()]
 if r in revs:
-ui.warn(_('skipping already grafted revision %d:%s '
+ui.warn(
-'(was grafted from %d:%s)\n') %
+_(
-(r, repo[r], rev, ctx))
+'skipping already grafted revision %d:%s '
+'(was grafted from %d:%s)\n'
+)
+% (r, repo[r], rev, ctx)
+)
 revs.remove(r)
 if not revs:
 return -1
 if opts.get('no_commit'):
 statedata['no_commit'] = True
 for pos, ctx in enumerate(repo.set("%ld", revs)):
-desc = '%d:%s "%s"' % (ctx.rev(), ctx,
+desc = '%d:%s "%s"' % (
-ctx.description().split('\n', 1)[0])
+ctx.rev(),
+ctx,
+ctx.description().split('\n', 1)[0],
+)
 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
 if names:
 desc += ' (%s)' % ' '.join(names)
 ui.status(_('grafting %s\n') % desc)
 if opts.get('dry_run'):
 statedata['nodes'] = nodes
 stateversion = 1
 graftstate.save(stateversion, statedata)
 hint = _("use 'hg resolve' and 'hg graft --continue'")
 raise error.Abort(
-_("unresolved conflicts, can't continue"),
+_("unresolved conflicts, can't continue"), hint=hint
-hint=hint)
+)
 else:
 cont = False
 # commit if --no-commit is false
 if not opts.get('no_commit'):
-node = repo.commit(text=message, user=user, date=date, extra=extra,
+node = repo.commit(
-editor=editor)
+text=message, user=user, date=date, extra=extra, editor=editor
+)
 if node is None:
 ui.warn(
-_('note: graft of %d:%s created no changes to commit\n') %
+_('note: graft of %d:%s created no changes to commit\n')
-(ctx.rev(), ctx))
+% (ctx.rev(), ctx)
+)
 # checking that newnodes exist because old state files won't have it
 elif statedata.get('newnodes') is not None:
 statedata['newnodes'].append(node)
 # remove state when we complete successfully
 if not opts.get('dry_run'):
 graftstate.delete()
 return 0
 def _stopgraft(ui, repo, graftstate):
 """stop the interrupted graft"""
 if not graftstate.exists():
 raise error.Abort(_("no interrupted graft found"))
 graftstate.delete()
 ui.status(_("stopped the interrupted graft\n"))
 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
 return 0
 statemod.addunfinished(
-'graft', fname='graftstate', clearable=True, stopflag=True,
+'graft',
-continueflag=True, abortfunc=cmdutil.hgabortgraft,
+fname='graftstate',
-cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop")
+clearable=True,
+stopflag=True,
+continueflag=True,
+abortfunc=cmdutil.hgabortgraft,
+cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop"),
 )
-@command('grep',
-[('0', 'print0', None, _('end fields with NUL')),
+@command(
-('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
+'grep',
-('', 'diff', None, _('print all revisions when the term was introduced '
+[
-'or removed')),
+('0', 'print0', None, _('end fields with NUL')),
-('a', 'text', None, _('treat all files as text')),
+('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
-('f', 'follow', None,
+(
-_('follow changeset history,'
+'',
-' or file history across copies and renames')),
+'diff',
-('i', 'ignore-case', None, _('ignore case when matching')),
+None,
-('l', 'files-with-matches', None,
+_('print all revisions when the term was introduced ' 'or removed'),
-_('print only filenames and revisions that match')),
+),
-('n', 'line-number', None, _('print matching line numbers')),
+('a', 'text', None, _('treat all files as text')),
-('r', 'rev', [],
+(
-_('only search files changed within revision range'), _('REV')),
+'f',
-('', 'all-files', None,
+'follow',
-_('include all files in the changeset while grepping (EXPERIMENTAL)')),
+None,
-('u', 'user', None, _('list the author (long with -v)')),
+_(
-('d', 'date', None, _('list the date (short with -q)')),
+'follow changeset history,'
-] + formatteropts + walkopts,
+' or file history across copies and renames'
+),
+),
+('i', 'ignore-case', None, _('ignore case when matching')),
+(
+'l',
+'files-with-matches',
+None,
+_('print only filenames and revisions that match'),
+),
+('n', 'line-number', None, _('print matching line numbers')),
+(
+'r',
+'rev',
+[],
+_('only search files changed within revision range'),
+_('REV'),
+),
+(
+'',
+'all-files',
+None,
+_(
+'include all files in the changeset while grepping (EXPERIMENTAL)'
+),
+),
+('u', 'user', None, _('list the author (long with -v)')),
+('d', 'date', None, _('list the date (short with -q)')),
+]
++ formatteropts
++ walkopts,
 _('[OPTION]... PATTERN [FILE]...'),
 helpcategory=command.CATEGORY_FILE_CONTENTS,
 inferrepo=True,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def grep(ui, repo, pattern, *pats, **opts):
 """search revision history for a pattern in specified files
 Search revision history for a regular expression in the specified
 files or the entire project.
 yield m.span()
 p = m.end()
 matches = {}
 copies = {}
 def grepbody(fn, rev, body):
 matches[rev].setdefault(fn, [])
 m = matches[rev][fn]
 for lnum, cstart, cend, line in matchlines(body):
 s = linestate(line, lnum, cstart, cend)
 yield ('-', a[i])
 for i in pycompat.xrange(blo, bhi):
 yield ('+', b[i])
 uipathfn = scmutil.getuipathfn(repo)
 def display(fm, fn, ctx, pstates, states):
 rev = scmutil.intrev(ctx)
 if fm.isplain():
 formatuser = ui.shortuser
 else:
 if ui.quiet:
 datefmt = '%Y-%m-%d'
 else:
 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
 found = False
 @util.cachefunc
 def binary():
 flog = getfile(fn)
 try:
 return stringutil.binary(flog.read(ctx.filenode(fn)))
 ('rev', '%d', rev, not plaingrep, ''),
 ('linenumber', '%d', l.linenum, opts.get('line_number'), ''),
 ]
 if diff:
 cols.append(
-('change', '%s', change, True,
+(
-'grep.inserted ' if change == '+' else 'grep.deleted ')
+'change',
+'%s',
+change,
+True,
+'grep.inserted ' if change == '+' else 'grep.deleted ',
+)
 )
-cols.extend([
+cols.extend(
-('user', '%s', formatuser(ctx.user()), opts.get('user'), ''),
+[
-('date', '%s', fm.formatdate(ctx.date(), datefmt),
+(
-opts.get('date'), ''),
+'user',
-])
+'%s',
+formatuser(ctx.user()),
+opts.get('user'),
+'',
+),
+(
+'date',
+'%s',
+fm.formatdate(ctx.date(), datefmt),
+opts.get('date'),
+'',
+),
+]
+)
 for name, fmt, data, cond, extra_label in cols:
 if cond:
 fm.plain(sep, label='grep.sep')
 field = fieldnamemap.get(name, name)
 label = extra_label + ('grep.%s' % name)
 match = scmutil.match(repo[None], pats, opts)
 found = False
 follow = opts.get('follow')
 getrenamed = scmutil.getrenamedfn(repo)
 def prep(ctx, fns):
 rev = ctx.rev()
 pctx = ctx.p1()
 parent = pctx.rev()
 matches.setdefault(rev, {})
 matches.clear()
 fm.end()
 return not found
-@command('heads',
-[('r', 'rev', '',
+@command(
-_('show only heads which are descendants of STARTREV'), _('STARTREV')),
+'heads',
-('t', 'topo', False, _('show topological heads only')),
+[
-('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
+(
-('c', 'closed', False, _('show normal and closed branch heads')),
+'r',
-] + templateopts,
+'rev',
+'',
+_('show only heads which are descendants of STARTREV'),
+_('STARTREV'),
+),
+('t', 'topo', False, _('show topological heads only')),
+('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
+('c', 'closed', False, _('show normal and closed branch heads')),
+]
++ templateopts,
 _('[-ct] [-r STARTREV] [REV]...'),
 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def heads(ui, repo, *branchrevs, **opts):
 """show branch heads
 With no arguments, show all open branch heads in the repository.
 Branch heads are changesets that have no descendants on the
 for branch in repo.branchmap():
 heads += repo.branchheads(branch, start, opts.get('closed'))
 heads = [repo[h] for h in heads]
 if branchrevs:
-branches = set(repo[r].branch()
+branches = set(
-for r in scmutil.revrange(repo, branchrevs))
+repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
+)
 heads = [h for h in heads if h.branch() in branches]
 if opts.get('active') and branchrevs:
 dagheads = repo.heads(start)
 heads = [h for h in heads if h.node() in dagheads]
 if not heads:
 return 1
 ui.pager('heads')
-heads = sorted(heads, key=lambda x: -x.rev())
+heads = sorted(heads, key=lambda x: -(x.rev()))
 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
 for ctx in heads:
 displayer.show(ctx)
 displayer.close()
-@command('help',
-[('e', 'extension', None, _('show only help for extensions')),
+@command(
-('c', 'command', None, _('show only help for commands')),
+'help',
-('k', 'keyword', None, _('show topics matching keyword')),
+[
-('s', 'system', [],
+('e', 'extension', None, _('show only help for extensions')),
-_('show help for specific platform(s)'), _('PLATFORM')),
+('c', 'command', None, _('show only help for commands')),
-],
+('k', 'keyword', None, _('show topics matching keyword')),
+(
+'s',
+'system',
+[],
+_('show help for specific platform(s)'),
+_('PLATFORM'),
+),
+],
 _('[-eck] [-s PLATFORM] [TOPIC]'),
 helpcategory=command.CATEGORY_HELP,
 norepo=True,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def help_(ui, name=None, **opts):
 """show help for a given topic or a help overview
 With no arguments, print a list of commands with short help messages.
 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
 ui.pager('help')
 ui.write(formatted)
-@command('identify|id',
+@command(
-[('r', 'rev', '',
+'identify|id',
-_('identify the specified revision'), _('REV')),
+[
-('n', 'num', None, _('show local revision number')),
+('r', 'rev', '', _('identify the specified revision'), _('REV')),
-('i', 'id', None, _('show global revision id')),
+('n', 'num', None, _('show local revision number')),
-('b', 'branch', None, _('show branch')),
+('i', 'id', None, _('show global revision id')),
-('t', 'tags', None, _('show tags')),
+('b', 'branch', None, _('show branch')),
-('B', 'bookmarks', None, _('show bookmarks')),
+('t', 'tags', None, _('show tags')),
-] + remoteopts + formatteropts,
+('B', 'bookmarks', None, _('show bookmarks')),
+]
++ remoteopts
++ formatteropts,
 _('[-nibtB] [-r REV] [SOURCE]'),
 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
 optionalrepo=True,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
-def identify(ui, repo, source=None, rev=None,
+)
-num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
+def identify(
+ui,
+repo,
+source=None,
+rev=None,
+num=None,
+id=None,
+branch=None,
+tags=None,
+bookmarks=None,
+**opts
+):
 """identify the working directory or specified revision
 Print a summary identifying the repository state at REV using one or
 two parent hash identifiers, followed by a "+" if the working
 directory has uncommitted changes, the branch name (if not default),
 Returns 0 if successful.
 """
 opts = pycompat.byteskwargs(opts)
 if not repo and not source:
-raise error.Abort(_("there is no Mercurial repository here "
+raise error.Abort(
-"(.hg not found)"))
+_("there is no Mercurial repository here " "(.hg not found)")
+)
 default = not (num or id or branch or tags or bookmarks)
 output = []
 revs = []
 if source:
 source, branches = hg.parseurl(ui.expandpath(source))
-peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
+peer = hg.peer(repo or ui, opts, source)  # only pass ui when no repo
 repo = peer.local()
 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
 fm = ui.formatter('identify', opts)
 fm.startitem()
 if not repo:
 if num or branch or tags:
 raise error.Abort(
-_("can't query remote revision number, branch, or tags"))
+_("can't query remote revision number, branch, or tags")
+)
 if not rev and revs:
 rev = revs[0]
 if not rev:
 rev = "tip"
 def getbms():
 bms = []
 if 'bookmarks' in peer.listkeys('namespaces'):
 hexremoterev = hex(remoterev)
-bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
+bms = [
-if bmr == hexremoterev]
+bm
+for bm, bmr in peer.listkeys('bookmarks').iteritems()
+if bmr == hexremoterev
+]
 return sorted(bms)
 if fm.isplain():
 if bookmarks:
 if num:
 numoutput = ["%d" % p.rev() for p in parents]
 output.append("%s%s" % ('+'.join(numoutput), dirty))
-fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
+fm.data(
-for p in parents], name='node'))
+parents=fm.formatlist(
+[fm.hexfunc(p.node()) for p in parents], name='node'
+)
+)
 else:
 hexoutput = fm.hexfunc(ctx.node())
 if default or id:
 output = [hexoutput]
 fm.data(id=hexoutput)
 fm.context(ctx=ctx)
 fm.plain("%s\n" % ' '.join(output))
 fm.end()
-@command('import|patch',
-[('p', 'strip', 1,
+@command(
-_('directory strip option for patch. This has the same '
+'import|patch',
-'meaning as the corresponding patch option'), _('NUM')),
+[
-('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
+(
-('e', 'edit', False, _('invoke editor on commit messages')),
+'p',
-('f', 'force', None,
+'strip',
-_('skip check for outstanding uncommitted changes (DEPRECATED)')),
+1,
-('', 'no-commit', None,
+_(
-_("don't commit, just update the working directory")),
+'directory strip option for patch. This has the same '
-('', 'bypass', None,
+'meaning as the corresponding patch option'
-_("apply patch without touching the working directory")),
+),
-('', 'partial', None,
+_('NUM'),
-_('commit even if some hunks fail')),
+),
-('', 'exact', None,
+('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
-_('abort if patch would apply lossily')),
+('e', 'edit', False, _('invoke editor on commit messages')),
-('', 'prefix', '',
+(
-_('apply patch to subdirectory'), _('DIR')),
+'f',
-('', 'import-branch', None,
+'force',
-_('use any branch information in patch (implied by --exact)'))] +
+None,
-commitopts + commitopts2 + similarityopts,
+_('skip check for outstanding uncommitted changes (DEPRECATED)'),
+),
+(
+'',
+'no-commit',
+None,
+_("don't commit, just update the working directory"),
+),
+(
+'',
+'bypass',
+None,
+_("apply patch without touching the working directory"),
+),
+('', 'partial', None, _('commit even if some hunks fail')),
+('', 'exact', None, _('abort if patch would apply lossily')),
+('', 'prefix', '', _('apply patch to subdirectory'), _('DIR')),
+(
+'',
+'import-branch',
+None,
+_('use any branch information in patch (implied by --exact)'),
+),
+]
++ commitopts
++ commitopts2
++ similarityopts,
 _('[OPTION]... PATCH...'),
-helpcategory=command.CATEGORY_IMPORT_EXPORT)
+helpcategory=command.CATEGORY_IMPORT_EXPORT,
+)
 def import_(ui, repo, patch1=None, *patches, **opts):
 """import an ordered set of patches
 Import a list of patches and commit them individually (unless
 --no-commit is specified).
 ret = 0
 with repo.wlock():
 if update:
 cmdutil.checkunfinished(repo)
-if (exact or not opts.get('force')):
+if exact or not opts.get('force'):
 cmdutil.bailifchanged(repo)
 if not opts.get('no_commit'):
 lock = repo.lock
 tr = lambda: repo.transaction('import')
 parents = repo[None].parents()
 for patchurl in patches:
 if patchurl == '-':
 ui.status(_('applying patch from stdin\n'))
 patchfile = ui.fin
-patchurl = 'stdin'      # for error message
+patchurl = 'stdin'  # for error message
 else:
 patchurl = os.path.join(base, patchurl)
 ui.status(_('applying %s\n') % patchurl)
 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
 haspatch = False
 for hunk in patch.split(patchfile):
 with patch.extract(ui, hunk) as patchdata:
-msg, node, rej = cmdutil.tryimportone(ui, repo,
+msg, node, rej = cmdutil.tryimportone(
-patchdata,
+ui, repo, patchdata, parents, opts, msgs, hg.clean
-parents, opts,
+)
-msgs, hg.clean)
 if msg:
 haspatch = True
 ui.note(msg + '\n')
 if update or exact:
 parents = repo[None].parents()
 else:
 parents = [repo[node]]
 if rej:
 ui.write_err(_("patch applied partially\n"))
-ui.write_err(_("(fix the .rej files and run "
+ui.write_err(
-"`hg commit --amend`)\n"))
+_(
+"(fix the .rej files and run "
+"`hg commit --amend`)\n"
+)
+)
 ret = 1
 break
 if not haspatch:
 raise error.Abort(_('%s: no diffs found') % patchurl)
 if msgs:
 repo.savecommitmessage('\n* * *\n'.join(msgs))
 return ret
-@command('incoming|in',
-[('f', 'force', None,
+@command(
-_('run even if remote repository is unrelated')),
+'incoming|in',
-('n', 'newest-first', None, _('show newest record first')),
+[
-('', 'bundle', '',
+('f', 'force', None, _('run even if remote repository is unrelated')),
-_('file to store the bundles into'), _('FILE')),
+('n', 'newest-first', None, _('show newest record first')),
-('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
+('', 'bundle', '', _('file to store the bundles into'), _('FILE')),
-('B', 'bookmarks', False, _("compare bookmarks")),
+(
-('b', 'branch', [],
+'r',
-_('a specific branch you would like to pull'), _('BRANCH')),
+'rev',
-] + logopts + remoteopts + subrepoopts,
+[],
+_('a remote changeset intended to be added'),
+_('REV'),
+),
+('B', 'bookmarks', False, _("compare bookmarks")),
+(
+'b',
+'branch',
+[],
+_('a specific branch you would like to pull'),
+_('BRANCH'),
+),
+]
++ logopts
++ remoteopts
++ subrepoopts,
 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
-helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
+helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
+)
 def incoming(ui, repo, source="default", **opts):
 """show new changesets found in source
 Show new changesets found in the specified path/URL or the default
 pull location. These are the changesets that would have been pulled
 Returns 0 if there are incoming changes, 1 otherwise.
 """
 opts = pycompat.byteskwargs(opts)
 if opts.get('graph'):
 logcmdutil.checkunsupportedgraphflags([], opts)
 def display(other, chlist, displayer):
 revdag = logcmdutil.graphrevs(other, chlist, opts)
-logcmdutil.displaygraph(ui, repo, revdag, displayer,
+logcmdutil.displaygraph(
-graphmod.asciiedges)
+ui, repo, revdag, displayer, graphmod.asciiedges
+)
 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
 return 0
 if opts.get('bundle') and opts.get('subrepos'):
 raise error.Abort(_('cannot combine --bundle and --subrepos'))
 if opts.get('bookmarks'):
-source, branches = hg.parseurl(ui.expandpath(source),
+source, branches = hg.parseurl(
-opts.get('branch'))
+ui.expandpath(source), opts.get('branch')
+)
 other = hg.peer(repo, opts, source)
 if 'bookmarks' not in other.listkeys('namespaces'):
 ui.warn(_("remote doesn't support bookmarks\n"))
 return 0
 ui.pager('incoming')
 return hg.incoming(ui, repo, source, opts)
 finally:
 del repo._subtoppath
-@command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
+@command(
-helpcategory=command.CATEGORY_REPO_CREATION,
+'init',
-helpbasic=True, norepo=True)
+remoteopts,
+_('[-e CMD] [--remotecmd CMD] [DEST]'),
+helpcategory=command.CATEGORY_REPO_CREATION,
+helpbasic=True,
+norepo=True,
+)
 def init(ui, dest=".", **opts):
 """create a new repository in the given directory
 Initialize a new repository in the given directory. If the given
 directory does not exist, it will be created.
 Returns 0 on success.
 """
 opts = pycompat.byteskwargs(opts)
 hg.peer(ui, opts, ui.expandpath(dest), create=True)
-@command('locate',
-[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
+@command(
-('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
+'locate',
-('f', 'fullpath', None, _('print complete paths from the filesystem root')),
+[
-] + walkopts,
+('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
+('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
+(
+'f',
+'fullpath',
+None,
+_('print complete paths from the filesystem root'),
+),
+]
++ walkopts,
 _('[OPTION]... [PATTERN]...'),
-helpcategory=command.CATEGORY_WORKING_DIRECTORY)
+helpcategory=command.CATEGORY_WORKING_DIRECTORY,
+)
 def locate(ui, repo, *pats, **opts):
 """locate files matching specific patterns (DEPRECATED)
 Print files under Mercurial control in the working directory whose
 names match the given patterns.
 else:
 end = '\n'
 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
 ret = 1
-m = scmutil.match(ctx, pats, opts, default='relglob',
+m = scmutil.match(
-badfn=lambda x, y: False)
+ctx, pats, opts, default='relglob', badfn=lambda x, y: False
+)
 ui.pager('locate')
 if ctx.rev() is None:
 # When run on the working copy, "locate" includes removed files, so
 # we get the list of files from the dirstate.
 ui.write(uipathfn(abs), end)
 ret = 0
 return ret
-@command('log|history',
-[('f', 'follow', None,
+@command(
-_('follow changeset history, or file history across copies and renames')),
+'log|history',
-('', 'follow-first', None,
+[
-_('only follow the first parent of merge changesets (DEPRECATED)')),
+(
-('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
+'f',
-('C', 'copies', None, _('show copied files')),
+'follow',
-('k', 'keyword', [],
+None,
-_('do case-insensitive search for a given text'), _('TEXT')),
+_(
-('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
+'follow changeset history, or file history across copies and renames'
-('L', 'line-range', [],
+),
-_('follow line range of specified file (EXPERIMENTAL)'),
+),
-_('FILE,RANGE')),
+(
-('', 'removed', None, _('include revisions where files were removed')),
+'',
-('m', 'only-merges', None,
+'follow-first',
-_('show only merges (DEPRECATED) (use -r "merge()" instead)')),
+None,
-('u', 'user', [], _('revisions committed by user'), _('USER')),
+_('only follow the first parent of merge changesets (DEPRECATED)'),
-('', 'only-branch', [],
+),
-_('show only changesets within the given named branch (DEPRECATED)'),
+('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
-_('BRANCH')),
+('C', 'copies', None, _('show copied files')),
-('b', 'branch', [],
+(
-_('show changesets within the given named branch'), _('BRANCH')),
+'k',
-('P', 'prune', [],
+'keyword',
-_('do not display revision or any of its ancestors'), _('REV')),
+[],
-] + logopts + walkopts,
+_('do case-insensitive search for a given text'),
+_('TEXT'),
+),
+('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
+(
+'L',
+'line-range',
+[],
+_('follow line range of specified file (EXPERIMENTAL)'),
+_('FILE,RANGE'),
+),
+('', 'removed', None, _('include revisions where files were removed')),
+(
+'m',
+'only-merges',
+None,
+_('show only merges (DEPRECATED) (use -r "merge()" instead)'),
+),
+('u', 'user', [], _('revisions committed by user'), _('USER')),
+(
+'',
+'only-branch',
+[],
+_(
+'show only changesets within the given named branch (DEPRECATED)'
+),
+_('BRANCH'),
+),
+(
+'b',
+'branch',
+[],
+_('show changesets within the given named branch'),
+_('BRANCH'),
+),
+(
+'P',
+'prune',
+[],
+_('do not display revision or any of its ancestors'),
+_('REV'),
+),
+]
++ logopts
++ walkopts,
 _('[OPTION]... [FILE]'),
 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
-helpbasic=True, inferrepo=True,
+helpbasic=True,
-intents={INTENT_READONLY})
+inferrepo=True,
+intents={INTENT_READONLY},
+)
 def log(ui, repo, *pats, **opts):
 """show revision history of entire repository or files
 Print the revision history of the specified files or the entire
 project.
 if revs:
 endrev = revs.max() + 1
 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
 ui.pager('log')
-displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
+displayer = logcmdutil.changesetdisplayer(
-buffered=True)
+ui, repo, opts, differ, buffered=True
+)
 if opts.get('graph'):
 displayfn = logcmdutil.displaygraphrevs
 else:
 displayfn = logcmdutil.displayrevs
 displayfn(ui, repo, revs, displayer, getcopies)
-@command('manifest',
-[('r', 'rev', '', _('revision to display'), _('REV')),
+@command(
-('', 'all', False, _("list files from all revisions"))]
+'manifest',
-+ formatteropts,
+[
+('r', 'rev', '', _('revision to display'), _('REV')),
+('', 'all', False, _("list files from all revisions")),
+]
++ formatteropts,
 _('[-r REV]'),
 helpcategory=command.CATEGORY_MAINTENANCE,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def manifest(ui, repo, node=None, rev=None, **opts):
 """output the current or given revision of the project manifest
 Print a list of version controlled files for the given revision.
 If no revision is given, the first parent of the working directory
 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
 fm.write('path', '%s\n', f)
 fm.end()
-@command('merge',
-[('f', 'force', None,
+@command(
-_('force a merge including outstanding changes (DEPRECATED)')),
+'merge',
-('r', 'rev', '', _('revision to merge'), _('REV')),
+[
-('P', 'preview', None,
+(
-_('review revisions to merge (no merge is performed)')),
+'f',
-('', 'abort', None, _('abort the ongoing merge')),
+'force',
-] + mergetoolopts,
+None,
+_('force a merge including outstanding changes (DEPRECATED)'),
+),
+('r', 'rev', '', _('revision to merge'), _('REV')),
+(
+'P',
+'preview',
+None,
+_('review revisions to merge (no merge is performed)'),
+),
+('', 'abort', None, _('abort the ongoing merge')),
+]
++ mergetoolopts,
 _('[-P] [[-r] REV]'),
-helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
+helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
+helpbasic=True,
+)
 def merge(ui, repo, node=None, **opts):
 """merge another revision into working directory
 The current working directory is updated with all changes made in
 the requested revision since the last common predecessor revision.
 if abort and repo.dirstate.p2() == nullid:
 cmdutil.wrongtooltocontinue(repo, _('merge'))
 if abort:
 state = cmdutil.getunfinishedstate(repo)
 if state and state._opname != 'merge':
-raise error.Abort(_('cannot abort merge with %s in progress') %
+raise error.Abort(
-(state._opname), hint=state.hint())
+_('cannot abort merge with %s in progress') % (state._opname),
+hint=state.hint(),
+)
 if node:
 raise error.Abort(_("cannot specify a node with --abort"))
 if opts.get('rev'):
 raise error.Abort(_("cannot specify both --rev and --abort"))
 if opts.get('preview'):
 # ui.forcemerge is an internal variable, do not document
 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
 with ui.configoverride(overrides, 'merge'):
 force = opts.get('force')
 labels = ['working copy', 'merge rev']
-return hg.merge(repo, node, force=force, mergeforce=force,
+return hg.merge(
-labels=labels, abort=abort)
+repo,
+node,
+force=force,
+mergeforce=force,
+labels=labels,
+abort=abort,
+)
 statemod.addunfinished(
-'merge', fname=None, clearable=True, allowcommit=True,
+'merge',
-cmdmsg=_('outstanding uncommitted merge'), abortfunc=hg.abortmerge,
+fname=None,
-statushint=_('To continue:    hg commit\n'
+clearable=True,
-'To abort:       hg merge --abort'),
+allowcommit=True,
-cmdhint=_("use 'hg commit' or 'hg merge --abort'")
+cmdmsg=_('outstanding uncommitted merge'),
+abortfunc=hg.abortmerge,
+statushint=_(
+'To continue:    hg commit\n' 'To abort:       hg merge --abort'
+),
+cmdhint=_("use 'hg commit' or 'hg merge --abort'"),
 )
-@command('outgoing|out',
-[('f', 'force', None, _('run even when the destination is unrelated')),
+@command(
-('r', 'rev', [],
+'outgoing|out',
-_('a changeset intended to be included in the destination'), _('REV')),
+[
-('n', 'newest-first', None, _('show newest record first')),
+('f', 'force', None, _('run even when the destination is unrelated')),
-('B', 'bookmarks', False, _('compare bookmarks')),
+(
-('b', 'branch', [], _('a specific branch you would like to push'),
+'r',
-_('BRANCH')),
+'rev',
-] + logopts + remoteopts + subrepoopts,
+[],
+_('a changeset intended to be included in the destination'),
+_('REV'),
+),
+('n', 'newest-first', None, _('show newest record first')),
+('B', 'bookmarks', False, _('compare bookmarks')),
+(
+'b',
+'branch',
+[],
+_('a specific branch you would like to push'),
+_('BRANCH'),
+),
+]
++ logopts
++ remoteopts
++ subrepoopts,
 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
-helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
+helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
+)
 def outgoing(ui, repo, dest=None, **opts):
 """show changesets not found in the destination
 Show changesets not found in the specified destination repository
 or the default push location. These are the changesets that would
 """
 # hg._outgoing() needs to re-resolve the path in order to handle #branch
 # style URLs, so don't overwrite dest.
 path = ui.paths.getpath(dest, default=('default-push', 'default'))
 if not path:
-raise error.Abort(_('default repository not configured!'),
+raise error.Abort(
-hint=_("see 'hg help config.paths'"))
+_('default repository not configured!'),
+hint=_("see 'hg help config.paths'"),
+)
 opts = pycompat.byteskwargs(opts)
 if opts.get('graph'):
 logcmdutil.checkunsupportedgraphflags([], opts)
 o, other = hg._outgoing(ui, repo, dest, opts)
 return
 revdag = logcmdutil.graphrevs(repo, o, opts)
 ui.pager('outgoing')
 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
-logcmdutil.displaygraph(ui, repo, revdag, displayer,
+logcmdutil.displaygraph(
-graphmod.asciiedges)
+ui, repo, revdag, displayer, graphmod.asciiedges
+)
 cmdutil.outgoinghooks(ui, repo, other, opts, o)
 return 0
 if opts.get('bookmarks'):
 dest = path.pushloc or path.loc
 try:
 return hg.outgoing(ui, repo, dest, opts)
 finally:
 del repo._subtoppath
-@command('parents',
-[('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
+@command(
-] + templateopts,
+'parents',
+[('r', 'rev', '', _('show parents of the specified revision'), _('REV')),]
++ templateopts,
 _('[-r REV] [FILE]'),
 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
-inferrepo=True)
+inferrepo=True,
+)
 def parents(ui, repo, file_=None, **opts):
 """show the parents of the working directory or revision (DEPRECATED)
 Print the working directory's parent revisions. If a revision is
 given via -r/--rev, the parent of that revision will be printed.
 for n in p:
 if n != nullid:
 displayer.show(repo[n])
 displayer.close()
-@command('paths', formatteropts, _('[NAME]'),
+@command(
+'paths',
+formatteropts,
+_('[NAME]'),
 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
-optionalrepo=True, intents={INTENT_READONLY})
+optionalrepo=True,
+intents={INTENT_READONLY},
+)
 def paths(ui, repo, search=None, **opts):
 """show aliases for remote repositories
 Show definition of symbolic path name NAME. If no name is given,
 show definition of all available names.
 """
 opts = pycompat.byteskwargs(opts)
 ui.pager('paths')
 if search:
-pathitems = [(name, path) for name, path in ui.paths.iteritems()
+pathitems = [
-if name == search]
+(name, path)
+for name, path in ui.paths.iteritems()
+if name == search
+]
 else:
 pathitems = sorted(ui.paths.iteritems())
 fm = ui.formatter('paths', opts)
 if fm.isplain():
 ui.warn(_("not found!\n"))
 return 1
 else:
 return 0
-@command('phase',
-[('p', 'public', False, _('set changeset phase to public')),
+@command(
-('d', 'draft', False, _('set changeset phase to draft')),
+'phase',
-('s', 'secret', False, _('set changeset phase to secret')),
+[
-('f', 'force', False, _('allow to move boundary backward')),
+('p', 'public', False, _('set changeset phase to public')),
-('r', 'rev', [], _('target revision'), _('REV')),
+('d', 'draft', False, _('set changeset phase to draft')),
+('s', 'secret', False, _('set changeset phase to secret')),
+('f', 'force', False, _('allow to move boundary backward')),
+('r', 'rev', [], _('target revision'), _('REV')),
 ],
 _('[-p|-d|-s] [-f] [-r] [REV...]'),
-helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
+)
 def phase(ui, repo, *revs, **opts):
 """set or show the current phase name
 With no argument, show the phase name of the current revision(s).
 phases.retractboundary(repo, tr, targetphase, nodes)
 getphase = unfi._phasecache.phase
 newdata = [getphase(unfi, r) for r in unfi]
 changes = sum(newdata[r] != olddata[r] for r in unfi)
 cl = unfi.changelog
-rejected = [n for n in nodes
+rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
-if newdata[cl.rev(n)] < targetphase]
 if rejected:
-ui.warn(_('cannot move %i changesets to a higher '
+ui.warn(
-'phase, use --force\n') % len(rejected))
+_(
+'cannot move %i changesets to a higher '
+'phase, use --force\n'
+)
+% len(rejected)
+)
 ret = 1
 if changes:
 msg = _('phase changed for %i changesets\n') % changes
 if ret:
 ui.status(msg)
 else:
 ui.note(msg)
 else:
 ui.warn(_('no phases changed\n'))
 return ret
 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
 """Run after a changegroup has been added via pull/unbundle
 This takes arguments below:
 if modheads is not None and modheads > 1:
 currentbranchheads = len(repo.branchheads())
 if currentbranchheads == modheads:
 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
 elif currentbranchheads > 1:
-ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
+ui.status(
-"merge)\n"))
+_("(run 'hg heads .' to see heads, 'hg merge' to " "merge)\n")
+)
 else:
 ui.status(_("(run 'hg heads' to see heads)\n"))
 elif not ui.configbool('commands', 'update.requiredest'):
 ui.status(_("(run 'hg update' to get a working copy)\n"))
-@command('pull',
-[('u', 'update', None,
+@command(
-_('update to new branch head if new descendants were pulled')),
+'pull',
-('f', 'force', None, _('run even when remote repository is unrelated')),
+[
-('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
+(
-('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
+'u',
-('b', 'branch', [], _('a specific branch you would like to pull'),
+'update',
-_('BRANCH')),
+None,
-] + remoteopts,
+_('update to new branch head if new descendants were pulled'),
+),
+('f', 'force', None, _('run even when remote repository is unrelated')),
+(
+'r',
+'rev',
+[],
+_('a remote changeset intended to be added'),
+_('REV'),
+),
+('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
+(
+'b',
+'branch',
+[],
+_('a specific branch you would like to pull'),
+_('BRANCH'),
+),
+]
++ remoteopts,
 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
-helpbasic=True)
+helpbasic=True,
+)
 def pull(ui, repo, source="default", **opts):
 """pull changes from the specified source
 Pull changes from a remote repository to a local one.
 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
 ui.status(_('pulling from %s\n') % util.hidepassword(source))
 other = hg.peer(repo, opts, source)
 try:
-revs, checkout = hg.addbranchrevs(repo, other, branches,
+revs, checkout = hg.addbranchrevs(
-opts.get('rev'))
+repo, other, branches, opts.get('rev')
+)
 pullopargs = {}
 nodes = None
 if opts.get('bookmark') or revs:
 # version of the server state (issue 4700).
 nodes = []
 fnodes = []
 revs = revs or []
 if revs and not other.capable('lookup'):
-err = _("other repository doesn't support revision lookup, "
+err = _(
-"so a rev cannot be specified.")
+"other repository doesn't support revision lookup, "
+"so a rev cannot be specified."
+)
 raise error.Abort(err)
 with other.commandexecutor() as e:
-fremotebookmarks = e.callcommand('listkeys', {
+fremotebookmarks = e.callcommand(
-'namespace': 'bookmarks'
+'listkeys', {'namespace': 'bookmarks'}
-})
+)
 for r in revs:
 fnodes.append(e.callcommand('lookup', {'key': r}))
 remotebookmarks = fremotebookmarks.result()
 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
 pullopargs['remotebookmarks'] = remotebookmarks
 wlock = util.nullcontextmanager()
 if opts.get('update'):
 wlock = repo.wlock()
 with wlock:
 pullopargs.update(opts.get('opargs', {}))
-modheads = exchange.pull(repo, other, heads=nodes,
+modheads = exchange.pull(
-force=opts.get('force'),
+repo,
-bookmarks=opts.get('bookmark', ()),
+other,
-opargs=pullopargs).cgresult
+heads=nodes,
+force=opts.get('force'),
+bookmarks=opts.get('bookmark', ()),
+opargs=pullopargs,
+).cgresult
 # brev is a name, which might be a bookmark to be activated at
 # the end of the update. In other words, it is an explicit
 # destination of the update
 brev = None
 brev = opts['branch'][0]
 else:
 brev = branches[0]
 repo._subtoppath = source
 try:
-ret = postincoming(ui, repo, modheads, opts.get('update'),
+ret = postincoming(
-checkout, brev)
+ui, repo, modheads, opts.get('update'), checkout, brev
+)
 except error.FilteredRepoLookupError as exc:
 msg = _('cannot update to target: %s') % exc.args[0]
 exc.args = (msg,) + exc.args[1:]
 raise
 finally:
 finally:
 other.close()
 return ret
-@command('push',
-[('f', 'force', None, _('force push')),
+@command(
-('r', 'rev', [],
+'push',
-_('a changeset intended to be included in the destination'),
+[
-_('REV')),
+('f', 'force', None, _('force push')),
-('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
+(
-('b', 'branch', [],
+'r',
-_('a specific branch you would like to push'), _('BRANCH')),
+'rev',
-('', 'new-branch', False, _('allow pushing a new branch')),
+[],
-('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
+_('a changeset intended to be included in the destination'),
-('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
+_('REV'),
-] + remoteopts,
+),
+('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
+(
+'b',
+'branch',
+[],
+_('a specific branch you would like to push'),
+_('BRANCH'),
+),
+('', 'new-branch', False, _('allow pushing a new branch')),
+(
+'',
+'pushvars',
+[],
+_('variables that can be sent to server (ADVANCED)'),
+),
+(
+'',
+'publish',
+False,
+_('push the changeset as public (EXPERIMENTAL)'),
+),
+]
++ remoteopts,
 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
-helpbasic=True)
+helpbasic=True,
+)
 def push(ui, repo, dest=None, **opts):
 """push changes to the specified destination
 Push changesets from the local repository to the specified
 destination.
 # this lets simultaneous -r, -b options continue working
 opts.setdefault('rev', []).append("null")
 path = ui.paths.getpath(dest, default=('default-push', 'default'))
 if not path:
-raise error.Abort(_('default repository not configured!'),
+raise error.Abort(
-hint=_("see 'hg help config.paths'"))
+_('default repository not configured!'),
+hint=_("see 'hg help config.paths'"),
+)
 dest = path.pushloc or path.loc
 branches = (path.branch, opts.get('branch') or [])
 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
 other = hg.peer(repo, opts, dest)
 if revs:
 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
 if not revs:
-raise error.Abort(_("specified revisions evaluate to an empty set"),
+raise error.Abort(
-hint=_("use different revision arguments"))
+_("specified revisions evaluate to an empty set"),
+hint=_("use different revision arguments"),
+)
 elif path.pushrev:
 # It doesn't make any sense to specify ancestor revisions. So limit
 # to DAG heads to make discovery simpler.
 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
 revs = scmutil.revrange(repo, [expr])
 revs = [repo[rev].node() for rev in revs]
 if not revs:
-raise error.Abort(_('default push revset for path evaluates to an '
+raise error.Abort(
-'empty set'))
+_('default push revset for path evaluates to an ' 'empty set')
+)
 repo._subtoppath = dest
 try:
 # push subrepos depth-first for coherent ordering
 c = repo['.']
-subs = c.substate # only repos that are committed
+subs = c.substate  # only repos that are committed
 for s in sorted(subs):
 result = c.sub(s).push(opts)
 if result == 0:
 return not result
 finally:
 del repo._subtoppath
-opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
+opargs = dict(opts.get('opargs', {}))  # copy opargs since we may mutate it
 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
-pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
+pushop = exchange.push(
-newbranch=opts.get('new_branch'),
+repo,
-bookmarks=opts.get('bookmark', ()),
+other,
-publish=opts.get('publish'),
+opts.get('force'),
-opargs=opargs)
+revs=revs,
+newbranch=opts.get('new_branch'),
+bookmarks=opts.get('bookmark', ()),
+publish=opts.get('publish'),
+opargs=opargs,
+)
 result = not pushop.cgresult
 if pushop.bkresult is not None:
 if pushop.bkresult == 2:
 elif not result and pushop.bkresult:
 result = 2
 return result
-@command('recover',
-[('','verify', True, "run `hg verify` after succesful recover"),
+@command(
-],
+'recover',
-helpcategory=command.CATEGORY_MAINTENANCE)
+[('', 'verify', True, "run `hg verify` after succesful recover"),],
+helpcategory=command.CATEGORY_MAINTENANCE,
+)
 def recover(ui, repo, **opts):
 """roll back an interrupted transaction
 Recover from an interrupted commit or pull.
 ret = repo.recover()
 if ret:
 if opts[r'verify']:
 return hg.verify(repo)
 else:
-msg = _("(verify step skipped, run  `hg verify` to check your "
+msg = _(
-"repository content)\n")
+"(verify step skipped, run  `hg verify` to check your "
+"repository content)\n"
+)
 ui.warn(msg)
 return 0
 return 1
-@command('remove|rm',
-[('A', 'after', None, _('record delete for missing files')),
+@command(
-('f', 'force', None,
+'remove|rm',
-_('forget added files, delete modified files')),
+[
-] + subrepoopts + walkopts + dryrunopts,
+('A', 'after', None, _('record delete for missing files')),
+('f', 'force', None, _('forget added files, delete modified files')),
+]
++ subrepoopts
++ walkopts
++ dryrunopts,
 _('[OPTION]... FILE...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
-helpbasic=True, inferrepo=True)
+helpbasic=True,
+inferrepo=True,
+)
 def remove(ui, repo, *pats, **opts):
 """remove the specified files on the next commit
 Schedule the indicated files for removal from the current branch.
 raise error.Abort(_('no files specified'))
 m = scmutil.match(repo[None], pats, opts)
 subrepos = opts.get('subrepos')
 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
-return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,
+return cmdutil.remove(
-dryrun=dryrun)
+ui, repo, m, "", uipathfn, after, force, subrepos, dryrun=dryrun
+)
-@command('rename|move|mv',
-[('A', 'after', None, _('record a rename that has already occurred')),
-('f', 'force', None, _('forcibly move over an existing managed file')),
+@command(
-] + walkopts + dryrunopts,
+'rename|move|mv',
+[
+('A', 'after', None, _('record a rename that has already occurred')),
+('f', 'force', None, _('forcibly move over an existing managed file')),
+]
++ walkopts
++ dryrunopts,
 _('[OPTION]... SOURCE... DEST'),
-helpcategory=command.CATEGORY_WORKING_DIRECTORY)
+helpcategory=command.CATEGORY_WORKING_DIRECTORY,
+)
 def rename(ui, repo, *pats, **opts):
 """rename files; equivalent of copy + remove
 Mark dest as copies of sources; mark sources for deletion. If dest
 is a directory, copies are put in that directory. If dest is a
 """
 opts = pycompat.byteskwargs(opts)
 with repo.wlock(False):
 return cmdutil.copy(ui, repo, pats, opts, rename=True)
-@command('resolve',
-[('a', 'all', None, _('select all unresolved files')),
+@command(
-('l', 'list', None, _('list state of files needing merge')),
+'resolve',
-('m', 'mark', None, _('mark files as resolved')),
+[
-('u', 'unmark', None, _('mark files as unresolved')),
+('a', 'all', None, _('select all unresolved files')),
-('n', 'no-status', None, _('hide status prefix')),
+('l', 'list', None, _('list state of files needing merge')),
-('', 're-merge', None, _('re-merge files'))]
+('m', 'mark', None, _('mark files as resolved')),
-+ mergetoolopts + walkopts + formatteropts,
+('u', 'unmark', None, _('mark files as unresolved')),
+('n', 'no-status', None, _('hide status prefix')),
+('', 're-merge', None, _('re-merge files')),
+]
++ mergetoolopts
++ walkopts
++ formatteropts,
 _('[OPTION]... [FILE]...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
-inferrepo=True)
+inferrepo=True,
+)
 def resolve(ui, repo, *pats, **opts):
 """redo merges or set/view the merge status of files
 Merges with unresolved conflicts are often the result of
 non-interactive merging using the ``internal:merge`` configuration
 """
 opts = pycompat.byteskwargs(opts)
 confirm = ui.configbool('commands', 'resolve.confirm')
 flaglist = 'all mark unmark list no_status re_merge'.split()
-all, mark, unmark, show, nostatus, remerge = [
+all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
-opts.get(o) for o in flaglist]
 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
 if actioncount > 1:
 raise error.Abort(_("too many actions specified"))
-elif (actioncount == 0
+elif actioncount == 0 and ui.configbool(
-and ui.configbool('commands', 'resolve.explicit-re-merge')):
+'commands', 'resolve.explicit-re-merge'
+):
 hint = _('use --mark, --unmark, --list or --re-merge')
 raise error.Abort(_('no action specified'), hint=hint)
 if pats and all:
 raise error.Abort(_("can't specify --all and patterns"))
 if not (all or pats or show or mark or unmark):
-raise error.Abort(_('no files or directories specified'),
+raise error.Abort(
-hint=('use --all to re-merge all unresolved files'))
+_('no files or directories specified'),
+hint='use --all to re-merge all unresolved files',
+)
 if confirm:
 if all:
-if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
+if ui.promptchoice(
-b'$$ &Yes $$ &No')):
+_(b're-merge all unresolved files (yn)?' b'$$ &Yes $$ &No')
+):
 raise error.Abort(_('user quit'))
 if mark and not pats:
-if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
+if ui.promptchoice(
-b'$$ &Yes $$ &No')):
+_(
+b'mark all unresolved files as resolved (yn)?'
+b'$$ &Yes $$ &No'
+)
+):
 raise error.Abort(_('user quit'))
 if unmark and not pats:
-if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
+if ui.promptchoice(
-b'$$ &Yes $$ &No')):
+_(
+b'mark all resolved files as unresolved (yn)?'
+b'$$ &Yes $$ &No'
+)
+):
 raise error.Abort(_('user quit'))
 uipathfn = scmutil.getuipathfn(repo)
 if show:
 mergestateinfo = {
 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
-mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
+mergemod.MERGE_RECORD_DRIVER_RESOLVED: (
-'D'),
+'resolve.driverresolved',
+'D',
+),
 }
 for f in ms:
 if not m(f):
 continue
 with repo.wlock():
 ms = mergemod.mergestate.read(repo)
 if not (ms.active() or repo.dirstate.p2() != nullid):
 raise error.Abort(
-_('resolve command not applicable when not merging'))
+_('resolve command not applicable when not merging')
+)
 wctx = repo[None]
-if (ms.mergedriver
+if (
-and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
+ms.mergedriver
+and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED
+):
 proceed = mergemod.driverpreprocess(repo, ms, wctx)
 ms.commit()
 # allow mark and unmark to go through
 if not mark and not unmark and not proceed:
 return 1
 # step if asked to resolve
 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
 exact = m.exact(f)
 if mark:
 if exact:
-ui.warn(_('not marking %s as it is driver-resolved\n')
+ui.warn(
-% uipathfn(f))
+_('not marking %s as it is driver-resolved\n')
+% uipathfn(f)
+)
 elif unmark:
 if exact:
-ui.warn(_('not unmarking %s as it is driver-resolved\n')
+ui.warn(
-% uipathfn(f))
+_('not unmarking %s as it is driver-resolved\n')
+% uipathfn(f)
+)
 else:
 runconclude = True
 continue
 # path conflicts must be resolved manually
-if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
+if ms[f] in (
-mergemod.MERGE_RECORD_RESOLVED_PATH):
+mergemod.MERGE_RECORD_UNRESOLVED_PATH,
+mergemod.MERGE_RECORD_RESOLVED_PATH,
+):
 if mark:
 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
 elif unmark:
 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
-ui.warn(_('%s: path conflict must be resolved manually\n')
+ui.warn(
-% uipathfn(f))
+_('%s: path conflict must be resolved manually\n')
+% uipathfn(f)
+)
 continue
 if mark:
 if markcheck:
 fdata = repo.wvfs.tryread(f)
-if (filemerge.hasconflictmarkers(fdata) and
+if (
-ms[f] != mergemod.MERGE_RECORD_RESOLVED):
+filemerge.hasconflictmarkers(fdata)
+and ms[f] != mergemod.MERGE_RECORD_RESOLVED
+):
 hasconflictmarkers.append(f)
 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
 elif unmark:
 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
 else:
 # replace filemerge's .orig file with our resolve file, but only
 # for merges that are complete
 if complete:
 try:
-util.rename(a + ".resolve",
+util.rename(
-scmutil.backuppath(ui, repo, f))
+a + ".resolve", scmutil.backuppath(ui, repo, f)
+)
 except OSError as inst:
 if inst.errno != errno.ENOENT:
 raise
 if hasconflictmarkers:
-ui.warn(_('warning: the following files still have conflict '
+ui.warn(
-'markers:\n') + ''.join('  ' + uipathfn(f) + '\n'
+_(
-for f in hasconflictmarkers))
+'warning: the following files still have conflict '
+'markers:\n'
+)
++ ''.join('  ' + uipathfn(f) + '\n' for f in hasconflictmarkers)
+)
 if markcheck == 'abort' and not all and not pats:
-raise error.Abort(_('conflict markers detected'),
+raise error.Abort(
-hint=_('use --all to mark anyway'))
+_('conflict markers detected'),
+hint=_('use --all to mark anyway'),
+)
 for f in tocomplete:
 try:
 # resolve file
 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
 pats = ['path:%s' % p for p in pats]
 m = scmutil.match(wctx, pats, opts)
 for f in ms:
 if not m(f):
 continue
 def flag(o):
 if o == 're_merge':
 return '--re-merge '
 return '-%s ' % o[0:1]
 flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
 hint = _("(try: hg resolve %s%s)\n") % (
 flags,
-' '.join(pats))
+' '.join(pats),
+)
 break
 ui.warn(_("arguments do not match paths that need resolving\n"))
 if hint:
 ui.warn(hint)
 elif ms.mergedriver and ms.mdstate() != 's':
 # run conclude step when either a driver-resolved file is requested
 # or there are no driver-resolved files
 # we can't use 'ret' to determine whether any files are unresolved
 # because we might not have tried to resolve some
-if ((runconclude or not list(ms.driverresolved()))
+if (runconclude or not list(ms.driverresolved())) and not list(
-and not list(ms.unresolved())):
+ms.unresolved()
+):
 proceed = mergemod.driverconclude(repo, ms, wctx)
 ms.commit()
 if not proceed:
 return 1
 driverresolvedf = list(ms.driverresolved())
 if not unresolvedf and not driverresolvedf:
 ui.status(_('(no more unresolved files)\n'))
 cmdutil.checkafterresolved(repo)
 elif not unresolvedf:
-ui.status(_('(no more unresolved files -- '
+ui.status(
-'run "hg resolve --all" to conclude)\n'))
+_(
+'(no more unresolved files -- '
+'run "hg resolve --all" to conclude)\n'
+)
+)
 return ret
-@command('revert',
-[('a', 'all', None, _('revert all changes when no arguments given')),
+@command(
-('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
+'revert',
-('r', 'rev', '', _('revert to the specified revision'), _('REV')),
+[
-('C', 'no-backup', None, _('do not save backup copies of files')),
+('a', 'all', None, _('revert all changes when no arguments given')),
-('i', 'interactive', None, _('interactively select the changes')),
+('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
-] + walkopts + dryrunopts,
+('r', 'rev', '', _('revert to the specified revision'), _('REV')),
+('C', 'no-backup', None, _('do not save backup copies of files')),
+('i', 'interactive', None, _('interactively select the changes')),
+]
++ walkopts
++ dryrunopts,
 _('[OPTION]... [-r REV] [NAME]...'),
-helpcategory=command.CATEGORY_WORKING_DIRECTORY)
+helpcategory=command.CATEGORY_WORKING_DIRECTORY,
+)
 def revert(ui, repo, *pats, **opts):
 """restore files to their checkout state
 .. note::
 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
 parent, p2 = repo.dirstate.parents()
 if not opts.get('rev') and p2 != nullid:
 # revert after merge is a trap for new users (issue2915)
-raise error.Abort(_('uncommitted merge with no revision specified'),
+raise error.Abort(
-hint=_("use 'hg update' or see 'hg help revert'"))
+_('uncommitted merge with no revision specified'),
+hint=_("use 'hg update' or see 'hg help revert'"),
+)
 rev = opts.get('rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
 ctx = scmutil.revsingle(repo, rev)
-if (not (pats or opts.get('include') or opts.get('exclude') or
+if not (
-opts.get('all') or opts.get('interactive'))):
+pats
+or opts.get('include')
+or opts.get('exclude')
+or opts.get('all')
+or opts.get('interactive')
+):
 msg = _("no files or directories specified")
 if p2 != nullid:
-hint = _("uncommitted merge, use --all to discard all changes,"
+hint = _(
-" or 'hg update -C .' to abort the merge")
+"uncommitted merge, use --all to discard all changes,"
+" or 'hg update -C .' to abort the merge"
+)
 raise error.Abort(msg, hint=hint)
 dirty = any(repo.status())
 node = ctx.node()
 if node != parent:
 if dirty:
-hint = _("uncommitted changes, use --all to discard all"
+hint = (
-" changes, or 'hg update %d' to update") % ctx.rev()
+_(
+"uncommitted changes, use --all to discard all"
+" changes, or 'hg update %d' to update"
+)
+% ctx.rev()
+)
 else:
-hint = _("use --all to revert all files,"
+hint = (
-" or 'hg update %d' to update") % ctx.rev()
+_(
+"use --all to revert all files,"
+" or 'hg update %d' to update"
+)
+% ctx.rev()
+)
 elif dirty:
 hint = _("uncommitted changes, use --all to discard all changes")
 else:
 hint = _("use --all to revert all files")
 raise error.Abort(msg, hint=hint)
-return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
+return cmdutil.revert(
-**pycompat.strkwargs(opts))
+ui, repo, ctx, (parent, p2), *pats, **pycompat.strkwargs(opts)
+)
 @command(
 'rollback',
 dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
-helpcategory=command.CATEGORY_MAINTENANCE)
+helpcategory=command.CATEGORY_MAINTENANCE,
+)
 def rollback(ui, repo, **opts):
 """roll back the last transaction (DANGEROUS) (DEPRECATED)
 Please use :hg:`commit --amend` instead of rollback to correct
 mistakes in the last commit.
 may fail if a rollback is performed.
 Returns 0 on success, 1 if no rollback data is available.
 """
 if not ui.configbool('ui', 'rollback'):
-raise error.Abort(_('rollback is disabled because it is unsafe'),
+raise error.Abort(
-hint=('see `hg help -v rollback` for information'))
+_('rollback is disabled because it is unsafe'),
-return repo.rollback(dryrun=opts.get(r'dry_run'),
+hint='see `hg help -v rollback` for information',
-force=opts.get(r'force'))
+)
+return repo.rollback(dryrun=opts.get(r'dry_run'), force=opts.get(r'force'))
 @command(
-'root', [] + formatteropts, intents={INTENT_READONLY},
+'root',
-helpcategory=command.CATEGORY_WORKING_DIRECTORY)
+[] + formatteropts,
+intents={INTENT_READONLY},
+helpcategory=command.CATEGORY_WORKING_DIRECTORY,
+)
 def root(ui, repo, **opts):
 """print the root (top) of the current working directory
 Print the root directory of the current repository.
 with ui.formatter('root', opts) as fm:
 fm.startitem()
 fm.write('reporoot', '%s\n', repo.root)
 fm.data(hgpath=repo.path, storepath=repo.spath)
-@command('serve',
-[('A', 'accesslog', '', _('name of access log file to write to'),
+@command(
-_('FILE')),
+'serve',
-('d', 'daemon', None, _('run server in background')),
+[
-('', 'daemon-postexec', [], _('used internally by daemon mode')),
+(
-('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
+'A',
-# use string type, then we can check if something was passed
+'accesslog',
-('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
+'',
-('a', 'address', '', _('address to listen on (default: all interfaces)'),
+_('name of access log file to write to'),
-_('ADDR')),
+_('FILE'),
-('', 'prefix', '', _('prefix path to serve from (default: server root)'),
+),
-_('PREFIX')),
+('d', 'daemon', None, _('run server in background')),
-('n', 'name', '',
+('', 'daemon-postexec', [], _('used internally by daemon mode')),
-_('name to show in web pages (default: working directory)'), _('NAME')),
+(
-('', 'web-conf', '',
+'E',
-_("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
+'errorlog',
-('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
+'',
-_('FILE')),
+_('name of error log file to write to'),
-('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
+_('FILE'),
-('', 'stdio', None, _('for remote clients (ADVANCED)')),
+),
-('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
+# use string type, then we can check if something was passed
-('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
+('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
-('', 'style', '', _('template style to use'), _('STYLE')),
+(
-('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
+'a',
-('', 'certificate', '', _('SSL certificate file'), _('FILE')),
+'address',
-('', 'print-url', None, _('start and print only the URL'))]
+'',
-+ subrepoopts,
+_('address to listen on (default: all interfaces)'),
+_('ADDR'),
+),
+(
+'',
+'prefix',
+'',
+_('prefix path to serve from (default: server root)'),
+_('PREFIX'),
+),
+(
+'n',
+'name',
+'',
+_('name to show in web pages (default: working directory)'),
+_('NAME'),
+),
+(
+'',
+'web-conf',
+'',
+_("name of the hgweb config file (see 'hg help hgweb')"),
+_('FILE'),
+),
+(
+'',
+'webdir-conf',
+'',
+_('name of the hgweb config file (DEPRECATED)'),
+_('FILE'),
+),
+(
+'',
+'pid-file',
+'',
+_('name of file to write process ID to'),
+_('FILE'),
+),
+('', 'stdio', None, _('for remote clients (ADVANCED)')),
+('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
+('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
+('', 'style', '', _('template style to use'), _('STYLE')),
+('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
+('', 'certificate', '', _('SSL certificate file'), _('FILE')),
+('', 'print-url', None, _('start and print only the URL')),
+]
++ subrepoopts,
 _('[OPTION]...'),
 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
-helpbasic=True, optionalrepo=True)
+helpbasic=True,
+optionalrepo=True,
+)
 def serve(ui, repo, **opts):
 """start stand-alone webserver
 Start a local HTTP repository browser and pull server. You can use
 this for ad-hoc sharing and browsing of repositories. It is
 if opts["print_url"] and ui.verbose:
 raise error.Abort(_("cannot use --print-url with --verbose"))
 if opts["stdio"]:
 if repo is None:
-raise error.RepoError(_("there is no Mercurial repository here"
+raise error.RepoError(
-" (.hg not found)"))
+_("there is no Mercurial repository here" " (.hg not found)")
+)
 s = wireprotoserver.sshserver(ui, repo)
 s.serve_forever()
 service = server.createservice(ui, repo, opts)
 return server.runservice(opts, initfn=service.init, runfn=service.run)
-@command('shelve',
-[('A', 'addremove', None,
+@command(
-_('mark new/missing files as added/removed before shelving')),
+'shelve',
-('u', 'unknown', None,
+[
-_('store unknown files in the shelve')),
+(
-('', 'cleanup', None,
+'A',
-_('delete all shelved changes')),
+'addremove',
-('', 'date', '',
+None,
-_('shelve with the specified commit date'), _('DATE')),
+_('mark new/missing files as added/removed before shelving'),
-('d', 'delete', None,
+),
-_('delete the named shelved change(s)')),
+('u', 'unknown', None, _('store unknown files in the shelve')),
-('e', 'edit', False,
+('', 'cleanup', None, _('delete all shelved changes')),
-_('invoke editor on commit messages')),
+('', 'date', '', _('shelve with the specified commit date'), _('DATE')),
-('k', 'keep', False,
+('d', 'delete', None, _('delete the named shelved change(s)')),
-_('shelve, but keep changes in the working directory')),
+('e', 'edit', False, _('invoke editor on commit messages')),
-('l', 'list', None,
+(
-_('list current shelves')),
+'k',
-('m', 'message', '',
+'keep',
-_('use text as shelve message'), _('TEXT')),
+False,
-('n', 'name', '',
+_('shelve, but keep changes in the working directory'),
-_('use the given name for the shelved commit'), _('NAME')),
+),
-('p', 'patch', None,
+('l', 'list', None, _('list current shelves')),
-_('output patches for changes (provide the names of the shelved '
+('m', 'message', '', _('use text as shelve message'), _('TEXT')),
-'changes as positional arguments)')),
+(
-('i', 'interactive', None,
+'n',
-_('interactive mode')),
+'name',
-('', 'stat', None,
+'',
-_('output diffstat-style summary of changes (provide the names of '
+_('use the given name for the shelved commit'),
-'the shelved changes as positional arguments)')
+_('NAME'),
-)] + cmdutil.walkopts,
+),
-_('hg shelve [OPTION]... [FILE]...'),
+(
-helpcategory=command.CATEGORY_WORKING_DIRECTORY)
+'p',
+'patch',
+None,
+_(
+'output patches for changes (provide the names of the shelved '
+'changes as positional arguments)'
+),
+),
+('i', 'interactive', None, _('interactive mode')),
+(
+'',
+'stat',
+None,
+_(
+'output diffstat-style summary of changes (provide the names of '
+'the shelved changes as positional arguments)'
+),
+),
+]
++ cmdutil.walkopts,
+_('hg shelve [OPTION]... [FILE]...'),
+helpcategory=command.CATEGORY_WORKING_DIRECTORY,
+)
 def shelve(ui, repo, *pats, **opts):
 '''save and set aside changes from the working directory
 Shelving takes files that "hg status" reports as not clean, saves
 the modifications to a bundle (a shelved change), and reverts the
 To delete specific shelved changes, use ``--delete``. To delete
 all shelved changes, use ``--cleanup``.
 '''
 opts = pycompat.byteskwargs(opts)
 allowables = [
-('addremove', {'create'}), # 'create' is pseudo action
+('addremove', {'create'}),  # 'create' is pseudo action
 ('unknown', {'create'}),
 ('cleanup', {'cleanup'}),
 #       ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
 ('delete', {'delete'}),
 ('edit', {'create'}),
 ('keep', {'create'}),
 ('list', {'list'}),
 ('message', {'create'}),
 ('name', {'create'}),
 ('patch', {'patch', 'list'}),
 ('stat', {'stat', 'list'}),
 ]
 def checkopt(opt):
 if opts.get(opt):
 for i, allowable in allowables:
 if opts[i] and opt not in allowable:
-raise error.Abort(_("options '--%s' and '--%s' may not be "
+raise error.Abort(
-"used together") % (opt, i))
+_(
+"options '--%s' and '--%s' may not be "
+"used together"
+)
+% (opt, i)
+)
 return True
 if checkopt('cleanup'):
 if pats:
 raise error.Abort(_("cannot specify names when using '--cleanup'"))
 return shelvemod.cleanupcmd(ui, repo)
 elif checkopt('delete'):
 elif checkopt('patch') or checkopt('stat'):
 return shelvemod.patchcmds(ui, repo, pats, opts)
 else:
 return shelvemod.createcmd(ui, repo, pats, opts)
 _NOTTERSE = 'nothing'
-@command('status|st',
-[('A', 'all', None, _('show status of all files')),
+@command(
-('m', 'modified', None, _('show only modified files')),
+'status|st',
-('a', 'added', None, _('show only added files')),
+[
-('r', 'removed', None, _('show only removed files')),
+('A', 'all', None, _('show status of all files')),
-('d', 'deleted', None, _('show only deleted (but tracked) files')),
+('m', 'modified', None, _('show only modified files')),
-('c', 'clean', None, _('show only files without changes')),
+('a', 'added', None, _('show only added files')),
-('u', 'unknown', None, _('show only unknown (not tracked) files')),
+('r', 'removed', None, _('show only removed files')),
-('i', 'ignored', None, _('show only ignored files')),
+('d', 'deleted', None, _('show only deleted (but tracked) files')),
-('n', 'no-status', None, _('hide status prefix')),
+('c', 'clean', None, _('show only files without changes')),
-('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
+('u', 'unknown', None, _('show only unknown (not tracked) files')),
-('C', 'copies', None, _('show source of copied files')),
+('i', 'ignored', None, _('show only ignored files')),
-('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
+('n', 'no-status', None, _('hide status prefix')),
-('', 'rev', [], _('show difference from revision'), _('REV')),
+('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
-('', 'change', '', _('list the changed files of a revision'), _('REV')),
+('C', 'copies', None, _('show source of copied files')),
-] + walkopts + subrepoopts + formatteropts,
+('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
+('', 'rev', [], _('show difference from revision'), _('REV')),
+('', 'change', '', _('list the changed files of a revision'), _('REV')),
+]
++ walkopts
++ subrepoopts
++ formatteropts,
 _('[OPTION]... [FILE]...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
-helpbasic=True, inferrepo=True,
+helpbasic=True,
-intents={INTENT_READONLY})
+inferrepo=True,
+intents={INTENT_READONLY},
+)
 def status(ui, repo, *pats, **opts):
 """show changed files in the working directory
 Show status of files in the repository. If names are given, only
 files that match are shown. Files that are clean or ignored or
 ctx1, ctx2 = scmutil.revpair(repo, revs)
 forcerelativevalue = None
 if ui.hasconfig('commands', 'status.relative'):
 forcerelativevalue = ui.configbool('commands', 'status.relative')
-uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats),
+uipathfn = scmutil.getuipathfn(
-forcerelativevalue=forcerelativevalue)
+repo,
+legacyrelativevalue=bool(pats),
+forcerelativevalue=forcerelativevalue,
+)
 if opts.get('print0'):
 end = '\0'
 else:
 end = '\n'
 show = states[:5]
 m = scmutil.match(ctx2, pats, opts)
 if terse:
 # we need to compute clean and unknown to terse
-stat = repo.status(ctx1.node(), ctx2.node(), m,
+stat = repo.status(
-'ignored' in show or 'i' in terse,
+ctx1.node(),
-clean=True, unknown=True,
+ctx2.node(),
-listsubrepos=opts.get('subrepos'))
+m,
+'ignored' in show or 'i' in terse,
+clean=True,
+unknown=True,
+listsubrepos=opts.get('subrepos'),
+)
 stat = cmdutil.tersedir(stat, terse)
 else:
-stat = repo.status(ctx1.node(), ctx2.node(), m,
+stat = repo.status(
-'ignored' in show, 'clean' in show,
+ctx1.node(),
-'unknown' in show, opts.get('subrepos'))
+ctx2.node(),
+m,
+'ignored' in show,
+'clean' in show,
+'unknown' in show,
+opts.get('subrepos'),
+)
 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
-if (opts.get('all') or opts.get('copies')
+if (
-or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
+opts.get('all')
+or opts.get('copies')
+or ui.configbool('ui', 'statuscopies')
+) and not opts.get('no_status'):
 copy = copies.pathcopies(ctx1, ctx2, m)
 ui.pager('status')
 fm = ui.formatter('status', opts)
 fmt = '%s' + end
 fm.data(path=f)
 fm.condwrite(showchar, 'status', '%s ', char, label=label)
 fm.plain(fmt % uipathfn(f), label=label)
 if f in copy:
 fm.data(source=copy[f])
-fm.plain(('  %s' + end) % uipathfn(copy[f]),
+fm.plain(
-label='status.copied')
+('  %s' + end) % uipathfn(copy[f]),
+label='status.copied',
-if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
+)
-and not ui.plain()):
+if (
+ui.verbose or ui.configbool('commands', 'status.verbose')
+) and not ui.plain():
 cmdutil.morestatus(repo, fm)
 fm.end()
-@command('summary|sum',
+@command(
+'summary|sum',
 [('', 'remote', None, _('check for push and pull'))],
 '[--remote]',
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
 helpbasic=True,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def summary(ui, repo, **opts):
 """summarize working directory state
 This generates a brief summary of the working directory state,
 including parents, branch, commit status, phase and available updates.
 try:
 ms = mergemod.mergestate.read(repo)
 except error.UnsupportedMergeRecords as e:
 s = ' '.join(e.recordtypes)
 ui.warn(
-_('warning: merge state has unsupported record types: %s\n') % s)
+_('warning: merge state has unsupported record types: %s\n') % s
+)
 unresolved = []
 else:
 unresolved = list(ms.unresolved())
 for p in parents:
 # label with log.changeset (instead of log.parent) since this
 # shows a working directory parent *changeset*:
 # i18n: column positioning for "hg summary"
-ui.write(_('parent: %d:%s ') % (p.rev(), p),
+ui.write(
-label=logcmdutil.changesetlabels(p))
+_('parent: %d:%s ') % (p.rev(), p),
+label=logcmdutil.changesetlabels(p),
+)
 ui.write(' '.join(p.tags()), label='log.tag')
 if p.bookmarks():
 marks.extend(p.bookmarks())
 if p.rev() == -1:
 if not len(repo):
 else:
 ui.write(_(' (no revision checked out)'))
 if p.obsolete():
 ui.write(_(' (obsolete)'))
 if p.isunstable():
-instabilities = (ui.label(instability, 'trouble.%s' % instability)
+instabilities = (
-for instability in p.instabilities())
+ui.label(instability, 'trouble.%s' % instability)
-ui.write(' ('
+for instability in p.instabilities()
-+ ', '.join(instabilities)
+)
-+ ')')
+ui.write(' (' + ', '.join(instabilities) + ')')
 ui.write('\n')
 if p.description():
-ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
+ui.status(
-label='log.summary')
+' ' + p.description().splitlines()[0].strip() + '\n',
+label='log.summary',
+)
 branch = ctx.branch()
 bheads = repo.branchheads(branch)
 # i18n: column positioning for "hg summary"
 m = _('branch: %s\n') % branch
 if d in status.added:
 status.added.remove(d)
 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
-labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
+labels = [
-(ui.label(_('%d added'), 'status.added'), status.added),
+(ui.label(_('%d modified'), 'status.modified'), status.modified),
-(ui.label(_('%d removed'), 'status.removed'), status.removed),
+(ui.label(_('%d added'), 'status.added'), status.added),
-(ui.label(_('%d renamed'), 'status.copied'), renamed),
+(ui.label(_('%d removed'), 'status.removed'), status.removed),
-(ui.label(_('%d copied'), 'status.copied'), copied),
+(ui.label(_('%d renamed'), 'status.copied'), renamed),
-(ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
+(ui.label(_('%d copied'), 'status.copied'), copied),
-(ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
+(ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
-(ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
+(ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
-(ui.label(_('%d subrepos'), 'status.modified'), subs)]
+(ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
+(ui.label(_('%d subrepos'), 'status.modified'), subs),
+]
 t = []
 for l, s in labels:
 if s:
 t.append(l % len(s))
 t += _(' (interrupted update)')
 elif len(parents) > 1:
 t += _(' (merge)')
 elif branch != parents[0].branch():
 t += _(' (new branch)')
-elif (parents[0].closesbranch() and
+elif parents[0].closesbranch() and pnode in repo.branchheads(
-pnode in repo.branchheads(branch, closed=True)):
+branch, closed=True
+):
 t += _(' (head closed)')
-elif not (status.modified or status.added or status.removed or renamed or
+elif not (
-copied or subs):
+status.modified
+or status.added
+or status.removed
+or renamed
+or copied
+or subs
+):
 t += _(' (clean)')
 cleanworkdir = True
 elif pnode not in bheads:
 t += _(' (new branch head)')
 else:
 # i18n: column positioning for "hg summary"
 ui.write(_('commit: %s\n') % t.strip())
 # all ancestors of branch heads - all ancestors of parent = new csets
-new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
+new = len(
-bheads))
+repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
+)
 if new == 0:
 # i18n: column positioning for "hg summary"
 ui.status(_('update: (current)\n'))
 elif pnode not in bheads:
 # i18n: column positioning for "hg summary"
 ui.write(_('update: %d new changesets (update)\n') % new)
 else:
 # i18n: column positioning for "hg summary"
-ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
+ui.write(
-(new, len(bheads)))
+_('update: %d new changesets, %d branch heads (merge)\n')
+% (new, len(bheads))
+)
 t = []
 draft = len(repo.revs('draft()'))
 if draft:
 t.append(_('%d draft') % draft)
 if obsolete.isenabled(repo, obsolete.createmarkersopt):
 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
 numtrouble = len(repo.revs(trouble + "()"))
 # We write all the possibilities to ease translation
 troublemsg = {
 "orphan": _("orphan: %d changesets"),
 "contentdivergent": _("content-divergent: %d changesets"),
 "phasedivergent": _("phase-divergent: %d changesets"),
 }
 if numtrouble > 0:
 ui.status(troublemsg[trouble] % numtrouble + "\n")
 cmdutil.summaryhooks(ui, repo)
 elif sother is None:
 # there is no explicit destination peer, but source one is invalid
 return dest, dbranch, None, None
 else:
 dother = sother
-if (source != dest or (sbranch is not None and sbranch != dbranch)):
+if source != dest or (sbranch is not None and sbranch != dbranch):
 common = None
 else:
 common = commoninc
 if revs:
 revs = [repo.lookup(rev) for rev in revs]
 repo.ui.pushbuffer()
-outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
+outgoing = discovery.findcommonoutgoing(
-commoninc=common)
+repo, dother, onlyheads=revs, commoninc=common
+)
 repo.ui.popbuffer()
 return dest, dbranch, dother, outgoing
 if needsoutgoing:
 dest, dbranch, dother, outgoing = getoutgoing()
 ui.write(_('remote: %s\n') % (', '.join(t)))
 else:
 # i18n: column positioning for "hg summary"
 ui.status(_('remote: (synced)\n'))
-cmdutil.summaryremotehooks(ui, repo, opts,
+cmdutil.summaryremotehooks(
-((source, sbranch, sother, commoninc),
+ui,
-(dest, dbranch, dother, outgoing)))
+repo,
+opts,
-@command('tag',
+(
-[('f', 'force', None, _('force tag')),
+(source, sbranch, sother, commoninc),
-('l', 'local', None, _('make the tag local')),
+(dest, dbranch, dother, outgoing),
-('r', 'rev', '', _('revision to tag'), _('REV')),
+),
-('', 'remove', None, _('remove a tag')),
+)
-# -l/--local is already there, commitopts cannot be used
-('e', 'edit', None, _('invoke editor on commit messages')),
-('m', 'message', '', _('use text as commit message'), _('TEXT')),
+@command(
-] + commitopts2,
+'tag',
+[
+('f', 'force', None, _('force tag')),
+('l', 'local', None, _('make the tag local')),
+('r', 'rev', '', _('revision to tag'), _('REV')),
+('', 'remove', None, _('remove a tag')),
+# -l/--local is already there, commitopts cannot be used
+('e', 'edit', None, _('invoke editor on commit messages')),
+('m', 'message', '', _('use text as commit message'), _('TEXT')),
+]
++ commitopts2,
 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
-helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
+helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
+)
 def tag(ui, repo, name1, *names, **opts):
 """add one or more tags for the current or given revision
 Name a particular revision using <name>.
 if len(names) != len(set(names)):
 raise error.Abort(_('tag names must be unique'))
 for n in names:
 scmutil.checknewlabel(repo, n, 'tag')
 if not n:
-raise error.Abort(_('tag names cannot consist entirely of '
+raise error.Abort(
-'whitespace'))
+_('tag names cannot consist entirely of ' 'whitespace')
+)
 if opts.get('rev') and opts.get('remove'):
 raise error.Abort(_("--rev and --remove are incompatible"))
 if opts.get('rev'):
 rev_ = opts['rev']
 message = opts.get('message')
 # we don't translate commit messages
 message = 'Removed tag %s' % ', '.join(names)
 elif not opts.get('force'):
 for n in names:
 if n in repo.tags():
-raise error.Abort(_("tag '%s' already exists "
+raise error.Abort(
-"(use -f to force)") % n)
+_("tag '%s' already exists " "(use -f to force)") % n
+)
 if not opts.get('local'):
 p1, p2 = repo.dirstate.parents()
 if p2 != nullid:
 raise error.Abort(_('uncommitted merge'))
 bheads = repo.branchheads()
 if not opts.get('force') and bheads and p1 not in bheads:
-raise error.Abort(_('working directory is not at a branch head '
+raise error.Abort(
-'(use -f to force)'))
+_(
+'working directory is not at a branch head '
+'(use -f to force)'
+)
+)
 node = scmutil.revsingle(repo, rev_).node()
 if not message:
 # we don't translate commit messages
-message = ('Added tag %s for changeset %s' %
+message = 'Added tag %s for changeset %s' % (
-(', '.join(names), short(node)))
+', '.join(names),
+short(node),
+)
 date = opts.get('date')
 if date:
 date = dateutil.parsedate(date)
 if opts.get('remove'):
 editform = 'tag.remove'
 else:
 editform = 'tag.add'
-editor = cmdutil.getcommiteditor(editform=editform,
+editor = cmdutil.getcommiteditor(
-**pycompat.strkwargs(opts))
+editform=editform, **pycompat.strkwargs(opts)
+)
 # don't allow tagging the null rev
-if (not opts.get('remove') and
+if (
-scmutil.revsingle(repo, rev_).rev() == nullrev):
+not opts.get('remove')
+and scmutil.revsingle(repo, rev_).rev() == nullrev
+):
 raise error.Abort(_("cannot tag null revision"))
-tagsmod.tag(repo, names, node, message, opts.get('local'),
+tagsmod.tag(
-opts.get('user'), date, editor=editor)
+repo,
+names,
+node,
+message,
+opts.get('local'),
+opts.get('user'),
+date,
+editor=editor,
+)
 @command(
-'tags', formatteropts, '',
+'tags',
+formatteropts,
+'',
 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
-intents={INTENT_READONLY})
+intents={INTENT_READONLY},
+)
 def tags(ui, repo, **opts):
 """list repository tags
 This lists both regular and local tags. When the -v/--verbose
 switch is used, a third column "local" is printed for local tags.
 fm.startitem()
 fm.context(repo=repo)
 fm.write('tag', '%s', t, label=label)
 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
-fm.condwrite(not ui.quiet, 'rev node', fmt,
+fm.condwrite(
-repo.changelog.rev(n), hn, label=label)
+not ui.quiet,
-fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
+'rev node',
-tagtype, label=label)
+fmt,
+repo.changelog.rev(n),
+hn,
+label=label,
+)
+fm.condwrite(
+ui.verbose and tagtype, 'type', ' %s', tagtype, label=label
+)
 fm.plain('\n')
 fm.end()
-@command('tip',
-[('p', 'patch', None, _('show patch')),
+@command(
-('g', 'git', None, _('use git extended diff format')),
+'tip',
-] + templateopts,
+[
+('p', 'patch', None, _('show patch')),
+('g', 'git', None, _('use git extended diff format')),
+]
++ templateopts,
 _('[-p] [-g]'),
-helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
+helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
+)
 def tip(ui, repo, **opts):
 """show the tip revision (DEPRECATED)
 The tip revision (usually just called the tip) is the changeset
 most recently added to the repository (and therefore the most
 opts = pycompat.byteskwargs(opts)
 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
 displayer.show(repo['tip'])
 displayer.close()
-@command('unbundle',
-[('u', 'update', None,
+@command(
-_('update to new branch head if changesets were unbundled'))],
+'unbundle',
+[
+(
+'u',
+'update',
+None,
+_('update to new branch head if changesets were unbundled'),
+)
+],
 _('[-u] FILE...'),
-helpcategory=command.CATEGORY_IMPORT_EXPORT)
+helpcategory=command.CATEGORY_IMPORT_EXPORT,
+)
 def unbundle(ui, repo, fname1, *fnames, **opts):
 """apply one or more bundle files
 Apply one or more bundle files generated by :hg:`bundle`.
 for fname in fnames:
 f = hg.openpath(ui, fname)
 gen = exchange.readbundle(ui, f, fname)
 if isinstance(gen, streamclone.streamcloneapplier):
 raise error.Abort(
-_('packed bundles cannot be applied with '
+_('packed bundles cannot be applied with ' '"hg unbundle"'),
-'"hg unbundle"'),
+hint=_('use "hg debugapplystreamclonebundle"'),
-hint=_('use "hg debugapplystreamclonebundle"'))
+)
 url = 'bundle:' + fname
 try:
 txnname = 'unbundle'
 if not isinstance(gen, bundle2.unbundle20):
 txnname = 'unbundle\n%s' % util.hidepassword(url)
 with repo.transaction(txnname) as tr:
-op = bundle2.applybundle(repo, gen, tr, source='unbundle',
+op = bundle2.applybundle(
-url=url)
+repo, gen, tr, source='unbundle', url=url
+)
 except error.BundleUnknownFeatureError as exc:
 raise error.Abort(
 _('%s: unknown bundle feature, %s') % (fname, exc),
-hint=_("see https://mercurial-scm.org/"
+hint=_(
-"wiki/BundleFeature for more "
+"see https://mercurial-scm.org/"
-"information"))
+"wiki/BundleFeature for more "
+"information"
+),
+)
 modheads = bundle2.combinechangegroupresults(op)
 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
-@command('unshelve',
-[('a', 'abort', None,
+@command(
-_('abort an incomplete unshelve operation')),
+'unshelve',
-('c', 'continue', None,
+[
-_('continue an incomplete unshelve operation')),
+('a', 'abort', None, _('abort an incomplete unshelve operation')),
-('i', 'interactive', None,
+('c', 'continue', None, _('continue an incomplete unshelve operation')),
-_('use interactive mode (EXPERIMENTAL)')),
+('i', 'interactive', None, _('use interactive mode (EXPERIMENTAL)')),
-('k', 'keep', None,
+('k', 'keep', None, _('keep shelve after unshelving')),
-_('keep shelve after unshelving')),
+(
-('n', 'name', '',
+'n',
-_('restore shelved change with given name'), _('NAME')),
+'name',
-('t', 'tool', '', _('specify merge tool')),
+'',
-('', 'date', '',
+_('restore shelved change with given name'),
-_('set date for temporary commits (DEPRECATED)'), _('DATE'))],
+_('NAME'),
-_('hg unshelve [OPTION]... [FILE]... [-n SHELVED]'),
+),
-helpcategory=command.CATEGORY_WORKING_DIRECTORY)
+('t', 'tool', '', _('specify merge tool')),
+(
+'',
+'date',
+'',
+_('set date for temporary commits (DEPRECATED)'),
+_('DATE'),
+),
+],
+_('hg unshelve [OPTION]... [FILE]... [-n SHELVED]'),
+helpcategory=command.CATEGORY_WORKING_DIRECTORY,
+)
 def unshelve(ui, repo, *shelved, **opts):
 """restore a shelved change to the working directory
 This command accepts an optional name of a shelved change to
 restore. If none is given, the most recent shelved change is used.
 unshelved.
 """
 with repo.wlock():
 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
 statemod.addunfinished(
-'unshelve', fname='shelvedstate', continueflag=True,
+'unshelve',
+fname='shelvedstate',
+continueflag=True,
 abortfunc=shelvemod.hgabortunshelve,
 continuefunc=shelvemod.hgcontinueunshelve,
 cmdmsg=_('unshelve already in progress'),
 )
-@command('update|up|checkout|co',
-[('C', 'clean', None, _('discard uncommitted changes (no backup)')),
+@command(
-('c', 'check', None, _('require clean working directory')),
+'update|up|checkout|co',
-('m', 'merge', None, _('merge uncommitted changes')),
+[
-('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
+('C', 'clean', None, _('discard uncommitted changes (no backup)')),
-('r', 'rev', '', _('revision'), _('REV'))
+('c', 'check', None, _('require clean working directory')),
-] + mergetoolopts,
+('m', 'merge', None, _('merge uncommitted changes')),
+('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
+('r', 'rev', '', _('revision'), _('REV')),
+]
++ mergetoolopts,
 _('[-C|-c|-m] [-d DATE] [[-r] REV]'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
-helpbasic=True)
+helpbasic=True,
+)
 def update(ui, repo, node=None, **opts):
 """update working directory (or switch revisions)
 Update the repository's working directory to the specified
 changeset. If no changeset is specified, update to the tip of the
 if rev and node:
 raise error.Abort(_("please specify just one revision"))
 if ui.configbool('commands', 'update.requiredest'):
 if not node and not rev and not date:
-raise error.Abort(_('you must specify a destination'),
+raise error.Abort(
-hint=_('for example: hg update ".::"'))
+_('you must specify a destination'),
+hint=_('for example: hg update ".::"'),
+)
 if rev is None or rev == '':
 rev = node
 if date and rev is not None:
 raise error.Abort(_("you can't specify a revision and a date"))
 if len([x for x in (clean, check, merge) if x]) > 1:
-raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
+raise error.Abort(
-"or -m/--merge"))
+_(
+"can only specify one of -C/--clean, -c/--check, "
+"or -m/--merge"
+)
+)
 updatecheck = None
 if check:
 updatecheck = 'abort'
 elif merge:
 ctx = scmutil.revsingle(repo, rev, default=None)
 rev = ctx.rev()
 hidden = ctx.hidden()
 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
 with ui.configoverride(overrides, 'update'):
-ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
+ret = hg.updatetotally(
-updatecheck=updatecheck)
+ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
+)
 if hidden:
 ctxstr = ctx.hex()[:12]
 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
 if ctx.obsolete():
 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
 ui.warn("(%s)\n" % obsfatemsg)
 return ret
-@command('verify',
-[('', 'full', False, 'perform more checks (EXPERIMENTAL)')],
+@command(
-helpcategory=command.CATEGORY_MAINTENANCE)
+'verify',
+[('', 'full', False, 'perform more checks (EXPERIMENTAL)')],
+helpcategory=command.CATEGORY_MAINTENANCE,
+)
 def verify(ui, repo, **opts):
 """verify the integrity of the repository
 Verify the integrity of the current repository.
 level = None
 if opts['full']:
 level = verifymod.VERIFY_FULL
 return hg.verify(repo, level)
 @command(
-'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
+'version',
-norepo=True, intents={INTENT_READONLY})
+[] + formatteropts,
+helpcategory=command.CATEGORY_HELP,
+norepo=True,
+intents={INTENT_READONLY},
+)
 def version_(ui, **opts):
 """output version and copyright information
 .. container:: verbose
 opts = pycompat.byteskwargs(opts)
 if ui.verbose:
 ui.pager('version')
 fm = ui.formatter("version", opts)
 fm.startitem()
-fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
+fm.write(
-util.version())
+"ver", _("Mercurial Distributed SCM (version %s)\n"), util.version()
+)
 license = _(
 "(see https://mercurial-scm.org for more information)\n"
 "\nCopyright (C) 2005-2019 Matt Mackall and others\n"
 "This is free software; see the source for copying conditions. "
 "There is NO\nwarranty; "
 if ui.verbose:
 fn.plain("\n")
 fn.end()
 fm.end()
 def loadcmdtable(ui, name, cmdtable):
 """Load command functions from specified cmdtable
 """
 overrides = [cmd for cmd in cmdtable if cmd in table]
 if overrides:
-ui.warn(_("extension '%s' overrides commands: %s\n")
+ui.warn(
-% (name, " ".join(overrides)))
+_("extension '%s' overrides commands: %s\n")
+% (name, " ".join(overrides))
+)
 table.update(cmdtable)

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 43076:2372284d9457