This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	indygreg	D3335 wireproto: expose repository formats via capabilities
Closed	indygreg	D3334 wireprotoframing: record when new stream is encountered
Closed	indygreg	D3333 wireprotoframing: use value passed into function
Closed	indygreg	D3332 httppeer: handle error response from client reactor
Closed	indygreg	D3299 wireproto: add media type to version 2 capabilities response
Closed	indygreg	D3298 debugcommands: use command executor for invoking commands
Closed	indygreg	D3297 httppeer: implement command executor for version 2 peer
Closed	indygreg	D3318 repository: remove ipeercommands from ipeerbase
Closed	indygreg	D3317 wireproto: properly call clonebundles command
Closed	indygreg	D3316 exchange: use command executor for getbundle
Closed	indygreg	D3315 exchange: use command executor for pushkey
Closed	indygreg	D3314 wireproto: use command executor for unbundle
Closed	indygreg	D3296 debugcommands: perform handshake when obtaining httpv2 peer
Closed	indygreg	D3295 wireproto: rename HTTPV2 so it less like HTTP/2
Closed	indygreg	D3294 bundlerepo: use command executor for wire protocol commands
Closed	indygreg	D3293 bundlerepo: rename "other" to "peer"
Closed	indygreg	D3292 bookmarks: use command executor for wire protocol commands
Closed	indygreg	D3291 hg: use command executor for wire protocol commands
Closed	indygreg	D3290 logexchange: use command executor for wire protocol commands
Closed	indygreg	D3289 streamclone: use command executor for wire protocol commands
Closed	indygreg	D3288 discovery: use command executor interface
Closed	indygreg	D3287 discovery: don't redundantly call branchmap
Closed	indygreg	D3273 wireproto: convert legacy commands to command executor
Closed	indygreg	D3272 treediscovery: switch to command executor interface
Closed	indygreg	D3271 wireproto: remove iterbatch() from peer interface (API)
Closed	indygreg	D3270 largefiles: use command executor for batch operation
Closed	indygreg	D3269 wireproto: implement batching on peer executor interface
Closed	indygreg	D3268 wireproto: implement command executor interface for version 1 peers
Closed	indygreg	D3267 repository: define new interface for running commands
Closed	indygreg	D3266 pycompat: export a handle on concurrent.futures
Closed	indygreg	D3265 setup: add packages for concurrent.futures
Closed	indygreg	D3264 futures: switch to absolute and relative imports
Closed	indygreg	D3263 tests: silence pyflakes for thirdparty/concurrent
Closed	indygreg	D3262 futures: get rid of extend_path
Closed	indygreg	D3261 thirdparty: vendor futures 3.2.0
Closed	indygreg	D3260 peer: scatter module to the wind (API)
Closed	indygreg	D3259 wireproto: move version 1 peer functionality to standalone module (API)
Closed	indygreg	D3258 wireproto: move gboptsmap to wireprototypes and rename (API)
Closed	indygreg	D3257 wireproto: move value encoding functions to wireprototypes (API)
Closed	indygreg	D3256 httppeer: basic implementation of capabilities interface
Closed	indygreg	D3255 repository: split capabilities methods into separate interface
Closed	indygreg	D3254 httppeer: implement ipeerconnection

Diff 8024

