This is an archive of the discontinued Mercurial Phabricator instance.

			Path	Packages
M			hgext/remotefilelog/__init__.py (3 lines)
M			hgext/remotefilelog/constants.py (2 lines)
M			hgext/remotefilelog/fileserverclient.py (8 lines)
M			hgext/remotefilelog/remotefilelogserver.py (3 lines)
M			tests/test-remotefilelog-pull-noshallow.t (4 lines)
M			tests/test-remotefilelog-push-pull.t (4 lines)

Commit	Parents	Author	Summary	Date
		Augie Fackler		Oct 16 2018, 4:38 PM

Status	Author	Revision
Closed	pulkit	D5193 remotefilelog: drop compat code for "getbundle_shallow" wireprotocol command
Closed	pulkit	D5192 tests: remove lz4 as dependency while running tests
Closed	pulkit	D5191 remotefilelogserver: add a matcher argument to _walkstreamfiles()
Closed	pulkit	D5190 shallowutil: introduce a helper function isenabled()
Closed	pulkit	D5189 remotefilelog: remove some BC code related to streamclone
Closed	durin42	D5131 remotefilelog: add some docstring
Closed	durin42	D5129 remotefilelog: rename wireproto methods and remaining capabilities
Closed	durin42	D5128 remotefilelog: consolidate and rename on-disk store requirement
Closed	durin42	D5127 remotefilelog: consolidate and rename bundle2 capability
Closed	durin42	D5126 remotefilelog: rename capability for legacy ssh file fetching method
Closed	durin42	D4944 remotefilelog: rip out lz4 support
Closed	durin42	D4943 remotefilelog: bump pack file formats to version 2
Closed	durin42	D4942 remotefilelog: avoid hard-coding pack names in tests
Closed	durin42	D5124 remotefilelog: remove now-unused wirepack code
Closed	durin42	D5123 remotefilelogserver: remove pack-serving functionality
Closed	durin42	D5122 remotefilelog: remove support for fetching packs
Closed	durin42	D4941 remotefilelog: jettison example cache client
Closed	durin42	D4940 remotefilelog: prune obsolete method
Closed	durin42	D4939 logtoprocess: use new runbgcommand from procutil
Closed	durin42	D5121 procutil: port over windows encoding fixes from logtoprocess
Closed	durin42	D4938 remotefilelog: transplant runbgcommand to procutil
Closed	durin42	D4937 remotefilelog: remove function that was described as deprecated
Closed	durin42	D4782 remotefilelog: import pruned-down remotefilelog extension from hg-experimental

Diff 12185

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	12185		Oct 16 2018, 5:45 PM	★	★
Diff 2	12420	rHG354acd0dc6372712c26689ece5c1b462f7baa7b0	Oct 16 2018, 4:38 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

remotefilelog: rename capability for legacy ssh file fetching methodClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 12185

hgext/remotefilelog/__init__.py

hgext/remotefilelog/constants.py

hgext/remotefilelog/fileserverclient.py

hgext/remotefilelog/remotefilelogserver.py

tests/test-remotefilelog-pull-noshallow.t

tests/test-remotefilelog-push-pull.t

remotefilelog: rename capability for legacy ssh file fetching method
ClosedPublic

Revision Contents
Changeset List

hgext/remotefilelog/init.py