This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1092

peer: when collecting method names for batch calls, bytes-ify name
ClosedPublic

Authored by durin42 on Oct 15 2017, 12:58 AM.

Download Raw Diff

Details

Reviewers

yuja

Group Reviewers

hg-reviewers

Commits

rHGa652b7763f66: peer: when collecting method names for batch calls, bytes-ify __name__

Summary

This will explode violently if we have a non-ascii command name. That
shouldn't ever happen in core, and seems unlikely even in third-party
code. Regardless, it'll explode violently, so we can revisit things in
the future if we need to change the encoding here.

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 15 2017, 12:58 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 15 2017, 12:58 AM

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

yuja accepted this revision.Oct 15 2017, 9:20 AM

This revision is now accepted and ready to land.Oct 15 2017, 9:20 AM

Closed by commit rHGa652b7763f66: peer: when collecting method names for batch calls, bytes-ify __name__ (authored by durin42). · Explain WhyOct 15 2017, 9:27 AM

This revision was automatically updated to reflect the committed changes.

durin42 added a child revision: D1099: dagutil: use a listcomp instead of a map().Oct 15 2017, 9:30 PM

durin42 updated this revision to Diff 2790.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/peer.py (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2772		Oct 15 2017, 12:58 AM	★	★
Diff 2	2782	rHGa652b7763f669683eb5540c6d4b77ee18e55bc80	Oct 14 2017, 12:03 PM	★	★
Diff 3	2790		Oct 15 2017, 9:30 PM	★	★

Status	Author	Revision
Closed	durin42	D1104 peer: ensure command names are always ascii bytestrs
Closed	durin42	D1103 httppeer: always produce native str header keys and values
Closed	durin42	D1102 wireproto: use %d to encode int, not %s
Closed	durin42	D1101 wireproto: use a proper exception instead of `assert False`
Closed	durin42	D1100 wireproto: use listcomp instead of map()
Closed	durin42	D1099 dagutil: use a listcomp instead of a map()
Closed	durin42	D1092 peer: when collecting method names for batch calls, bytes-ify __name__
Closed	durin42	D1091 python3: replace im_{self,func} with __{self,func}__ globally
Closed	durin42	D1090 httppeer: extract content-type from headers using native str
Closed	durin42	D1089 httppeer: convert request url back to bytes before inspecting it
Closed	durin42	D1088 templater: explode if we try to emit a str
Closed	durin42	D1087 hgweb: fill in content-type and content-length as native strings
Closed	durin42	D1086 hgweb: mimetype guessing needs a unicode path
Closed	durin42	D1085 hgweb: set sent_headers attr as early as practical
Closed	durin42	D1084 hgweb: detect Python 3-era libraries and use modern attribute names
Closed	durin42	D1083 server: indent block that's about to get conditionalized

Diff 2782

mercurial/peer.py

	return a a future for the result. Once you call submit(), all the queued			return a a future for the result. Once you call submit(), all the queued
	calls are performed and the results set in their respective futures.			calls are performed and the results set in their respective futures.
	'''			'''
	def __init__(self):			def __init__(self):
	self.calls = []			self.calls = []
	def __getattr__(self, name):			def __getattr__(self, name):
	def call(args, *opts):			def call(args, *opts):
	resref = future()			resref = future()
	self.calls.append((name, args, opts, resref,))			# Please don't invent non-ascii method names, or you will
				# give core hg a very sad time.
				self.calls.append((name.encode('ascii'), args, opts, resref,))
	return resref			return resref
	return call			return call
	def submit(self):			def submit(self):
	raise NotImplementedError()			raise NotImplementedError()

	class iterbatcher(batcher):			class iterbatcher(batcher):

	def submit(self):			def submit(self):