This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5487

remotefilelog: fix bug in maybesparsematch returning alwaysmatcher
ClosedPublic

Authored by spectral on Dec 27 2018, 7:15 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG517a51d9cd7f: remotefilelog: fix bug in maybesparsematch returning alwaysmatcher
Summary

The description of the method says that it should return None if sparse is not
used in this repository; since sparse.matcher() returns alwaysmatcher if sparse
is not enabled, I'm using that as the signal to return None here to preserve the
previous behavior.

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

spectral created this revision.Dec 27 2018, 7:15 PM
Closed by commit rHG517a51d9cd7f: remotefilelog: fix bug in maybesparsematch returning alwaysmatcher (authored by spectral). · Explain WhyDec 30 2018, 3:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/shallowrepo.py (9 lines)

Diff 12994

hgext/remotefilelog/shallowrepo.py

def maybesparsematch(self, *revs, **kwargs): def maybesparsematch(self, *revs, **kwargs):
''' '''
A wrapper that allows the remotefilelog to invoke sparsematch() if A wrapper that allows the remotefilelog to invoke sparsematch() if
this is a sparse repository, or returns None if this is not a this is a sparse repository, or returns None if this is not a
sparse repository. sparse repository.
''' '''
if revs: if revs:
return sparse.matcher(repo, revs=revs) ret = sparse.matcher(repo, revs=revs)
return sparse.matcher(repo) else:
ret = sparse.matcher(repo)
if ret.always():
return None
return ret
def file(self, f): def file(self, f):
if f[0] == '/': if f[0] == '/':
f = f[1:] f = f[1:]
if self.shallowmatch(f): if self.shallowmatch(f):
return remotefilelog.remotefilelog(self.svfs, f, self) return remotefilelog.remotefilelog(self.svfs, f, self)
else: else: