This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D2451 py3: whitelist test-push-http.t as passing
Closed	durin42	D2450 util: handle fileno() on Python 3 throwing io.UnsupportedOperation
Closed	durin42	D2449 wireproto: use %d to encode an int, not a %s
Closed	durin42	D2448 httppeer: explicitly catch urlerr.httperror and re-raise
Closed	durin42	D2447 hgweb: pass exception message to builtin Exception ctor as sysstr
Closed	durin42	D2446 bundle2: part id is an int, use %d to make it bytes
Closed	durin42	D2445 bundle2: **strkwargs love on various kwargs constructions
Closed	durin42	D2444 http: drop custom http client logic
Closed	durin42	D2443 statichttprepo: move HTTPRangeHandler from byterange and delete the latter
Closed	durin42	D2442 filemerge: do what the context __bytes__ does, but locally
Closed	durin42	D2441 py3: convert known-int values to bytes using %d
Closed	durin42	D2440 py3: hunt down str(exception) instances and use util.forcebytestr
Closed	durin42	D2439 py3: whitelist another nine passing tests
Closed	durin42	D2438 util: use pycompat.bytestr() on repr() in date parse abort
Closed	durin42	D2437 subrepo: use util.forcebytestr() instead of str() on exception
Closed	durin42	D2436 tests: add missing b prefixes in test-commit.t
Closed	durin42	D2435 commitextras: fix on Python 3 by using sysstrs for __dict__ ops
Closed	durin42	D2434 util: use pycompat.bytestr() instead of str()

Diff 6095

	def decoratedmethod(self, args, *kargs):			def decoratedmethod(self, args, *kargs):
	try:			try:
	res = func(self, args, *kargs)			res = func(self, args, *kargs)
	except SubrepoAbort as ex:			except SubrepoAbort as ex:
	# This exception has already been handled			# This exception has already been handled
	raise ex			raise ex
	except error.Abort as ex:			except error.Abort as ex:
	subrepo = subrelpath(self)			subrepo = subrelpath(self)
	errormsg = str(ex) + ' ' + _('(in subrepository "%s")') % subrepo			errormsg = (util.forcebytestr(ex) + ' '
				+ _('(in subrepository "%s")') % subrepo)
	# avoid handling this exception by raising a SubrepoAbort exception			# avoid handling this exception by raising a SubrepoAbort exception
	raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo,			raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo,
	cause=sys.exc_info())			cause=sys.exc_info())
	return res			return res
	return decoratedmethod			return decoratedmethod

	def _updateprompt(ui, sub, dirty, local, remote):			def _updateprompt(ui, sub, dirty, local, remote):
	if dirty:			if dirty: