This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5191

remotefilelogserver: add a matcher argument to _walkstreamfiles()
ClosedPublic

Authored by pulkit on Oct 24 2018, 10:55 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1c34b31a6c9c: remotefilelogserver: add a matcher argument to _walkstreamfiles()
Summary

Implementing narrow stream clones in core, I added an optional matcher argument.
The function in remotefilelogserver.py does not know about that argument and
does not accept that and hence some tests fails.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 24 2018, 10:55 AM
pulkit updated this revision to Diff 12341.Oct 24 2018, 11:21 AM
durin42 accepted this revision.Nov 5 2018, 11:01 AM
This revision is now accepted and ready to land.Nov 5 2018, 11:01 AM
Closed by commit rHG1c34b31a6c9c: remotefilelogserver: add a matcher argument to _walkstreamfiles() (authored by pulkit). · Explain WhyNov 5 2018, 2:57 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12341

hgext/remotefilelog/remotefilelogserver.py

finally: finally:
state.shallowremote = oldshallow state.shallowremote = oldshallow
state.match = oldmatch state.match = oldmatch
state.noflatmf = oldnoflatmf state.noflatmf = oldnoflatmf
wireprotov1server.commands['stream_out_shallow'] = (stream_out_shallow, '*') wireprotov1server.commands['stream_out_shallow'] = (stream_out_shallow, '*')
# don't clone filelogs to shallow clients # don't clone filelogs to shallow clients
def _walkstreamfiles(orig, repo): def _walkstreamfiles(orig, repo, matcher=None):
if state.shallowremote: if state.shallowremote:
# if we are shallow ourselves, stream our local commits # if we are shallow ourselves, stream our local commits
if shallowutil.isenabled(repo): if shallowutil.isenabled(repo):
striplen = len(repo.store.path) + 1 striplen = len(repo.store.path) + 1
readdir = repo.store.rawvfs.readdir readdir = repo.store.rawvfs.readdir
visit = [os.path.join(repo.store.path, 'data')] visit = [os.path.join(repo.store.path, 'data')]
while visit: while visit:
p = visit.pop() p = visit.pop()
elif shallowutil.isenabled(repo): elif shallowutil.isenabled(repo):
# don't allow cloning from a shallow repo to a full repo # don't allow cloning from a shallow repo to a full repo
# since it would require fetching every version of every # since it would require fetching every version of every
# file in order to create the revlogs. # file in order to create the revlogs.
raise error.Abort(_("Cannot clone from a shallow repo " raise error.Abort(_("Cannot clone from a shallow repo "
"to a full repo.")) "to a full repo."))
else: else:
for x in orig(repo): for x in orig(repo, matcher):
yield x yield x
extensions.wrapfunction(streamclone, '_walkstreamfiles', _walkstreamfiles) extensions.wrapfunction(streamclone, '_walkstreamfiles', _walkstreamfiles)
# We no longer use getbundle_shallow commands, but we must still # We no longer use getbundle_shallow commands, but we must still
# support it for migration purposes # support it for migration purposes
def getbundleshallow(repo, proto, others): def getbundleshallow(repo, proto, others):
bundlecaps = others.get('bundlecaps', '') bundlecaps = others.get('bundlecaps', '')