This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5127

remotefilelog: consolidate and rename bundle2 capability
ClosedPublic

Authored by durin42 on Oct 16 2018, 5:45 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGed19958dbf5d: remotefilelog: consolidate and rename bundle2 capability
Summary

Bonus: we catch a spot where the shallowrepo requirement was being
misused as the bundle2 capability.

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

durin42 created this revision.Oct 16 2018, 5:45 PM
indygreg accepted this revision.Oct 17 2018, 2:52 AM
indygreg added a subscriber: indygreg.

Nice catch on the overloaded capability name! Constants are better for expressing intent.

This revision is now accepted and ready to land.Oct 17 2018, 2:52 AM
Closed by commit rHGed19958dbf5d: remotefilelog: consolidate and rename bundle2 capability (authored by durin42). · Explain WhyNov 5 2018, 2:55 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12421

hgext/remotefilelog/__init__.py

def exchangepull(orig, repo, remote, *args, **kwargs): def exchangepull(orig, repo, remote, *args, **kwargs):
# Hook into the callstream/getbundle to insert bundle capabilities # Hook into the callstream/getbundle to insert bundle capabilities
# during a pull. # during a pull.
def localgetbundle(orig, source, heads=None, common=None, bundlecaps=None, def localgetbundle(orig, source, heads=None, common=None, bundlecaps=None,
**kwargs): **kwargs):
if not bundlecaps: if not bundlecaps:
bundlecaps = set() bundlecaps = set()
bundlecaps.add('remotefilelog') bundlecaps.add(constants.BUNDLE2_CAPABLITY)
return orig(source, heads=heads, common=common, bundlecaps=bundlecaps, return orig(source, heads=heads, common=common, bundlecaps=bundlecaps,
**kwargs) **kwargs)
if util.safehasattr(remote, '_callstream'): if util.safehasattr(remote, '_callstream'):
remote._localrepo = repo remote._localrepo = repo
elif util.safehasattr(remote, 'getbundle'): elif util.safehasattr(remote, 'getbundle'):
extensions.wrapfunction(remote, 'getbundle', localgetbundle) extensions.wrapfunction(remote, 'getbundle', localgetbundle)

hgext/remotefilelog/constants.py

from __future__ import absolute_import from __future__ import absolute_import
import struct import struct
from mercurial.i18n import _ from mercurial.i18n import _
REQUIREMENT = "remotefilelog" REQUIREMENT = "remotefilelog"
NETWORK_CAP_LEGACY_SSH_GETFILES = 'exp-remotefilelog-ssh-getfiles-1' NETWORK_CAP_LEGACY_SSH_GETFILES = 'exp-remotefilelog-ssh-getfiles-1'
BUNDLE2_CAPABLITY = "exp-remotefilelog-b2cap-1"
FILENAMESTRUCT = '!H' FILENAMESTRUCT = '!H'
FILENAMESIZE = struct.calcsize(FILENAMESTRUCT) FILENAMESIZE = struct.calcsize(FILENAMESTRUCT)
NODESIZE = 20 NODESIZE = 20
PACKREQUESTCOUNTSTRUCT = '!I' PACKREQUESTCOUNTSTRUCT = '!I'
NODECOUNTSTRUCT = '!I' NODECOUNTSTRUCT = '!I'
NODECOUNTSIZE = struct.calcsize(NODECOUNTSTRUCT) NODECOUNTSIZE = struct.calcsize(NODECOUNTSTRUCT)

hgext/remotefilelog/fileserverclient.py

