This is an archive of the discontinued Mercurial Phabricator instance.

Differential D84

sparse: fix interaction with treemanifest
ClosedPublic

Authored by durham on Jul 14 2017, 2:09 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX010cb3d963bf: sparse: fix interaction with treemanifest
Summary

Treemanifest relies on the matcher visitdir function, which was not implemented
in our special sparse matchers. Long term we should migrate to using the core
sparse extension. For now let's just implement visitdir().

Test Plan

Added a test. Previously the test would throw a big exception.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

durham created this revision.Jul 14 2017, 2:09 PM
quark accepted this revision.Jul 14 2017, 2:13 PM
This revision is now accepted and ready to land.Jul 14 2017, 2:13 PM
Closed by commit rFBHGX010cb3d963bf: sparse: fix interaction with treemanifest (authored by durham). · Explain WhyJul 14 2017, 2:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/sparse.py (14 lines)
Mtests/test-treemanifest.t (13 lines)

Diff 150

hgext3rd/sparse.py

return False return False
def anypats(self): def anypats(self):
return True return True
def prefix(self): def prefix(self):
return False return False
def visitdir(self, dir):
if any(True for path in self._includes if path.startswith(dir)):
return True
return self._matcher.visitdir(dir)
def hash(self): def hash(self):
sha1 = hashlib.sha1() sha1 = hashlib.sha1()
sha1.update(_hashmatcher(self._matcher)) sha1.update(_hashmatcher(self._matcher))
for include in sorted(self._includes): for include in sorted(self._includes):
sha1.update(include + '\0') sha1.update(include + '\0')
return sha1.hexdigest() return sha1.hexdigest()
class unionmatcher(object): class unionmatcher(object):
return False return False
def anypats(self): def anypats(self):
return True return True
def prefix(self): def prefix(self):
return False return False
def visitdir(self, dir):
for match in self._matchers:
if match.visitdir(dir):
return True
return False
def hash(self): def hash(self):
sha1 = hashlib.sha1() sha1 = hashlib.sha1()
for m in self._matchers: for m in self._matchers:
sha1.update(_hashmatcher(m)) sha1.update(_hashmatcher(m))
return sha1.hexdigest() return sha1.hexdigest()
class negatematcher(object): class negatematcher(object):
def __init__(self, matcher): def __init__(self, matcher):
return [] return []
def isexact(self): def isexact(self):
return False return False
def anypats(self): def anypats(self):
return True return True
def visitdir(self, dir):
return True
def hash(self): def hash(self):
sha1 = hashlib.sha1() sha1 = hashlib.sha1()
sha1.update('negate') sha1.update('negate')
sha1.update(_hashmatcher(self._matcher)) sha1.update(_hashmatcher(self._matcher))
return sha1.hexdigest() return sha1.hexdigest()
def _hashmatcher(matcher): def _hashmatcher(matcher):
if util.safehasattr(matcher, 'hash'): if util.safehasattr(matcher, 'hash'):
return matcher.hash() return matcher.hash()
sha1 = hashlib.sha1() sha1 = hashlib.sha1()
sha1.update(repr(matcher)) sha1.update(repr(matcher))
return sha1.hexdigest() return sha1.hexdigest()

tests/test-treemanifest.t

subdir subdir
Node Delta Base Delta Length Node Delta Base Delta Length
ad0a48a2ec1e 000000000000 43 ad0a48a2ec1e 000000000000 43
Node Delta Base Delta Length Node Delta Base Delta Length
8289b85c6a30 000000000000 92 8289b85c6a30 000000000000 92
Test treemanifest with sparse enabled
$ cat >> .hg/hgrc <<EOF
> [extensions]
> sparse = $TESTDIR/../hgext3rd/sparse.py
> reset = $TESTDIR/../hgext3rd/reset.py
> EOF
$ hg sparse -I subdir
$ hg reset '.^'
resetting without an active bookmark
saved backup bundle to $TESTTMP/client/.hg/strip-backup/27a577922312-3ad85b1a-backup.hg (glob)
$ hg status
M subdir/y