This is an archive of the discontinued Mercurial Phabricator instance.

py3: pass str into ValueError to prevent b'' prefix in output
Needs RevisionPublic

Authored by pulkit on Feb 3 2019, 7:13 AM.

Download Raw Diff

Details

Reviewers

durin42
martinvonz
marmoute

Group Reviewers

hg-reviewers

Summary

skip-blame because mostly just r'' prefixes

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 3 2019, 7:13 AM

Herald added a reviewer: durin42. · View Herald TranscriptFeb 3 2019, 7:13 AM

Herald added a reviewer: martinvonz. · View Herald Transcript

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added a subscriber: mercurial-devel. · View Herald Transcript

I am not whether this is correct. This should have fix failure of test-lfs-serve.t#lfsremote-on failure on py3 but it does not.

I am not whether this is correct. This should have fix failure of `test-lfs-serve.t#lfsremote-on` failure on py3 but it does not.

As you guess, this isn't correct. For example, _(unicode_sring) will crash
if gettext is enabled.

I don't know why ValueError is used extensively in exchange.py and where it's
supposed to be caught, but the easiest workaround is to make a ValueError
subclass that implements bytes.

class ExchangeValueError(ValueError):
    __bytes__ = _tobytes

moving to need revision according to yuya feedback

This revision now requires changes to proceed.Jan 23 2020, 12:11 PM

Revision Contents
Changeset List

			Path	Packages
M			hgext/narrow/narrowbundle2.py (6 lines)
M			mercurial/exchange.py (18 lines)

Commit	Parents	Author	Summary	Date
		Pulkit Goyal		Feb 3 2019, 6:54 AM

Status	Author	Revision
Needs Revision	pulkit	D5812 py3: pass str into ValueError to prevent b'' prefix in output
Closed	pulkit	D5811 py3: add some b'' prefixes in test-notify.t
Closed	pulkit	D5810 py3: use pycompat.long in hgext/convert/monotone.py
Closed	pulkit	D5809 py3: add three new passing tests found by buildbot
Closed	pulkit	D5808 py3: do a fsdecode(), fsencode() dance in posix.py

Diff 13716

hgext/narrow/narrowbundle2.py

	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
	cgversions = [v for v in cgversions			cgversions = [v for v in cgversions
	if v in changegroup.supportedoutgoingversions(repo)]			if v in changegroup.supportedoutgoingversions(repo)]
	if not cgversions:			if not cgversions:
	raise ValueError(_('no common changegroup version'))			raise ValueError(_(r'no common changegroup version'))
	version = max(cgversions)			version = max(cgversions)
	else:			else:
	raise ValueError(_("server does not advertise changegroup version,"			raise ValueError(_(r"server does not advertise changegroup version,"
	" can't negotiate support for ellipsis nodes"))			r" can't negotiate support for ellipsis nodes"))

	include = sorted(filter(bool, kwargs.get(r'includepats', [])))			include = sorted(filter(bool, kwargs.get(r'includepats', [])))
	exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))			exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
	newmatch = narrowspec.match(repo.root, include=include, exclude=exclude)			newmatch = narrowspec.match(repo.root, include=include, exclude=exclude)

	depth = kwargs.get(r'depth', None)			depth = kwargs.get(r'depth', None)
	if depth is not None:			if depth is not None:
	depth = int(depth)			depth = int(depth)

