Mercurial: mercurial/dirstate.py comparison

comparison mercurial/dirstate.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	ad7006830106
children	0d055849d5f9 6266d19556ad

comparison

equal deleted inserted replaced

-:346af7687c6f
+:89a2afe31e82
 @interfaceutil.implementer(intdirstate.idirstate)
 class dirstate(object):
 def __init__(self, opener, ui, root, validate, sparsematchfn):
-'''Create a new dirstate object.
+"""Create a new dirstate object.
 opener is an open()-like callable that can be used to open the
 dirstate file; root is the root of the directory tracked by
 the dirstate.
-'''
+"""
 self._opener = opener
 self._validate = validate
 self._root = root
 self._sparsematchfn = sparsematchfn
 # ntpath.join(root, '') of Python 2.7.9 does not add sep if root is
 """
 self._pl
 @contextlib.contextmanager
 def parentchange(self):
-'''Context manager for handling dirstate parents.
+"""Context manager for handling dirstate parents.
 If an exception occurs in the scope of the context manager,
 the incoherent dirstate won't be written when wlock is
 released.
-'''
+"""
 self._parentwriters += 1
 yield
 # Typically we want the "undo" step of a context manager in a
 # finally block so it happens even when an exception
 # occurs. In this case, however, we only want to decrement
 # parentwriters if the code in the with statement exits
 # normally, so we don't have a try/finally here on purpose.
 self._parentwriters -= 1
 def pendingparentchange(self):
-'''Returns true if the dirstate is in the middle of a set of changes
+"""Returns true if the dirstate is in the middle of a set of changes
 that modify the dirstate parent.
-'''
+"""
 return self._parentwriters > 0
 @propertycache
 def _map(self):
 """Return the dirstate contents (see documentation for dirstatemap)."""
 if forcecwd:
 return forcecwd
 return encoding.getcwd()
 def getcwd(self):
-'''Return the path from which a canonical path is calculated.
+"""Return the path from which a canonical path is calculated.
 This path should be used to resolve file patterns or to convert
 canonical paths back to file paths for display. It shouldn't be
 used to get real file paths. Use vfs functions instead.
-'''
+"""
 cwd = self._cwd
 if cwd == self._root:
 return b''
 # self._root ends with a path separator if self._root is '/' or 'C:\'
 rootsep = self._root
 if self._slash:
 return util.pconvert(path)
 return path
 def __getitem__(self, key):
-'''Return the current state of key (a filename) in the dirstate.
+"""Return the current state of key (a filename) in the dirstate.
 States are:
 n  normal
 m  needs merging
 r  marked for removal
 a  marked for addition
 ?  not tracked
-'''
+"""
 return self._map.get(key, (b"?",))[0]
 def __contains__(self, key):
 return key in self._map
 except:  # re-raises
 f.discard()
 raise
 def invalidate(self):
-'''Causes the next access to reread the dirstate.
+"""Causes the next access to reread the dirstate.
 This is different from localrepo.invalidatedirstate() because it always
 rereads the dirstate. Use localrepo.invalidatedirstate() if you want to
-check whether the dirstate has changed before rereading it.'''
+check whether the dirstate has changed before rereading it."""
 for a in ("_map", "_branch", "_ignore"):
 if a in self.__dict__:
 delattr(self, a)
 self._lastnormaltime = 0
 self._dirty = True
 self._updatedfiles.add(f)
 self._map.addfile(f, oldstate, state, mode, size, mtime)
 def normal(self, f, parentfiledata=None):
-'''Mark a file normal and clean.
+"""Mark a file normal and clean.
 parentfiledata: (mode, size, mtime) of the clean file
 parentfiledata should be computed from memory (for mode,
 size), as or close as possible from the point where we
 determined the file was clean, to limit the risk of the
 file having been changed by an external process between the
-moment where the file was determined to be clean and now.'''
+moment where the file was determined to be clean and now."""
 if parentfiledata:
 (mode, size, mtime) = parentfiledata
 else:
 s = os.lstat(self._join(f))
 mode = s.st_mode
 path, normed, ignoremissing, exists, self._map.dirfoldmap
 )
 return folded
 def normalize(self, path, isknown=False, ignoremissing=False):
-'''
+"""
 normalize the case of a pathname when on a casefolding filesystem
 isknown specifies whether the filename came from walking the
 disk, to avoid extra filesystem access.
 The normalized case is determined based on the following precedence:
 - version of name already stored in the dirstate
 - version of name stored on disk
 - version provided via command arguments
-'''
+"""
 if self._checkcase:
 return self._normalize(path, isknown, ignoremissing)
 return path
 self.drop(f)
 self._dirty = True
 def identity(self):
-'''Return identity of dirstate itself to detect changing in storage
+"""Return identity of dirstate itself to detect changing in storage
 If identity of previous dirstate is equal to this, writing
 changes based on the former dirstate out can keep consistency.
-'''
+"""
 return self._map.identity
 def write(self, tr):
 if not self._dirty:
 return
 return (i, lineno, line)
 visited.add(i)
 return (None, -1, b"")
 def _walkexplicit(self, match, subrepos):
-'''Get stat data about the files explicitly specified by match.
+"""Get stat data about the files explicitly specified by match.
 Return a triple (results, dirsfound, dirsnotfound).
 - results is a mapping from filename to stat result. It also contains
 listings mapping subrepos and .hg to None.
 - dirsfound is a list of files found to be directories.
 - dirsnotfound is a list of files that the dirstate thinks are
-directories and that were not found.'''
+directories and that were not found."""
 def badtype(mode):
 kind = _(b'unknown')
 if stat.S_ISCHR(mode):
 kind = _(b'character device')
 results[path] = None
 return results, dirsfound, dirsnotfound
 def walk(self, match, subrepos, unknown, ignored, full=True):
-'''
+"""
 Walk recursively through the directory tree, finding all files
 matched by match.
 If full is False, maybe skip some known-clean files.
 Return a dict mapping filename to stat-like object (either
 mercurial.osutil.stat instance or return value of os.stat()).
-'''
+"""
 # full is a flag that extensions that hook into walk can use -- this
 # implementation doesn't use it at all. This satisfies the contract
 # because we only guarantee a "maybe".
 if ignored:
 clean=clean,
 )
 return (lookup, status)
 def status(self, match, subrepos, ignored, clean, unknown):
-'''Determine the status of the working copy relative to the
+"""Determine the status of the working copy relative to the
 dirstate and return a pair of (unsure, status), where status is of type
 scmutil.status and:
 unsure:
 files that might have been modified since the dirstate was
 files that have definitely been modified since the dirstate
 was written (different size or mode)
 status.clean:
 files that have definitely not been modified since the
 dirstate was written
-'''
+"""
 listignored, listclean, listunknown = ignored, clean, unknown
 lookup, modified, added, unknown, ignored = [], [], [], [], []
 removed, deleted, clean = [], [], []
 dmap = self._map
 modified, added, removed, deleted, unknown, ignored, clean
 )
 return (lookup, status)
 def matches(self, match):
-'''
+"""
 return files in the dirstate (in whatever state) filtered by match
-'''
+"""
 dmap = self._map
 if rustmod is not None:
 dmap = self._map._rustmap
 if match.always():

Mercurial > hg

comparison mercurial/dirstate.py @ 45942:89a2afe31e82