hgext/narrow/narrowbundle2.py

	changegroup,			changegroup,
	dagutil,			dagutil,
	error,			error,
	exchange,			exchange,
	extensions,			extensions,
	narrowspec,			narrowspec,
	repair,			repair,
	util,			util,
	wireproto,			wireprototypes,
	)			)
	from mercurial.utils import (			from mercurial.utils import (
	stringutil,			stringutil,
	)			)

	NARROWCAP = 'narrow'			NARROWCAP = 'narrow'
	_NARROWACL_SECTION = 'narrowhgacl'			_NARROWACL_SECTION = 'narrowhgacl'
	_CHANGESPECPART = NARROWCAP + ':changespec'			_CHANGESPECPART = NARROWCAP + ':changespec'

	# Remove partial backup only if there were no exceptions			# Remove partial backup only if there were no exceptions
	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)			extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow)

	wireproto.gboptsmap['narrow'] = 'boolean'			getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS
	wireproto.gboptsmap['depth'] = 'plain'
	wireproto.gboptsmap['oldincludepats'] = 'csv'			getbundleargs['narrow'] = 'boolean'
	wireproto.gboptsmap['oldexcludepats'] = 'csv'			getbundleargs['depth'] = 'plain'
	wireproto.gboptsmap['includepats'] = 'csv'			getbundleargs['oldincludepats'] = 'csv'
	wireproto.gboptsmap['excludepats'] = 'csv'			getbundleargs['oldexcludepats'] = 'csv'
	wireproto.gboptsmap['known'] = 'csv'			getbundleargs['includepats'] = 'csv'
				getbundleargs['excludepats'] = 'csv'
				getbundleargs['known'] = 'csv'

	# Extend changegroup serving to handle requests from narrow clients.			# Extend changegroup serving to handle requests from narrow clients.
	origcgfn = exchange.getbundle2partsmapping['changegroup']			origcgfn = exchange.getbundle2partsmapping['changegroup']
	def wrappedcgfn(args, *kwargs):			def wrappedcgfn(args, *kwargs):
	repo = args[1]			repo = args[1]
	if repo.ui.has_section(_NARROWACL_SECTION):			if repo.ui.has_section(_NARROWACL_SECTION):
	getbundlechangegrouppart_narrow(			getbundlechangegrouppart_narrow(
	args, *applyacl_narrow(repo, kwargs))			args, *applyacl_narrow(repo, kwargs))

mercurial/wireproto.py

	according to the protocol capabilities. If no such capability has			according to the protocol capabilities. If no such capability has
	been announced, fallback to the default of zlib and uncompressed.			been announced, fallback to the default of zlib and uncompressed.
	"""			"""
	for cap in proto.getprotocaps():			for cap in proto.getprotocaps():
	if cap.startswith('comp='):			if cap.startswith('comp='):
	return cap[5:].split(',')			return cap[5:].split(',')
	return ['zlib', 'none']			return ['zlib', 'none']

	# mapping of options accepted by getbundle and their types
	#
	# Meant to be extended by extensions. It is extensions responsibility to ensure
	# such options are properly processed in exchange.getbundle.
	#
	# supported types are:
	#
	# :nodes: list of binary nodes
	# :csv: list of comma-separated values
	# :scsv: list of comma-separated values return as set
	# :plain: string with no transformation needed.
	gboptsmap = {'heads': 'nodes',
	'bookmarks': 'boolean',
	'common': 'nodes',
	'obsmarkers': 'boolean',
	'phases': 'boolean',
	'bundlecaps': 'scsv',
	'listkeys': 'csv',
	'cg': 'boolean',
	'cbattempted': 'boolean',
	'stream': 'boolean',
	}

	# client side			# client side

	class wirepeer(repository.legacypeer):			class wirepeer(repository.legacypeer):
	"""Client-side interface for communicating with a peer repository.			"""Client-side interface for communicating with a peer repository.

	Methods commonly call wire protocol commands of the same name.			Methods commonly call wire protocol commands of the same name.

	See also httppeer.py and sshpeer.py for protocol-specific			See also httppeer.py and sshpeer.py for protocol-specific
	def getbundle(self, source, **kwargs):			def getbundle(self, source, **kwargs):
	kwargs = pycompat.byteskwargs(kwargs)			kwargs = pycompat.byteskwargs(kwargs)
	self.requirecap('getbundle', _('look up remote changes'))			self.requirecap('getbundle', _('look up remote changes'))
	opts = {}			opts = {}
	bundlecaps = kwargs.get('bundlecaps') or set()			bundlecaps = kwargs.get('bundlecaps') or set()
	for key, value in kwargs.iteritems():			for key, value in kwargs.iteritems():
	if value is None:			if value is None:
	continue			continue
	keytype = gboptsmap.get(key)			keytype = wireprototypes.GETBUNDLE_ARGUMENTS.get(key)
	if keytype is None:			if keytype is None:
	raise error.ProgrammingError(			raise error.ProgrammingError(
	'Unexpectedly None keytype for key %s' % key)			'Unexpectedly None keytype for key %s' % key)
	elif keytype == 'nodes':			elif keytype == 'nodes':
	value = wireprototypes.encodelist(value)			value = wireprototypes.encodelist(value)
	elif keytype == 'csv':			elif keytype == 'csv':
	value = ','.join(value)			value = ','.join(value)
	elif keytype == 'scsv':			elif keytype == 'scsv':
	except IOError:			except IOError:
	repo.ui.debug('pullbundle "%s" not accessible\n' % path)			repo.ui.debug('pullbundle "%s" not accessible\n' % path)
	continue			continue
	return None			return None

	@wireprotocommand('getbundle', '*', permission='pull',			@wireprotocommand('getbundle', '*', permission='pull',
	transportpolicy=POLICY_V1_ONLY)			transportpolicy=POLICY_V1_ONLY)
	def getbundle(repo, proto, others):			def getbundle(repo, proto, others):
	opts = options('getbundle', gboptsmap.keys(), others)			opts = options('getbundle', wireprototypes.GETBUNDLE_ARGUMENTS.keys(),
				others)
	for k, v in opts.iteritems():			for k, v in opts.iteritems():
	keytype = gboptsmap[k]			keytype = wireprototypes.GETBUNDLE_ARGUMENTS[k]
	if keytype == 'nodes':			if keytype == 'nodes':
	opts[k] = wireprototypes.decodelist(v)			opts[k] = wireprototypes.decodelist(v)
	elif keytype == 'csv':			elif keytype == 'csv':
	opts[k] = list(v.split(','))			opts[k] = list(v.split(','))
	elif keytype == 'scsv':			elif keytype == 'scsv':
	opts[k] = set(v.split(','))			opts[k] = set(v.split(','))
	elif keytype == 'boolean':			elif keytype == 'boolean':
	# Client should serialize False as '0', which is a non-empty string			# Client should serialize False as '0', which is a non-empty string

