This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4762

remotefilelog: disable streaming clones with bundle2
ClosedPublic

Authored by durin42 on Sep 26 2018, 4:37 PM.
Tags
None
Subscribers
indygreg

Details

Reviewers
None
Group Reviewers
Restricted Project
Commits
rFBHGXcd64297d3d34: remotefilelog: disable streaming clones with bundle2
Summary

These manage to subvert the shallow cloning functionality of
remotefilelog. We'll do more work in the future to fix this, but for
now let's just take the easy out.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
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.Sep 26 2018, 4:37 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 26 2018, 4:37 PM
indygreg added a subscriber: indygreg.Sep 26 2018, 4:50 PM
indygreg added inline comments.
remotefilelog/__init__.py
216–219

Is this block needed? Or will it fall back to version 1 stream clones if it is omitted?

durin42 added inline comments.Sep 26 2018, 4:52 PM
remotefilelog/__init__.py
216–219

The goal is to force the code into the v1 streamclone path. I was trying to mutate the pullop as little as possible while accomplishing that goal.

Closed by commit rFBHGXcd64297d3d34: remotefilelog: disable streaming clones with bundle2 (authored by durin42). · Explain WhySep 28 2018, 1:00 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11461

remotefilelog/__init__.py

wrapfunction(remote, 'stream_out', stream_out_shallow) wrapfunction(remote, 'stream_out', stream_out_shallow)
if hasstreamclone: if hasstreamclone:
def stream_wrap(orig, op): def stream_wrap(orig, op):
setup_streamout(op.repo, op.remote) setup_streamout(op.repo, op.remote)
return orig(op) return orig(op)
wrapfunction(streamclone, 'maybeperformlegacystreamclone', wrapfunction(streamclone, 'maybeperformlegacystreamclone',
stream_wrap) stream_wrap)
def canperformstreamclone(orig, *args, **kwargs): def canperformstreamclone(orig, pullop, bundle2=False):
supported, requirements = orig(*args, **kwargs) # remotefilelog is currently incompatible with the
# bundle2 flavor of streamclones, so force us to use
# v1 instead.
if 'v2' in pullop.remotebundle2caps.get('stream', []):
pullop.remotebundle2caps['stream'] = [
c for c in pullop.remotebundle2caps['stream']
if c != 'v2']
indygregUnsubmitted
Not Done

Is this block needed? Or will it fall back to version 1 stream clones if it is omitted?

indygreg: Is this block needed? Or will it fall back to version 1 stream clones if it is omitted?
durin42AuthorUnsubmitted
Not Done

The goal is to force the code into the v1 streamclone path. I was trying to mutate the pullop as little as possible while accomplishing that goal.

durin42: The goal is to force the code into the v1 streamclone path. I was trying to mutate the pullop…
if bundle2:
return False, None
supported, requirements = orig(pullop, bundle2=bundle2)
if requirements is not None: if requirements is not None:
requirements.add(shallowrepo.requirement) requirements.add(shallowrepo.requirement)
return supported, requirements return supported, requirements
wrapfunction(streamclone, 'canperformstreamclone', wrapfunction(streamclone, 'canperformstreamclone',
canperformstreamclone) canperformstreamclone)
else: else:
def stream_in_shallow(orig, repo, remote, requirements): def stream_in_shallow(orig, repo, remote, requirements):
setup_streamout(repo, remote) setup_streamout(repo, remote)