--- a/mercurial/manifest.py Sat Oct 05 10:29:34 2019 -0400
+++ b/mercurial/manifest.py Sun Oct 06 09:45:02 2019 -0400
@@ -38,6 +38,7 @@
# Allow tests to more easily test the alternate path in manifestdict.fastdelta()
FASTDELTA_TEXTDIFF_THRESHOLD = 1000
+
def _parse(data):
# This method does a little bit of excessive-looking
# precondition checking. This is so that the behavior of this
@@ -57,6 +58,7 @@
else:
yield f, bin(n), ''
+
def _text(it):
files = []
lines = []
@@ -69,6 +71,7 @@
_checkforbidden(files)
return ''.join(lines)
+
class lazymanifestiter(object):
def __init__(self, lm):
self.pos = 0
@@ -91,6 +94,7 @@
__next__ = next
+
class lazymanifestiterentries(object):
def __init__(self, lm):
self.lm = lm
@@ -108,23 +112,25 @@
self.pos += 1
return data
zeropos = data.find('\x00', pos)
- hashval = unhexlify(data, self.lm.extrainfo[self.pos],
- zeropos + 1, 40)
+ hashval = unhexlify(data, self.lm.extrainfo[self.pos], zeropos + 1, 40)
flags = self.lm._getflags(data, self.pos, zeropos)
self.pos += 1
return (data[pos:zeropos], hashval, flags)
__next__ = next
+
def unhexlify(data, extra, pos, length):
- s = bin(data[pos:pos + length])
+ s = bin(data[pos : pos + length])
if extra:
- s += chr(extra & 0xff)
+ s += chr(extra & 0xFF)
return s
+
def _cmp(a, b):
return (a > b) - (a < b)
+
class _lazymanifest(object):
"""A pure python manifest backed by a byte string. It is supplimented with
internal lists as it is modified, until it is compacted back to a pure byte
@@ -142,8 +148,15 @@
``extradata`` is a list of (key, hash, flags) for entries that were added or
modified since the manifest was created or compacted.
"""
- def __init__(self, data, positions=None, extrainfo=None, extradata=None,
- hasremovals=False):
+
+ def __init__(
+ self,
+ data,
+ positions=None,
+ extrainfo=None,
+ extradata=None,
+ hasremovals=False,
+ ):
if positions is None:
self.positions = self.findlines(data)
self.extrainfo = [0] * len(self.positions)
@@ -164,10 +177,10 @@
if pos == -1 or data[-1:] != '\n':
raise ValueError("Manifest did not end in a newline.")
positions = [0]
- prev = data[:data.find('\x00')]
+ prev = data[: data.find('\x00')]
while pos < len(data) - 1 and pos != -1:
positions.append(pos + 1)
- nexts = data[pos + 1:data.find('\x00', pos + 1)]
+ nexts = data[pos + 1 : data.find('\x00', pos + 1)]
if nexts < prev:
raise ValueError("Manifest lines not in sorted order.")
prev = nexts
@@ -185,7 +198,7 @@
def _getkey(self, pos):
if pos >= 0:
- return self.data[pos:self.data.find('\x00', pos + 1)]
+ return self.data[pos : self.data.find('\x00', pos + 1)]
return self.extradata[-pos - 1][0]
def bsearch(self, key):
@@ -193,7 +206,7 @@
last = len(self.positions) - 1
while first <= last:
- midpoint = (first + last)//2
+ midpoint = (first + last) // 2
nextpos = self.positions[midpoint]
candidate = self._getkey(nextpos)
r = _cmp(key, candidate)
@@ -213,7 +226,7 @@
last = len(self.positions) - 1
while first <= last:
- midpoint = (first + last)//2
+ midpoint = (first + last) // 2
nextpos = self.positions[midpoint]
candidate = self._getkey(nextpos)
r = _cmp(key, candidate)
@@ -259,12 +272,12 @@
if not found:
raise KeyError
cur = self.positions[needle]
- self.positions = self.positions[:needle] + self.positions[needle + 1:]
- self.extrainfo = self.extrainfo[:needle] + self.extrainfo[needle + 1:]
+ self.positions = self.positions[:needle] + self.positions[needle + 1 :]
+ self.extrainfo = self.extrainfo[:needle] + self.extrainfo[needle + 1 :]
if cur >= 0:
# This does NOT unsort the list as far as the search functions are
# concerned, as they only examine lines mapped by self.positions.
- self.data = self.data[:cur] + '\x00' + self.data[cur + 1:]
+ self.data = self.data[:cur] + '\x00' + self.data[cur + 1 :]
self.hasremovals = True
def __setitem__(self, key, value):
@@ -293,15 +306,24 @@
else:
# not found, put it in with extra positions
self.extradata.append((key, hashval, value[1]))
- self.positions = (self.positions[:needle] + [-len(self.extradata)]
- + self.positions[needle:])
- self.extrainfo = (self.extrainfo[:needle] + [0] +
- self.extrainfo[needle:])
+ self.positions = (
+ self.positions[:needle]
+ + [-len(self.extradata)]
+ + self.positions[needle:]
+ )
+ self.extrainfo = (
+ self.extrainfo[:needle] + [0] + self.extrainfo[needle:]
+ )
def copy(self):
# XXX call _compact like in C?
- return _lazymanifest(self.data, self.positions, self.extrainfo,
- self.extradata, self.hasremovals)
+ return _lazymanifest(
+ self.data,
+ self.positions,
+ self.extrainfo,
+ self.extradata,
+ self.hasremovals,
+ )
def _compact(self):
# hopefully not called TOO often
@@ -329,9 +351,11 @@
# overwritten first byte. Break out and find the end of the
# current good entry/entries if there is a removed file
# before the next position.
- if (self.hasremovals
- and self.data.find('\n\x00', cur,
- self.positions[i]) != -1):
+ if (
+ self.hasremovals
+ and self.data.find('\n\x00', cur, self.positions[i])
+ != -1
+ ):
break
offset += self.positions[i] - cur
@@ -403,11 +427,13 @@
c[f] = n, fl
return c
+
try:
_lazymanifest = parsers.lazymanifest
except AttributeError:
pass
+
@interfaceutil.implementer(repository.imanifestdict)
class manifestdict(object):
def __init__(self, data=''):
@@ -456,9 +482,11 @@
m2 = m2.matches(match)
return m1.filesnotin(m2)
diff = self.diff(m2)
- files = set(filepath
- for filepath, hashflags in diff.iteritems()
- if hashflags[1][0] is None)
+ files = set(
+ filepath
+ for filepath, hashflags in diff.iteritems()
+ if hashflags[1][0] is None
+ )
return files
@propertycache
@@ -475,8 +503,10 @@
'''Checks whether we can correctly and quickly iterate over matcher
files instead of over manifest files.'''
files = match.files()
- return (len(files) < 100 and (match.isexact() or
- (match.prefix() and all(fn in self for fn in files))))
+ return len(files) < 100 and (
+ match.isexact()
+ or (match.prefix() and all(fn in self for fn in files))
+ )
def walk(self, match):
'''Generates matching file names.
@@ -611,7 +641,8 @@
if start == end:
# item we want to delete was not found, error out
raise AssertionError(
- _("failed to remove %s from manifest") % f)
+ _("failed to remove %s from manifest") % f
+ )
l = ""
if dstart is not None and dstart <= start and dend >= start:
if dend < end:
@@ -634,10 +665,12 @@
# diff it.
arraytext = bytearray(self.text())
deltatext = mdiff.textdiff(
- util.buffer(base), util.buffer(arraytext))
+ util.buffer(base), util.buffer(arraytext)
+ )
return arraytext, deltatext
+
def _msearch(m, s, lo=0, hi=None):
'''return a tuple (start, end) that says where to find s within m.
@@ -647,10 +680,12 @@
m should be a buffer, a memoryview or a byte string.
s is a byte string'''
+
def advance(i, c):
- while i < lenm and m[i:i + 1] != c:
+ while i < lenm and m[i : i + 1] != c:
i += 1
return i
+
if not s:
return (lo, lo)
lenm = len(m)
@@ -659,7 +694,7 @@
while lo < hi:
mid = (lo + hi) // 2
start = mid
- while start > 0 and m[start - 1:start] != '\n':
+ while start > 0 and m[start - 1 : start] != '\n':
start -= 1
end = advance(start, '\0')
if bytes(m[start:end]) < s:
@@ -678,13 +713,15 @@
else:
return (lo, lo)
+
def _checkforbidden(l):
"""Check filenames for illegal characters."""
for f in l:
if '\n' in f or '\r' in f:
raise error.StorageError(
_("'\\n' and '\\r' disallowed in filenames: %r")
- % pycompat.bytestr(f))
+ % pycompat.bytestr(f)
+ )
# apply the changes collected during the bisect loop to our addlist
@@ -704,10 +741,13 @@
newaddlist += addlist[currentposition:]
- deltatext = "".join(struct.pack(">lll", start, end, len(content))
- + content for start, end, content in x)
+ deltatext = "".join(
+ struct.pack(">lll", start, end, len(content)) + content
+ for start, end, content in x
+ )
return deltatext, newaddlist
+
def _splittopdir(f):
if '/' in f:
dir, subpath = f.split('/', 1)
@@ -715,8 +755,10 @@
else:
return '', f
+
_noop = lambda s: None
+
class treemanifest(object):
def __init__(self, dir='', text=''):
self._dir = dir
@@ -730,11 +772,14 @@
self._files = {}
self._flags = {}
if text:
+
def readsubtree(subdir, subm):
- raise AssertionError('treemanifest constructor only accepts '
- 'flat manifests')
+ raise AssertionError(
+ 'treemanifest constructor only accepts ' 'flat manifests'
+ )
+
self.parse(text, readsubtree)
- self._dirty = True # Mark flat manifest dirty after parsing
+ self._dirty = True # Mark flat manifest dirty after parsing
def _subpath(self, path):
return self._dir + path
@@ -807,20 +852,23 @@
__bool__ = __nonzero__
def _isempty(self):
- self._load() # for consistency; already loaded by all callers
+ self._load() # for consistency; already loaded by all callers
# See if we can skip loading everything.
- if self._files or (self._dirs and
- any(not m._isempty() for m in self._dirs.values())):
+ if self._files or (
+ self._dirs and any(not m._isempty() for m in self._dirs.values())
+ ):
return False
self._loadalllazy()
- return (not self._dirs or
- all(m._isempty() for m in self._dirs.values()))
+ return not self._dirs or all(m._isempty() for m in self._dirs.values())
def __repr__(self):
- return ('<treemanifest dir=%s, node=%s, loaded=%s, dirty=%s at 0x%x>' %
- (self._dir, hex(self._node),
- bool(self._loadfunc is _noop),
- self._dirty, id(self)))
+ return '<treemanifest dir=%s, node=%s, loaded=%s, dirty=%s at 0x%x>' % (
+ self._dir,
+ hex(self._node),
+ bool(self._loadfunc is _noop),
+ self._dirty,
+ id(self),
+ )
def dir(self):
'''The directory that this tree manifest represents, including a
@@ -841,8 +889,9 @@
def iterentries(self):
self._load()
self._loadalllazy()
- for p, n in sorted(itertools.chain(self._dirs.items(),
- self._files.items())):
+ for p, n in sorted(
+ itertools.chain(self._dirs.items(), self._files.items())
+ ):
if p in self._files:
yield self._subpath(p), n, self._flags.get(p, '')
else:
@@ -852,8 +901,9 @@
def items(self):
self._load()
self._loadalllazy()
- for p, n in sorted(itertools.chain(self._dirs.items(),
- self._files.items())):
+ for p, n in sorted(
+ itertools.chain(self._dirs.items(), self._files.items())
+ ):
if p in self._files:
yield self._subpath(p), n
else:
@@ -965,7 +1015,7 @@
self._dirs[dir] = treemanifest(self._subpath(dir))
self._dirs[dir].__setitem__(subpath, n)
else:
- self._files[f] = n[:21] # to match manifestdict's behavior
+ self._files[f] = n[:21] # to match manifestdict's behavior
self._dirty = True
def _load(self):
@@ -994,15 +1044,19 @@
copy._node = self._node
copy._dirty = self._dirty
if self._copyfunc is _noop:
+
def _copyfunc(s):
self._load()
- s._lazydirs = {d: (p, n, r, True) for
- d, (p, n, r, c) in self._lazydirs.iteritems()}
+ s._lazydirs = {
+ d: (p, n, r, True)
+ for d, (p, n, r, c) in self._lazydirs.iteritems()
+ }
sdirs = s._dirs
for d, v in self._dirs.iteritems():
sdirs[d] = v.copy()
s._files = dict.copy(self._files)
s._flags = dict.copy(self._flags)
+
if self._loadfunc is _noop:
_copyfunc(copy)
else:
@@ -1019,6 +1073,7 @@
return m1.filesnotin(m2)
files = set()
+
def _filesnotin(t1, t2):
if t1._node == t2._node and not t1._dirty and not t2._dirty:
return
@@ -1261,13 +1316,15 @@
def _load_for_read(s):
s.parse(gettext(), readsubtree)
s._dirty = False
+
self._loadfunc = _load_for_read
def writesubtrees(self, m1, m2, writesubtree, match):
- self._load() # for consistency; should never have any effect here
+ self._load() # for consistency; should never have any effect here
m1._load()
m2._load()
emptytree = treemanifest()
+
def getnode(m, d):
ld = m._lazydirs.get(d)
if ld:
@@ -1306,6 +1363,7 @@
for subtree in subm.walksubtrees(matcher=matcher):
yield subtree
+
class manifestfulltextcache(util.lrucachedict):
"""File-backed LRU cache for the manifest cache
@@ -1356,8 +1414,9 @@
if not self._dirty or self._opener is None:
return
# rotate backwards to the first used node
- with self._opener(self._file, 'w', atomictemp=True, checkambig=True
- ) as fp:
+ with self._opener(
+ self._file, 'w', atomictemp=True, checkambig=True
+ ) as fp:
node = self._head.prev
while True:
if node.key in self._cache:
@@ -1417,17 +1476,26 @@
self.write()
self._read = False
+
# and upper bound of what we expect from compression
# (real live value seems to be "3")
MAXCOMPRESSION = 3
+
@interfaceutil.implementer(repository.imanifeststorage)
class manifestrevlog(object):
'''A revlog that stores manifest texts. This is responsible for caching the
full-text manifest contents.
'''
- def __init__(self, opener, tree='', dirlogcache=None, indexfile=None,
- treemanifest=False):
+
+ def __init__(
+ self,
+ opener,
+ tree='',
+ dirlogcache=None,
+ indexfile=None,
+ treemanifest=False,
+ ):
"""Constructs a new manifest revlog
`indexfile` - used by extensions to have two manifests at once, like
@@ -1468,11 +1536,14 @@
else:
self._dirlogcache = {'': self}
- self._revlog = revlog.revlog(opener, indexfile,
- # only root indexfile is cached
- checkambig=not bool(tree),
- mmaplargeindex=True,
- upperboundcomp=MAXCOMPRESSION)
+ self._revlog = revlog.revlog(
+ opener,
+ indexfile,
+ # only root indexfile is cached
+ checkambig=not bool(tree),
+ mmaplargeindex=True,
+ upperboundcomp=MAXCOMPRESSION,
+ )
self.index = self._revlog.index
self.version = self._revlog.version
@@ -1515,14 +1586,24 @@
if d:
assert self._treeondisk
if d not in self._dirlogcache:
- mfrevlog = manifestrevlog(self.opener, d,
- self._dirlogcache,
- treemanifest=self._treeondisk)
+ mfrevlog = manifestrevlog(
+ self.opener, d, self._dirlogcache, treemanifest=self._treeondisk
+ )
self._dirlogcache[d] = mfrevlog
return self._dirlogcache[d]
- def add(self, m, transaction, link, p1, p2, added, removed, readtree=None,
- match=None):
+ def add(
+ self,
+ m,
+ transaction,
+ link,
+ p1,
+ p2,
+ added,
+ removed,
+ readtree=None,
+ match=None,
+ ):
if p1 in self.fulltextcache and util.safehasattr(m, 'fastdelta'):
# If our first parent is in the manifest cache, we can
# compute a delta here using properties we know about the
@@ -1531,14 +1612,17 @@
_checkforbidden(added)
# combine the changed lists into one sorted iterator
- work = heapq.merge([(x, False) for x in sorted(added)],
- [(x, True) for x in sorted(removed)])
+ work = heapq.merge(
+ [(x, False) for x in sorted(added)],
+ [(x, True) for x in sorted(removed)],
+ )
arraytext, deltatext = m.fastdelta(self.fulltextcache[p1], work)
cachedelta = self._revlog.rev(p1), deltatext
text = util.buffer(arraytext)
- n = self._revlog.addrevision(text, transaction, link, p1, p2,
- cachedelta)
+ n = self._revlog.addrevision(
+ text, transaction, link, p1, p2, cachedelta
+ )
else:
# The first parent manifest isn't already loaded, so we'll
# just encode a fulltext of the manifest and pass that
@@ -1549,8 +1633,9 @@
assert match, "match must be specified for treemanifest writes"
m1 = readtree(self.tree, p1)
m2 = readtree(self.tree, p2)
- n = self._addtree(m, transaction, link, m1, m2, readtree,
- match=match)
+ n = self._addtree(
+ m, transaction, link, m1, m2, readtree, match=match
+ )
arraytext = None
else:
text = m.text()
@@ -1565,13 +1650,23 @@
def _addtree(self, m, transaction, link, m1, m2, readtree, match):
# If the manifest is unchanged compared to one parent,
# don't write a new revision
- if self.tree != '' and (m.unmodifiedsince(m1) or m.unmodifiedsince(
- m2)):
+ if self.tree != '' and (m.unmodifiedsince(m1) or m.unmodifiedsince(m2)):
return m.node()
+
def writesubtree(subm, subp1, subp2, match):
sublog = self.dirlog(subm.dir())
- sublog.add(subm, transaction, link, subp1, subp2, None, None,
- readtree=readtree, match=match)
+ sublog.add(
+ subm,
+ transaction,
+ link,
+ subp1,
+ subp2,
+ None,
+ None,
+ readtree=readtree,
+ match=match,
+ )
+
m.writesubtrees(m1, m2, writesubtree, match)
text = m.dirtext()
n = None
@@ -1583,8 +1678,9 @@
n = m2.node()
if not n:
- n = self._revlog.addrevision(text, transaction, link, m1.node(),
- m2.node())
+ n = self._revlog.addrevision(
+ text, transaction, link, m1.node(), m2.node()
+ )
# Save nodeid so parent manifest can calculate its nodeid
m.setnode(n)
@@ -1632,17 +1728,26 @@
def deltaparent(self, rev):
return self._revlog.deltaparent(rev)
- def emitrevisions(self, nodes, nodesorder=None,
- revisiondata=False, assumehaveparentrevisions=False,
- deltamode=repository.CG_DELTAMODE_STD):
+ def emitrevisions(
+ self,
+ nodes,
+ nodesorder=None,
+ revisiondata=False,
+ assumehaveparentrevisions=False,
+ deltamode=repository.CG_DELTAMODE_STD,
+ ):
return self._revlog.emitrevisions(
- nodes, nodesorder=nodesorder, revisiondata=revisiondata,
+ nodes,
+ nodesorder=nodesorder,
+ revisiondata=revisiondata,
assumehaveparentrevisions=assumehaveparentrevisions,
- deltamode=deltamode)
+ deltamode=deltamode,
+ )
def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None):
- return self._revlog.addgroup(deltas, linkmapper, transaction,
- addrevisioncb=addrevisioncb)
+ return self._revlog.addgroup(
+ deltas, linkmapper, transaction, addrevisioncb=addrevisioncb
+ )
def rawsize(self, rev):
return self._revlog.rawsize(rev)
@@ -1662,13 +1767,21 @@
return self._revlog.clone(tr, destrevlog._revlog, **kwargs)
- def storageinfo(self, exclusivefiles=False, sharedfiles=False,
- revisionscount=False, trackedsize=False,
- storedsize=False):
+ def storageinfo(
+ self,
+ exclusivefiles=False,
+ sharedfiles=False,
+ revisionscount=False,
+ trackedsize=False,
+ storedsize=False,
+ ):
return self._revlog.storageinfo(
- exclusivefiles=exclusivefiles, sharedfiles=sharedfiles,
- revisionscount=revisionscount, trackedsize=trackedsize,
- storedsize=storedsize)
+ exclusivefiles=exclusivefiles,
+ sharedfiles=sharedfiles,
+ revisionscount=revisionscount,
+ trackedsize=trackedsize,
+ storedsize=storedsize,
+ )
@property
def indexfile(self):
@@ -1686,6 +1799,7 @@
def opener(self, value):
self._revlog.opener = value
+
@interfaceutil.implementer(repository.imanifestlog)
class manifestlog(object):
"""A collection class representing the collection of manifest snapshots
@@ -1695,6 +1809,7 @@
of the list of files in the given commit. Consumers of the output of this
class do not care about the implementation details of the actual manifests
they receive (i.e. tree or flat or lazily loaded, etc)."""
+
def __init__(self, opener, repo, rootstore, narrowmatch):
usetreemanifest = False
cachesize = 4
@@ -1745,8 +1860,12 @@
m = treemanifestctx(self, tree, node)
else:
raise error.Abort(
- _("cannot ask for manifest directory '%s' in a flat "
- "manifest") % tree)
+ _(
+ "cannot ask for manifest directory '%s' in a flat "
+ "manifest"
+ )
+ % tree
+ )
else:
if verify:
# Side-effect is LookupError is raised if node doesn't exist.
@@ -1775,6 +1894,7 @@
def rev(self, node):
return self._rootstore.rev(node)
+
@interfaceutil.implementer(repository.imanifestrevisionwritable)
class memmanifestctx(object):
def __init__(self, manifestlog):
@@ -1796,14 +1916,24 @@
return self._manifestdict
def write(self, transaction, link, p1, p2, added, removed, match=None):
- return self._storage().add(self._manifestdict, transaction, link,
- p1, p2, added, removed, match=match)
+ return self._storage().add(
+ self._manifestdict,
+ transaction,
+ link,
+ p1,
+ p2,
+ added,
+ removed,
+ match=match,
+ )
+
@interfaceutil.implementer(repository.imanifestrevisionstored)
class manifestctx(object):
"""A class representing a single revision of a manifest, including its
contents, its parent revs, and its linkrev.
"""
+
def __init__(self, manifestlog, node):
self._manifestlog = manifestlog
self._data = None
@@ -1813,9 +1943,9 @@
# TODO: We eventually want p1, p2, and linkrev exposed on this class,
# but let's add it later when something needs it and we can load it
# lazily.
- #self.p1, self.p2 = store.parents(node)
- #rev = store.rev(node)
- #self.linkrev = store.linkrev(rev)
+ # self.p1, self.p2 = store.parents(node)
+ # rev = store.rev(node)
+ # self.linkrev = store.linkrev(rev)
def _storage(self):
return self._manifestlog.getstorage(b'')
@@ -1879,6 +2009,7 @@
def find(self, key):
return self.read().find(key)
+
@interfaceutil.implementer(repository.imanifestrevisionwritable)
class memtreemanifestctx(object):
def __init__(self, manifestlog, dir=''):
@@ -1903,9 +2034,19 @@
def write(self, transaction, link, p1, p2, added, removed, match=None):
def readtree(dir, node):
return self._manifestlog.get(dir, node).read()
- return self._storage().add(self._treemanifest, transaction, link,
- p1, p2, added, removed, readtree=readtree,
- match=match)
+
+ return self._storage().add(
+ self._treemanifest,
+ transaction,
+ link,
+ p1,
+ p2,
+ added,
+ removed,
+ readtree=readtree,
+ match=match,
+ )
+
@interfaceutil.implementer(repository.imanifestrevisionstored)
class treemanifestctx(object):
@@ -1919,9 +2060,9 @@
# TODO: Load p1/p2/linkrev lazily. They need to be lazily loaded so that
# we can instantiate treemanifestctx objects for directories we don't
# have on disk.
- #self.p1, self.p2 = store.parents(node)
- #rev = store.rev(node)
- #self.linkrev = store.linkrev(rev)
+ # self.p1, self.p2 = store.parents(node)
+ # rev = store.rev(node)
+ # self.linkrev = store.linkrev(rev)
def _storage(self):
narrowmatch = self._manifestlog._narrowmatch
@@ -1938,12 +2079,15 @@
# TODO accessing non-public API
elif store._treeondisk:
m = treemanifest(dir=self._dir)
+
def gettext():
return store.revision(self._node)
+
def readsubtree(dir, subm):
# Set verify to False since we need to be able to create
# subtrees for trees that don't exist on disk.
return self._manifestlog.get(dir, subm, verify=False).read()
+
m.read(gettext, readsubtree)
m.setnode(self._node)
self._data = m
@@ -2013,8 +2157,7 @@
store = self._storage()
r = store.rev(self._node)
deltaparent = store.deltaparent(r)
- if (deltaparent != nullrev and
- deltaparent in store.parentrevs(r)):
+ if deltaparent != nullrev and deltaparent in store.parentrevs(r):
return self.readdelta(shallow=shallow)
if shallow:
@@ -2025,6 +2168,7 @@
def find(self, key):
return self.read().find(key)
+
class excludeddir(treemanifest):
"""Stand-in for a directory that is excluded from the repository.
@@ -2036,6 +2180,7 @@
class is: it stands in for a directory whose node is known, but
whose contents are unknown.
"""
+
def __init__(self, dir, node):
super(excludeddir, self).__init__(dir)
self._node = node
@@ -2052,8 +2197,10 @@
def copy(self):
return self
+
class excludeddirmanifestctx(treemanifestctx):
"""context wrapper for excludeddir - see that docstring for rationale"""
+
def __init__(self, dir, node):
self._dir = dir
self._node = node
@@ -2063,7 +2210,9 @@
def write(self, *args):
raise error.ProgrammingError(
- 'attempt to write manifest from excluded dir %s' % self._dir)
+ 'attempt to write manifest from excluded dir %s' % self._dir
+ )
+
class excludedmanifestrevlog(manifestrevlog):
"""Stand-in for excluded treemanifest revlogs.
@@ -2080,19 +2229,23 @@
def __len__(self):
raise error.ProgrammingError(
- 'attempt to get length of excluded dir %s' % self._dir)
+ 'attempt to get length of excluded dir %s' % self._dir
+ )
def rev(self, node):
raise error.ProgrammingError(
- 'attempt to get rev from excluded dir %s' % self._dir)
+ 'attempt to get rev from excluded dir %s' % self._dir
+ )
def linkrev(self, node):
raise error.ProgrammingError(
- 'attempt to get linkrev from excluded dir %s' % self._dir)
+ 'attempt to get linkrev from excluded dir %s' % self._dir
+ )
def node(self, rev):
raise error.ProgrammingError(
- 'attempt to get node from excluded dir %s' % self._dir)
+ 'attempt to get node from excluded dir %s' % self._dir
+ )
def add(self, *args, **kwargs):
# We should never write entries in dirlogs outside the narrow clone.