mercurial/wireprototypes.py


	def unescapebatcharg(escaped):			def unescapebatcharg(escaped):
	return (escaped			return (escaped
	.replace(':e', '=')			.replace(':e', '=')
	.replace(':s', ';')			.replace(':s', ';')
	.replace(':o', ',')			.replace(':o', ',')
	.replace(':c', ':'))			.replace(':c', ':'))

				# mapping of options accepted by getbundle and their types
				#
				# Meant to be extended by extensions. It is extensions responsibility to ensure
				# such options are properly processed in exchange.getbundle.
				#
				# supported types are:
				#
				# :nodes: list of binary nodes
				# :csv: list of comma-separated values
				# :scsv: list of comma-separated values return as set
				# :plain: string with no transformation needed.
				GETBUNDLE_ARGUMENTS = {
				'heads': 'nodes',
				'bookmarks': 'boolean',
				'common': 'nodes',
				'obsmarkers': 'boolean',
				'phases': 'boolean',
				'bundlecaps': 'scsv',
				'listkeys': 'csv',
				'cg': 'boolean',
				'cbattempted': 'boolean',
				'stream': 'boolean',
				}

	class baseprotocolhandler(zi.Interface):			class baseprotocolhandler(zi.Interface):
	"""Abstract base class for wire protocol handlers.			"""Abstract base class for wire protocol handlers.

	A wire protocol handler serves as an interface between protocol command			A wire protocol handler serves as an interface between protocol command
	handlers and the wire protocol transport layer. Protocol handlers provide			handlers and the wire protocol transport layer. Protocol handlers provide
	methods to read command arguments, redirect stdio for the duration of			methods to read command arguments, redirect stdio for the duration of
	the request, handle response types, etc.			the request, handle response types, etc.
	"""			"""

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8024		Apr 11 2018, 7:42 PM	★	★
Diff 2	8099	rHG96d735601ca1fb1a10cf1d68f03eaa24b8c56105	Apr 11 2018, 1:51 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

wireproto: move gboptsmap to wireprototypes and rename (API)ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 8024

hgext/narrow/narrowbundle2.py

mercurial/wireproto.py

mercurial/wireprototypes.py

wireproto: move gboptsmap to wireprototypes and rename (API)
ClosedPublic

Revision Contents
Changeset List