This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8082

manifest: rewrite filesnotin to not make superfluous manifest copies
ClosedPublic

Authored by durin42 on Feb 5 2020, 5:34 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGbbecb6d80aa7: manifest: rewrite filesnotin to not make superfluous manifest copies
rHG610efaf53d28: manifest: rewrite filesnotin to not make superfluous manifest copies
rHGa4e045740619: manifest: rewrite filesnotin to not make superfluous manifest copies
Summary

This also skips using diff() when all we care about is the filenames. I'm
expecting the built in set logic to be plenty fast. For really large manifests
with a matcher in play this should copy substantially less data around.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Feb 5 2020, 5:34 PM
martinvonz accepted this revision.Feb 7 2020, 5:04 PM
This revision is now accepted and ready to land.Feb 7 2020, 5:04 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (17 lines)

Diff 20005

mercurial/manifest.py

hex, hex,
nullid, nullid,
nullrev, nullrev,
) )
from .pycompat import getattr from .pycompat import getattr
from . import ( from . import (
encoding, encoding,
error, error,
match as matchmod,
mdiff, mdiff,
pathutil, pathutil,
policy, policy,
pycompat, pycompat,
revlog, revlog,
util, util,
) )
from .interfaces import ( from .interfaces import (
def iterkeys(self): def iterkeys(self):
return self._lm.iterkeys() return self._lm.iterkeys()
def keys(self): def keys(self):
return list(self.iterkeys()) return list(self.iterkeys())
def filesnotin(self, m2, match=None): def filesnotin(self, m2, match=None):
'''Set of files in this manifest that are not in the other''' '''Set of files in this manifest that are not in the other'''
if match: if match is not None:
m1 = self.matches(match) match = matchmod.badmatch(match, lambda path, msg: None)
m2 = m2.matches(match) sm2 = set(m2.walk(match))
return m1.filesnotin(m2) return {f for f in self.walk(match) if f not in sm2}
diff = self.diff(m2) return {f for f in self if f not in m2}
files = set(
filepath
for filepath, hashflags in pycompat.iteritems(diff)
if hashflags[1][0] is None
)
return files
@propertycache @propertycache
def _dirs(self): def _dirs(self):
return pathutil.dirs(self) return pathutil.dirs(self)
def dirs(self): def dirs(self):
return self._dirs return self._dirs