This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1929

bundle2: don't advertise stream bundle2 capability when feature disabled
ClosedPublic

Authored by indygreg on Jan 20 2018, 7:44 PM.

Details

Reviewers
lothiraldan
durin42
Group Reviewers
hg-reviewers
Commits
rHGc1b9eb15a51c: bundle2: don't advertise stream bundle2 capability when feature disabled
Summary

The server.uncompressed config option can be used to disable streaming
clones. While the top-level capability to advertise streaming clone
support isn't advertised when this option is set, we were still sending
the bundle2-level capabilities advertising support for stream parts.
It makes sense to not advertise that support when streaming clones
are globally disabled.

If the structure of the new code seems a bit odd, it is because we'll
have to further tweak the behavior in commit(s) ahead.

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

indygreg created this revision.Jan 20 2018, 7:44 PM
lothiraldan accepted this revision.Jan 22 2018, 10:54 AM
indygreg updated this revision to Diff 4987.Jan 22 2018, 3:32 PM
durin42 accepted this revision.Jan 22 2018, 4:10 PM
This revision is now accepted and ready to land.Jan 22 2018, 4:10 PM
Closed by commit rHGc1b9eb15a51c: bundle2: don't advertise stream bundle2 capability when feature disabled (authored by indygreg). · Explain WhyJan 22 2018, 4:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (16 lines)
Mtests/test-clone-uncompressed.t (4 lines)

Diff 4996

mercurial/bundle2.py

caps['obsmarkers'] = supportedformat caps['obsmarkers'] = supportedformat
if allowpushback: if allowpushback:
caps['pushback'] = () caps['pushback'] = ()
cpmode = repo.ui.config('server', 'concurrent-push-mode') cpmode = repo.ui.config('server', 'concurrent-push-mode')
if cpmode == 'check-related': if cpmode == 'check-related':
caps['checkheads'] = ('related',) caps['checkheads'] = ('related',)
if 'phases' in repo.ui.configlist('devel', 'legacy.exchange'): if 'phases' in repo.ui.configlist('devel', 'legacy.exchange'):
caps.pop('phases') caps.pop('phases')
# Don't advertise stream clone support in server mode if not configured.
if role == 'server':
streamsupported = repo.ui.configbool('server', 'uncompressed',
untrusted=True)
featuresupported = repo.ui.configbool('experimental', 'bundle2.stream')
if not streamsupported or not featuresupported:
caps.pop('stream')
# role == 'client'
else:
if not repo.ui.configbool('experimental', 'bundle2.stream'): if not repo.ui.configbool('experimental', 'bundle2.stream'):
caps.pop('stream') caps.pop('stream')
return caps return caps
def bundle2caps(remote): def bundle2caps(remote):
"""return the bundle capabilities of a peer as dict""" """return the bundle capabilities of a peer as dict"""
raw = remote.capable('bundle2') raw = remote.capable('bundle2')
if not raw and raw != '': if not raw and raw != '':
return {} return {}
capsblob = urlreq.unquote(remote.capable('bundle2')) capsblob = urlreq.unquote(remote.capable('bundle2'))

tests/test-clone-uncompressed.t

0060: 6e 65 72 61 |nera| 0060: 6e 65 72 61 |nera|
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg debugcapabilities http://localhost:$HGPORT $ hg debugcapabilities http://localhost:$HGPORT
Main capabilities: Main capabilities:
batch batch
branchmap branchmap
$USUAL_BUNDLE2_CAPS$%0Astream%3Dv2 $USUAL_BUNDLE2_CAPS$
changegroupsubset changegroupsubset
compression=zstd,zlib compression=zstd,zlib
getbundle getbundle
httpheader=1024 httpheader=1024
httpmediatype=0.1rx,0.1tx,0.2tx httpmediatype=0.1rx,0.1tx,0.2tx
known known
lookup lookup
pushkey pushkey
hgtagsfnodes hgtagsfnodes
listkeys listkeys
phases phases
heads heads
pushkey pushkey
remote-changegroup remote-changegroup
http http
https https
stream
v2
$ hg clone --stream -U http://localhost:$HGPORT server-disabled $ hg clone --stream -U http://localhost:$HGPORT server-disabled
warning: stream clone requested but server has them disabled warning: stream clone requested but server has them disabled
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 1025 changes to 1025 files added 2 changesets with 1025 changes to 1025 files