This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4892

narrow: drop the bundle2 capability since we have server capabilities (BC)
ClosedPublic

Authored by pulkit on Oct 5 2018, 4:17 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGe3792741e3fb: narrow: drop the bundle2 capability since we have server capabilities (BC)
rHG381d3121e97a: narrow: drop the bundle2 capability since we have server capabilities (BC)
Summary

This patch drops the narrow bundle2 capabilities since we introduced narrow
server capabilities which are more nice and now used everywhere.

I am not sure what it can affect, so on safe side I marked this as BC. Also I
removed the NARROWCAP constant as that kind of conflicts with the same name
constant in wireprototypes.py.

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

pulkit created this revision.Oct 5 2018, 4:17 PM
pulkit updated this revision to Diff 12608.Nov 27 2018, 5:53 AM
martinvonz accepted this revision.Nov 28 2018, 8:47 AM
This revision is now accepted and ready to land.Nov 28 2018, 8:47 AM
Closed by commit rHG381d3121e97a: narrow: drop the bundle2 capability since we have server capabilities (BC) (authored by pulkit). · Explain WhyNov 28 2018, 1:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12617

hgext/narrow/narrowbundle2.py

bin, bin,
nullid, nullid,
) )
from mercurial import ( from mercurial import (
bundle2, bundle2,
changegroup, changegroup,
error, error,
exchange, exchange,
extensions,
narrowspec, narrowspec,
repair, repair,
repository, repository,
util, util,
wireprototypes, wireprototypes,
) )
from mercurial.utils import ( from mercurial.utils import (
stringutil, stringutil,
) )
NARROWCAP = 'narrow'
_NARROWACL_SECTION = 'narrowhgacl' _NARROWACL_SECTION = 'narrowhgacl'
_CHANGESPECPART = NARROWCAP + ':changespec' _CHANGESPECPART = 'narrow:changespec'
_SPECPART = NARROWCAP + ':spec' _SPECPART = 'narrow:spec'
_SPECPART_INCLUDE = 'include' _SPECPART_INCLUDE = 'include'
_SPECPART_EXCLUDE = 'exclude' _SPECPART_EXCLUDE = 'exclude'
_KILLNODESIGNAL = 'KILL' _KILLNODESIGNAL = 'KILL'
_DONESIGNAL = 'DONE' _DONESIGNAL = 'DONE'
_ELIDEDCSHEADER = '>20s20s20sl' # cset id, p1, p2, len(text) _ELIDEDCSHEADER = '>20s20s20sl' # cset id, p1, p2, len(text)
_ELIDEDMFHEADER = '>20s20s20s20sl' # manifest id, p1, p2, link id, len(text) _ELIDEDMFHEADER = '>20s20s20s20sl' # manifest id, p1, p2, link id, len(text)
_CSHEADERSIZE = struct.calcsize(_ELIDEDCSHEADER) _CSHEADERSIZE = struct.calcsize(_ELIDEDCSHEADER)
_MFHEADERSIZE = struct.calcsize(_ELIDEDMFHEADER) _MFHEADERSIZE = struct.calcsize(_ELIDEDMFHEADER)
# When advertising capabilities, always include narrow clone support.
def getrepocaps_narrow(orig, repo, **kwargs):
caps = orig(repo, **kwargs)
caps[NARROWCAP] = ['v0']
return caps
# Serve a changegroup for a client with a narrow clone. # Serve a changegroup for a client with a narrow clone.
def getbundlechangegrouppart_narrow(bundler, repo, source, def getbundlechangegrouppart_narrow(bundler, repo, source,
bundlecaps=None, b2caps=None, heads=None, bundlecaps=None, b2caps=None, heads=None,
common=None, **kwargs): common=None, **kwargs):
assert repo.ui.configbool('experimental', 'narrowservebrokenellipses') assert repo.ui.configbool('experimental', 'narrowservebrokenellipses')
cgversions = b2caps.get('changegroup') cgversions = b2caps.get('changegroup')
if cgversions: # 3.1 and 3.2 ship with an empty value if cgversions: # 3.1 and 3.2 ship with an empty value
(undovfs.join(undofile), stringutil.forcebytestr(e))) (undovfs.join(undofile), stringutil.forcebytestr(e)))
# Remove partial backup only if there were no exceptions # Remove partial backup only if there were no exceptions
op._widen_uninterr.__exit__(None, None, None) op._widen_uninterr.__exit__(None, None, None)
vfs.unlink(chgrpfile) vfs.unlink(chgrpfile)
def setup(): def setup():
"""Enable narrow repo support in bundle2-related extension points.""" """Enable narrow repo support in bundle2-related extension points."""
extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow)
getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS
getbundleargs['narrow'] = 'boolean' getbundleargs['narrow'] = 'boolean'
getbundleargs['depth'] = 'plain' getbundleargs['depth'] = 'plain'
getbundleargs['oldincludepats'] = 'csv' getbundleargs['oldincludepats'] = 'csv'
getbundleargs['oldexcludepats'] = 'csv' getbundleargs['oldexcludepats'] = 'csv'
getbundleargs['known'] = 'csv' getbundleargs['known'] = 'csv'

tests/test-narrow-clone-non-narrow-server.t

> unquote = up.unquote_plus > unquote = up.unquote_plus
> else: > else:
> import urllib > import urllib
> unquote = urllib.unquote_plus > unquote = urllib.unquote_plus
> print(unquote(list(sys.stdin)[1])) > print(unquote(list(sys.stdin)[1]))
> EOF > EOF
$ echo hello | hg -R . serve --stdio | \ $ echo hello | hg -R . serve --stdio | \
> "$PYTHON" unquote.py | tr ' ' '\n' | grep narrow > "$PYTHON" unquote.py | tr ' ' '\n' | grep narrow
narrow=v0
exp-narrow-1 exp-narrow-1
$ cd .. $ cd ..
$ hg clone --narrow --include f1 http://localhost:$HGPORT1/ narrowclone $ hg clone --narrow --include f1 http://localhost:$HGPORT1/ narrowclone
requesting all changes requesting all changes
abort: server does not support narrow clones abort: server does not support narrow clones
[255] [255]