This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5126

remotefilelog: rename capability for legacy ssh file fetching method
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG354acd0dc637: remotefilelog: rename capability for legacy ssh file fetching method
Summary

I think I want to delete this, but for now we'll just rename this so
it's easy to tell apart from other strings that have the same value.

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:51 AM
This revision is now accepted and ready to land.Oct 17 2018, 2:51 AM
Closed by commit rHG354acd0dc637: remotefilelog: rename capability for legacy ssh file fetching method (authored by durin42). · Explain WhyNov 5 2018, 2:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12420

hgext/remotefilelog/__init__.py

repoview, repoview,
revset, revset,
scmutil, scmutil,
smartset, smartset,
templatekw, templatekw,
util, util,
) )
from . import ( from . import (
constants,
debugcommands, debugcommands,
fileserverclient, fileserverclient,
remotefilectx, remotefilectx,
remotefilelog, remotefilelog,
remotefilelogserver, remotefilelogserver,
repack as repackmod, repack as repackmod,
shallowbundle, shallowbundle,
shallowrepo, shallowrepo,
# Wrap the stream logic to add requirements and to pass include/exclude # Wrap the stream logic to add requirements and to pass include/exclude
# patterns around. # patterns around.
def setup_streamout(repo, remote): def setup_streamout(repo, remote):
# Replace remote.stream_out with a version that sends file # Replace remote.stream_out with a version that sends file
# patterns. # patterns.
def stream_out_shallow(orig): def stream_out_shallow(orig):
caps = remote.capabilities() caps = remote.capabilities()
if shallowrepo.requirement in caps: if constants.NETWORK_CAP_LEGACY_SSH_GETFILES in caps:
opts = {} opts = {}
if repo.includepattern: if repo.includepattern:
opts['includepattern'] = '\0'.join(repo.includepattern) opts['includepattern'] = '\0'.join(repo.includepattern)
if repo.excludepattern: if repo.excludepattern:
opts['excludepattern'] = '\0'.join(repo.excludepattern) opts['excludepattern'] = '\0'.join(repo.excludepattern)
return remote._callstream('stream_out_shallow', **opts) return remote._callstream('stream_out_shallow', **opts)
else: else:
return orig() return orig()

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'
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

f = wireprotov1peer.future() f = wireprotov1peer.future()
yield {'path': path}, f yield {'path': path}, f
heads = f.value.split('\n') if f.value else [] heads = f.value.split('\n') if f.value else []
yield heads yield heads
def _updatecallstreamopts(self, command, opts): def _updatecallstreamopts(self, command, opts):
if command != 'getbundle': if command != 'getbundle':
return return
if 'remotefilelog' not in self.capabilities(): if (constants.NETWORK_CAP_LEGACY_SSH_GETFILES
not in self.capabilities()):
return return
if not util.safehasattr(self, '_localrepo'): if not util.safehasattr(self, '_localrepo'):
return return
if constants.REQUIREMENT not in self._localrepo.requirements: if constants.REQUIREMENT not in self._localrepo.requirements:
return return
bundlecaps = opts.get('bundlecaps') bundlecaps = opts.get('bundlecaps')
if bundlecaps: if bundlecaps:
# When verbose is true, sshpeer prints 'running ssh...' # When verbose is true, sshpeer prints 'running ssh...'
# to stdout, which can interfere with some command # to stdout, which can interfere with some command
# outputs # outputs
verbose = self.ui.verbose verbose = self.ui.verbose
self.ui.verbose = False self.ui.verbose = False
try: try:
with self._connect() as conn: with self._connect() as conn:
remote = conn.peer remote = conn.peer
# TODO: deduplicate this with the constant in if remote.capable(
# shallowrepo constants.NETWORK_CAP_LEGACY_SSH_GETFILES):
if remote.capable("remotefilelog"):
if not isinstance(remote, _sshv1peer): if not isinstance(remote, _sshv1peer):
raise error.Abort('remotefilelog requires ssh ' raise error.Abort('remotefilelog requires ssh '
'servers') 'servers')
step = self.ui.configint('remotefilelog', step = self.ui.configint('remotefilelog',
'getfilesstep') 'getfilesstep')
getfilestype = self.ui.config('remotefilelog', getfilestype = self.ui.config('remotefilelog',
'getfilestype') 'getfilestype')
if getfilestype == 'threaded': if getfilestype == 'threaded':

hgext/remotefilelog/remotefilelogserver.py

store, store,
streamclone, streamclone,
util, util,
wireprotoserver, wireprotoserver,
wireprototypes, wireprototypes,
wireprotov1server, wireprotov1server,
) )
from . import ( from . import (
constants,
shallowrepo, shallowrepo,
shallowutil, shallowutil,
) )
_sshv1server = wireprotoserver.sshv1protocolhandler _sshv1server = wireprotoserver.sshv1protocolhandler
def setupserver(ui, repo): def setupserver(ui, repo):
"""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.
# expose remotefilelog capabilities # expose remotefilelog capabilities
def _capabilities(orig, repo, proto): def _capabilities(orig, repo, proto):
caps = orig(repo, proto) caps = orig(repo, proto)
if ((shallowrepo.requirement in repo.requirements or if ((shallowrepo.requirement in repo.requirements or
ui.configbool('remotefilelog', 'server'))): ui.configbool('remotefilelog', 'server'))):
if isinstance(proto, _sshv1server): if isinstance(proto, _sshv1server):
# legacy getfiles method which only works over ssh # legacy getfiles method which only works over ssh
caps.append(shallowrepo.requirement) caps.append(constants.NETWORK_CAP_LEGACY_SSH_GETFILES)
caps.append('getflogheads') caps.append('getflogheads')
caps.append('getfile') caps.append('getfile')
return caps return caps
extensions.wrapfunction(wireprotov1server, '_capabilities', _capabilities) extensions.wrapfunction(wireprotov1server, '_capabilities', _capabilities)
def _adjustlinkrev(orig, self, *args, **kwargs): def _adjustlinkrev(orig, self, *args, **kwargs):
# When generating file blobs, taking the real path is too slow on large # When generating file blobs, taking the real path is too slow on large
# repos, so force it to just return the linkrev directly. # repos, so force it to just return the linkrev directly.

tests/test-remotefilelog-pull-noshallow.t

$ hg clone ssh://user@dummy/master child -q $ hg clone ssh://user@dummy/master child -q
We should see the remotefilelog capability here, which advertises that We should see the remotefilelog capability here, which advertises that
the server supports our custom getfiles method. the server supports our custom getfiles method.
$ cd master $ cd master
$ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps $ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps
exp-remotefilelog-ssh-getfiles-1
getfile getfile
getflogheads getflogheads
remotefilelog
$ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo $ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo
exp-remotefilelog-ssh-getfiles-1
getfile getfile
getflogheads getflogheads
remotefilelog
Pull to the child repository. Use our custom setupremotefilelog extension Pull to the child repository. Use our custom setupremotefilelog extension
to ensure that remotefilelog.onetimeclientsetup() gets triggered. (Without to ensure that remotefilelog.onetimeclientsetup() gets triggered. (Without
using chg it normally would not be run in this case since the local repository using chg it normally would not be run in this case since the local repository
is not shallow.) is not shallow.)
$ echo y > y $ echo y > y

tests/test-remotefilelog-push-pull.t

1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
$ hgcloneshallow ssh://user@dummy/master shallow2 -q $ hgcloneshallow ssh://user@dummy/master shallow2 -q
We should see the remotefilelog capability here, which advertises that We should see the remotefilelog capability here, which advertises that
the server supports our custom getfiles method. the server supports our custom getfiles method.
$ cd master $ cd master
$ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps $ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps
exp-remotefilelog-ssh-getfiles-1
getfile getfile
getflogheads getflogheads
remotefilelog
$ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo $ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo
exp-remotefilelog-ssh-getfiles-1
getfile getfile
getflogheads getflogheads
remotefilelog
# pull to shallow from full # pull to shallow from full
$ echo y > y $ echo y > y
$ hg commit -qAm y $ hg commit -qAm y
$ cd ../shallow $ cd ../shallow
$ hg pull $ hg pull