mercurial/exchange.py

	b2caps = bundle2.bundle2caps(pushop.remote)			b2caps = bundle2.bundle2caps(pushop.remote)
	version = '01'			version = '01'
	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
	cgversions = [v for v in cgversions			cgversions = [v for v in cgversions
	if v in changegroup.supportedoutgoingversions(			if v in changegroup.supportedoutgoingversions(
	pushop.repo)]			pushop.repo)]
	if not cgversions:			if not cgversions:
	raise ValueError(_('no common changegroup version'))			raise ValueError(_(r'no common changegroup version'))
	version = max(cgversions)			version = max(cgversions)
	cgstream = changegroup.makestream(pushop.repo, pushop.outgoing, version,			cgstream = changegroup.makestream(pushop.repo, pushop.outgoing, version,
	'push')			'push')
	cgpart = bundler.newpart('changegroup', data=cgstream)			cgpart = bundler.newpart('changegroup', data=cgstream)
	if cgversions:			if cgversions:
	cgpart.addparam('version', version)			cgpart.addparam('version', version)
	if 'treemanifest' in pushop.repo.requirements:			if 'treemanifest' in pushop.repo.requirements:
	cgpart.addparam('treemanifest', '1')			cgpart.addparam('treemanifest', '1')
	"""Return chunks constituting a bundle's raw data.			"""Return chunks constituting a bundle's raw data.

	Could be a bundle HG10 or a bundle HG20 depending on bundlecaps			Could be a bundle HG10 or a bundle HG20 depending on bundlecaps
	passed.			passed.

	Returns a 2-tuple of a dict with metadata about the generated bundle			Returns a 2-tuple of a dict with metadata about the generated bundle
	and an iterator over raw chunks (of varying sizes).			and an iterator over raw chunks (of varying sizes).
	"""			"""
	kwargs = pycompat.byteskwargs(kwargs)
	info = {}			info = {}
	usebundle2 = bundle2requested(bundlecaps)			usebundle2 = bundle2requested(bundlecaps)
	# bundle10 case			# bundle10 case
	if not usebundle2:			if not usebundle2:
	if bundlecaps and not kwargs.get('cg', True):			if bundlecaps and not kwargs.get(r'cg', True):
	raise ValueError(_('request for bundle10 must include changegroup'))			raise ValueError(_(r'request for bundle10 must include changegroup'))

	if kwargs:			if kwargs:
	raise ValueError(_('unsupported getbundle arguments: %s')			raise ValueError(_(r'unsupported getbundle arguments: %s')
	% ', '.join(sorted(kwargs.keys())))			% r', '.join(sorted(kwargs.keys())))
	outgoing = _computeoutgoing(repo, heads, common)			outgoing = _computeoutgoing(repo, heads, common)
	info['bundleversion'] = 1			info['bundleversion'] = 1
	return info, changegroup.makestream(repo, outgoing, '01', source,			return info, changegroup.makestream(repo, outgoing, '01', source,
	bundlecaps=bundlecaps)			bundlecaps=bundlecaps)

				kwargs = pycompat.byteskwargs(kwargs)
	# bundle20 case			# bundle20 case
	info['bundleversion'] = 2			info['bundleversion'] = 2
	b2caps = {}			b2caps = {}
	for bcaps in bundlecaps:			for bcaps in bundlecaps:
	if bcaps.startswith('bundle2='):			if bcaps.startswith('bundle2='):
	blob = urlreq.unquote(bcaps[len('bundle2='):])			blob = urlreq.unquote(bcaps[len('bundle2='):])
	b2caps.update(bundle2.decodecaps(blob))			b2caps.update(bundle2.decodecaps(blob))
	bundler = bundle2.bundle20(repo.ui, b2caps)			bundler = bundle2.bundle20(repo.ui, b2caps)
	return			return

	version = '01'			version = '01'
	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
	cgversions = [v for v in cgversions			cgversions = [v for v in cgversions
	if v in changegroup.supportedoutgoingversions(repo)]			if v in changegroup.supportedoutgoingversions(repo)]
	if not cgversions:			if not cgversions:
	raise ValueError(_('no common changegroup version'))			raise ValueError(_(r'no common changegroup version'))
	version = max(cgversions)			version = max(cgversions)

	outgoing = _computeoutgoing(repo, heads, common)			outgoing = _computeoutgoing(repo, heads, common)
	if not outgoing.missing:			if not outgoing.missing:
	return			return

	if kwargs.get(r'narrow', False):			if kwargs.get(r'narrow', False):
	include = sorted(filter(bool, kwargs.get(r'includepats', [])))			include = sorted(filter(bool, kwargs.get(r'includepats', [])))

	@getbundle2partsgenerator('bookmarks')			@getbundle2partsgenerator('bookmarks')
	def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None,			def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None,
	b2caps=None, **kwargs):			b2caps=None, **kwargs):
	"""add a bookmark part to the requested bundle"""			"""add a bookmark part to the requested bundle"""
	if not kwargs.get(r'bookmarks', False):			if not kwargs.get(r'bookmarks', False):
	return			return
	if 'bookmarks' not in b2caps:			if 'bookmarks' not in b2caps:
	raise ValueError(_('no common bookmarks exchange method'))			raise ValueError(_(r'no common bookmarks exchange method'))
	books = bookmod.listbinbookmarks(repo)			books = bookmod.listbinbookmarks(repo)
	data = bookmod.binaryencode(books)			data = bookmod.binaryencode(books)
	if data:			if data:
	bundler.newpart('bookmarks', data=data)			bundler.newpart('bookmarks', data=data)

	@getbundle2partsgenerator('listkeys')			@getbundle2partsgenerator('listkeys')
	def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None,			def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None,
	b2caps=None, **kwargs):			b2caps=None, **kwargs):
	bundle2.buildobsmarkerspart(bundler, markers)			bundle2.buildobsmarkerspart(bundler, markers)

	@getbundle2partsgenerator('phases')			@getbundle2partsgenerator('phases')
	def _getbundlephasespart(bundler, repo, source, bundlecaps=None,			def _getbundlephasespart(bundler, repo, source, bundlecaps=None,
	b2caps=None, heads=None, **kwargs):			b2caps=None, heads=None, **kwargs):
	"""add phase heads part to the requested bundle"""			"""add phase heads part to the requested bundle"""
	if kwargs.get(r'phases', False):			if kwargs.get(r'phases', False):
	if not 'heads' in b2caps.get('phases'):			if not 'heads' in b2caps.get('phases'):
	raise ValueError(_('no common phases exchange method'))			raise ValueError(_(r'no common phases exchange method'))
	if heads is None:			if heads is None:
	heads = repo.heads()			heads = repo.heads()

	headsbyphase = collections.defaultdict(set)			headsbyphase = collections.defaultdict(set)
	if repo.publishing():			if repo.publishing():
	headsbyphase[phases.public] = heads			headsbyphase[phases.public] = heads
	else:			else:
	# find the appropriate heads to move			# find the appropriate heads to move

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	13716			Feb 3 2019, 7:13 AM	★	★