# shallow, includepattern, and excludepattern are a hacky way of # shallow, includepattern, and excludepattern are a hacky way of
# carrying over data from the local repo to this getbundle # carrying over data from the local repo to this getbundle
# command. We need to do it this way because bundle1 getbundle # command. We need to do it this way because bundle1 getbundle
# doesn't provide any other place we can hook in to manipulate # doesn't provide any other place we can hook in to manipulate
# getbundle args before it goes across the wire. Once we get rid # getbundle args before it goes across the wire. Once we get rid
# of bundle1, we can use bundle2's _pullbundle2extraprepare to # of bundle1, we can use bundle2's _pullbundle2extraprepare to
# do this more cleanly. # do this more cleanly.
bundlecaps.append('remotefilelog') bundlecaps.append(constants.BUNDLE2_CAPABLITY)
if self._localrepo.includepattern: if self._localrepo.includepattern:
patterns = '\0'.join(self._localrepo.includepattern) patterns = '\0'.join(self._localrepo.includepattern)
includecap = "includepattern=" + patterns includecap = "includepattern=" + patterns
bundlecaps.append(includecap) bundlecaps.append(includecap)
if self._localrepo.excludepattern: if self._localrepo.excludepattern:
patterns = '\0'.join(self._localrepo.excludepattern) patterns = '\0'.join(self._localrepo.excludepattern)
excludecap = "excludepattern=" + patterns excludecap = "excludepattern=" + patterns
bundlecaps.append(excludecap) bundlecaps.append(excludecap)

hgext/remotefilelog/remotefilelogserver.py

"""Sets up a normal Mercurial repo so it can serve files to shallow repos. """Sets up a normal Mercurial repo so it can serve files to shallow repos.
""" """
onetimesetup(ui) onetimesetup(ui)
# don't send files to shallow clients during pulls # don't send files to shallow clients during pulls
def generatefiles(orig, self, changedfiles, linknodes, commonrevs, source, def generatefiles(orig, self, changedfiles, linknodes, commonrevs, source,
*args, **kwargs): *args, **kwargs):
caps = self._bundlecaps or [] caps = self._bundlecaps or []
if shallowrepo.requirement in caps: if constants.BUNDLE2_CAPABLITY in caps:
# only send files that don't match the specified patterns # only send files that don't match the specified patterns
includepattern = None includepattern = None
excludepattern = None excludepattern = None
for cap in (self._bundlecaps or []): for cap in (self._bundlecaps or []):
if cap.startswith("includepattern="): if cap.startswith("includepattern="):
includepattern = cap[len("includepattern="):].split('\0') includepattern = cap[len("includepattern="):].split('\0')
elif cap.startswith("excludepattern="): elif cap.startswith("excludepattern="):
excludepattern = cap[len("excludepattern="):].split('\0') excludepattern = cap[len("excludepattern="):].split('\0')
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', '')
bundlecaps = set(bundlecaps.split(',')) bundlecaps = set(bundlecaps.split(','))
bundlecaps.add('remotefilelog') bundlecaps.add(constants.BUNDLE2_CAPABLITY)
others['bundlecaps'] = ','.join(bundlecaps) others['bundlecaps'] = ','.join(bundlecaps)
return wireprotov1server.commands["getbundle"][0](repo, proto, others) return wireprotov1server.commands["getbundle"][0](repo, proto, others)
wireprotov1server.commands["getbundle_shallow"] = (getbundleshallow, '*') wireprotov1server.commands["getbundle_shallow"] = (getbundleshallow, '*')
# expose remotefilelog capabilities # expose remotefilelog capabilities
def _capabilities(orig, repo, proto): def _capabilities(orig, repo, proto):

hgext/remotefilelog/shallowbundle.py

bundlerepo, bundlerepo,
changegroup, changegroup,
error, error,
match, match,
mdiff, mdiff,
pycompat, pycompat,
) )
from . import ( from . import (
constants,
remotefilelog, remotefilelog,
shallowutil, shallowutil,
) )
NoFiles = 0 NoFiles = 0
LocalFiles = 1 LocalFiles = 1
AllFiles = 2 AllFiles = 2
if not requirement in repo.requirements: if not requirement in repo.requirements:
return AllFiles return AllFiles
if source == "push" or source == "bundle": if source == "push" or source == "bundle":
return AllFiles return AllFiles
caps = self._bundlecaps or [] caps = self._bundlecaps or []
if source == "serve" or source == "pull": if source == "serve" or source == "pull":
if 'remotefilelog' in caps: if constants.BUNDLE2_CAPABLITY in caps:
return LocalFiles return LocalFiles
else: else:
# Serving to a full repo requires us to serve everything # Serving to a full repo requires us to serve everything
repo.ui.warn(_("pulling from a shallow repo\n")) repo.ui.warn(_("pulling from a shallow repo\n"))
return AllFiles return AllFiles
return NoFiles return NoFiles