mercurial-scm/hg: mercurial/cmdutil.py comparison

comparison mercurial/cmdutil.py @ 45942:89a2afe31e82

formating: upgrade to black 20.8b1 This required a couple of small tweaks to un-confuse black, but now it works. Big formatting changes come from: * Dramatically improved collection-splitting logic upstream * Black having a strong (correct IMO) opinion that """ is better than ''' Differential Revision: https://phab.mercurial-scm.org/D9430

author	Augie Fackler <raf@durin42.com>
date	Fri, 27 Nov 2020 17:03:29 -0500
parents	96ca817ec192
children	012e25abc603

comparison

equal deleted inserted replaced

-:346af7687c6f
+:89a2afe31e82
 return patch.filterpatch(ui, originalhunks, match, operation)
 def recordfilter(ui, originalhunks, match, operation=None):
-""" Prompts the user to filter the originalhunks and return a list of
+"""Prompts the user to filter the originalhunks and return a list of
 selected hunks.
 *operation* is used for to build ui messages to indicate the user what
 kind of filtering they are doing: reverting, committing, shelving, etc.
 (see patch.filterpatch).
 """
 return p
 def bailifchanged(repo, merge=True, hint=None):
-""" enforce the precondition that working directory must be clean.
+"""enforce the precondition that working directory must be clean.
 'merge' can be set to false if a pending uncommitted merge should be
 ignored (such as when 'update --check' runs).
 'hint' is the usual hint given to Abort exception.
 fntemplate=b'hg-%h.patch',
 switch_parent=False,
 opts=None,
 match=None,
 ):
-'''export changesets as hg patches
+"""export changesets as hg patches
 Args:
 repo: The repository from which we're exporting revisions.
 revs: A list of revisions to export as revision numbers.
 basefm: A formatter to which patches should be written.
 "HG Changeset Patch" data is emitted to one of the following
 destinations:
 fntemplate specified: Each rev is written to a unique file named using
 the given template.
 Otherwise: All revs will be written to basefm.
-'''
+"""
 _prefetchchangedfiles(repo, revs, match)
 if not fntemplate:
 _exportfile(
 repo, revs, basefm, b'<unnamed>', switch_parent, opts, match
 prefetch = scmutil.prefetchfiles
 matchfiles = scmutil.matchfiles(
 repo, [f for sublist in oplist for f in sublist]
 )
 prefetch(
-repo, [(ctx.rev(), matchfiles)],
+repo,
+[(ctx.rev(), matchfiles)],
 )
 match = scmutil.match(repo[None], pats)
 _performrevert(
 repo,
 ctx,
 #  - (desturl,   destbranch,   destpeer,   outgoing)
 summaryremotehooks = util.hooks()
 def checkunfinished(repo, commit=False, skipmerge=False):
-'''Look for an unfinished multistep operation, like graft, and abort
+"""Look for an unfinished multistep operation, like graft, and abort
 if found. It's probably good to check this right before
 bailifchanged().
-'''
+"""
 # Check for non-clearable states first, so things like rebase will take
 # precedence over update.
 for state in statemod._unfinishedstates:
 if (
 state._clearable
 if s.isunfinished(repo):
 raise error.StateError(s.msg(), hint=s.hint())
 def clearunfinished(repo):
-'''Check for unfinished operations (as above), and clear the ones
+"""Check for unfinished operations (as above), and clear the ones
 that are clearable.
-'''
+"""
 for state in statemod._unfinishedstates:
 if state._reportonly:
 continue
 if not state._clearable and state.isunfinished(repo):
 raise error.StateError(state.msg(), hint=state.hint())
 if s._clearable and s.isunfinished(repo):
 util.unlink(repo.vfs.join(s._fname))
 def getunfinishedstate(repo):
-''' Checks for unfinished operations and returns statecheck object
+"""Checks for unfinished operations and returns statecheck object
-for it'''
+for it"""
 for state in statemod._unfinishedstates:
 if state.isunfinished(repo):
 return state
 return None
 def howtocontinue(repo):
-'''Check for an unfinished operation and return the command to finish
+"""Check for an unfinished operation and return the command to finish
 it.
 statemod._unfinishedstates list is checked for an unfinished operation
 and the corresponding message to finish it is generated if a method to
 continue is supported by the operation.
 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
 a boolean.
-'''
+"""
 contmsg = _(b"continue: %s")
 for state in statemod._unfinishedstates:
 if not state._continueflag:
 continue
 if state.isunfinished(repo):
 return contmsg % _(b"hg commit"), False
 return None, None
 def checkafterresolved(repo):
-'''Inform the user about the next action after completing hg resolve
+"""Inform the user about the next action after completing hg resolve
 If there's a an unfinished operation that supports continue flag,
 howtocontinue will yield repo.ui.warn as the reporter.
 Otherwise, it will yield repo.ui.note.
-'''
+"""
 msg, warning = howtocontinue(repo)
 if msg is not None:
 if warning:
 repo.ui.warn(b"%s\n" % msg)
 else:
 repo.ui.note(b"%s\n" % msg)
 def wrongtooltocontinue(repo, task):
-'''Raise an abort suggesting how to properly continue if there is an
+"""Raise an abort suggesting how to properly continue if there is an
 active task.
 Uses howtocontinue() to find the active task.
 If there's no task (repo.ui.note for 'hg commit'), it does not offer
 a hint.
-'''
+"""
 after = howtocontinue(repo)
 hint = None
 if after[1]:
 hint = after[0]
 raise error.StateError(_(b'no %s in progress') % task, hint=hint)

Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 45942:89a2afe31e82