D4606: narrow: when writing treemanifests, skip inspecting directories outside narrow
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Mon Sep 17 14:32:12 EDT 2018
spectral updated this revision to Diff 11112.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4606?vs=11095&id=11112
REVISION DETAIL
https://phab.mercurial-scm.org/D4606
AFFECTED FILES
mercurial/localrepo.py
mercurial/manifest.py
mercurial/repository.py
CHANGE DETAILS
diff --git a/mercurial/repository.py b/mercurial/repository.py
--- a/mercurial/repository.py
+++ b/mercurial/repository.py
@@ -978,13 +978,18 @@
class imanifestrevisionwritable(imanifestrevisionbase):
"""Interface representing a manifest revision that can be committed."""
- def write(transaction, linkrev, p1node, p2node, added, removed):
+ def write(transaction, linkrev, p1node, p2node, added, removed, match=None):
"""Add this revision to storage.
Takes a transaction object, the changeset revision number it will
be associated with, its parent nodes, and lists of added and
removed paths.
+ If match is provided, storage can choose not to inspect or write out
+ items that do not match. Storage is still required to be able to provide
+ the full manifest in the future for any directories written (these
+ manifests should not be "narrowed on disk").
+
Returns the binary node of the created revision.
"""
@@ -1141,7 +1146,8 @@
def dirlog(d):
"""Obtain a manifest storage instance for a tree."""
- def add(m, transaction, link, p1, p2, added, removed, readtree=None):
+ def add(m, transaction, link, p1, p2, added, removed, readtree=None,
+ match=None):
"""Add a revision to storage.
``m`` is an object conforming to ``imanifestdict``.
@@ -1152,6 +1158,11 @@
``added`` and ``removed`` are iterables of added and removed paths,
respectively.
+
+ ``match`` is a matcher that can be used to hint to storage that not all
+ paths must be inspected; this is an optimization and can be safely
+ ignored. Note that the storage must still be able to reproduce a full
+ manifest including files that did not match.
"""
class imanifestlog(interfaceutil.Interface):
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -1203,7 +1203,7 @@
s._dirty = False
self._loadfunc = _load_for_read
- def writesubtrees(self, m1, m2, writesubtree):
+ def writesubtrees(self, m1, m2, writesubtree, match=None):
self._load() # for consistency; should never have any effect here
m1._load()
m2._load()
@@ -1214,12 +1214,21 @@
return ld[1]
return m._dirs.get(d, emptytree)._node
+ # we should have always loaded everything by the time we get here for
+ # `self`, but possibly not in `m1` or `m2`.
+ assert not self._lazydirs
+ # let's skip investigating things that `match` says we do not need.
+ visit = match.visitchildrenset(self._dir[:-1] or '.')
+ if visit == 'this' or visit == 'all':
+ visit = None
for d, subm in self._dirs.iteritems():
+ if visit and d[:-1] not in visit:
+ continue
subp1 = getnode(m1, d)
subp2 = getnode(m2, d)
if subp1 == nullid:
subp1, subp2 = subp2, subp1
- writesubtree(subm, subp1, subp2)
+ writesubtree(subm, subp1, subp2, match=match)
def walksubtrees(self, matcher=None):
"""Returns an iterator of the subtrees of this manifest, including this
@@ -1445,7 +1454,8 @@
self._dirlogcache[d] = mfrevlog
return self._dirlogcache[d]
- def add(self, m, transaction, link, p1, p2, added, removed, readtree=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
@@ -1471,7 +1481,8 @@
assert readtree, "readtree must be set for treemanifest writes"
m1 = readtree(self.tree, p1)
m2 = readtree(self.tree, p2)
- n = self._addtree(m, transaction, link, m1, m2, readtree)
+ n = self._addtree(m, transaction, link, m1, m2, readtree,
+ match=match)
arraytext = None
else:
text = m.text()
@@ -1483,17 +1494,17 @@
return n
- def _addtree(self, m, transaction, link, m1, m2, readtree):
+ 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)):
return m.node()
- def writesubtree(subm, subp1, subp2):
+ def writesubtree(subm, subp1, subp2, match):
sublog = self.dirlog(subm.dir())
sublog.add(subm, transaction, link, subp1, subp2, None, None,
- readtree=readtree)
- m.writesubtrees(m1, m2, writesubtree)
+ readtree=readtree, match=match)
+ m.writesubtrees(m1, m2, writesubtree, match=match)
text = m.dirtext()
n = None
if self.tree != '':
@@ -1697,9 +1708,9 @@
def read(self):
return self._manifestdict
- def write(self, transaction, link, p1, p2, added, removed):
+ def write(self, transaction, link, p1, p2, added, removed, match=None):
return self._storage().add(self._manifestdict, transaction, link,
- p1, p2, added, removed)
+ p1, p2, added, removed, match=match)
@interfaceutil.implementer(repository.imanifestrevisionstored)
class manifestctx(object):
@@ -1802,11 +1813,12 @@
def read(self):
return self._treemanifest
- def write(self, transaction, link, p1, p2, added, removed):
+ 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)
+ p1, p2, added, removed, readtree=readtree,
+ match=match)
@interfaceutil.implementer(repository.imanifestrevisionstored)
class treemanifestctx(object):
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2128,9 +2128,16 @@
'changelog, but manifest differs)\n')
if files or md:
self.ui.note(_("committing manifest\n"))
+ # we're using narrowmatch here since it's already applied at
+ # other stages (such as dirstate.walk), so we're already
+ # ignoring things outside of narrowspec in most cases. The
+ # one case where we might have files outside the narrowspec
+ # at this point is merges, and we already error out in the
+ # case where the merge has files outside of the narrowspec,
+ # so this is safe.
mn = mctx.write(trp, linkrev,
p1.manifestnode(), p2.manifestnode(),
- added, drop)
+ added, drop, match=self.narrowmatch())
else:
self.ui.debug('reusing manifest form p1 (listed files '
'actually unchanged)\n')
To: spectral, #hg-reviewers
Cc: martinvonz, yuja, mercurial-devel
More information about the Mercurial-devel
mailing list