This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	touilleMan	D7196 py3: fix fsmonitor's _handleunavailable exception message encoding
Closed	touilleMan	D7195 py3: fix exception message encoding in infinitepush
Closed	touilleMan	D7194 py3: fix crecord.py's editpatchwitheditor exception message encoding
Closed	touilleMan	D7193 py3: fix exception message encoding in scmutil.py's simplekeyvaluefile.read
Closed	touilleMan	D7192 py3: fix exception message check in test-linerange.py's testOutOfRange
Closed	touilleMan	D7191 py3: fix exception display encoding in contrib/simplemerge.py
Needs Revision	touilleMan	D7187 py3: fix fsmonitor error message formatting under Python3

Diff 17446

	from __future__ import absolute_import			from __future__ import absolute_import

	import unittest			import unittest
	from mercurial import error, mdiff			from mercurial import error, mdiff
				from mercurial.utils import stringutil

	# for readability, line numbers are 0-origin			# for readability, line numbers are 0-origin
	text1 = b'''			text1 = b'''
	00 at OLD			00 at OLD
	01 at OLD			01 at OLD
	02 at OLD			02 at OLD
	02 at NEW, 03 at OLD			02 at NEW, 03 at OLD
	03 at NEW, 04 at OLD			03 at NEW, 04 at OLD
	(0, 34),			(0, 34),
	(15, 12),			(15, 12),
	]:			]:
	# Could be `with self.assertRaises(error.Abort)` but python2.6			# Could be `with self.assertRaises(error.Abort)` but python2.6
	# does not have assertRaises context manager.			# does not have assertRaises context manager.
	try:			try:
	mdiff.blocksinrange(self.blocks, linerange2)			mdiff.blocksinrange(self.blocks, linerange2)
	except exctype as exc:			except exctype as exc:
	self.assertTrue('line range exceeds file size' in str(exc))			self.assertTrue(b'line range exceeds file size' in stringutil.forcebytestr(exc))
	else:			else:
	self.fail('%s not raised' % exctype.__name__)			self.fail('%s not raised' % exctype.__name__)


	if __name__ == '__main__':			if __name__ == '__main__':
	import silenttestrunner			import silenttestrunner

	silenttestrunner.main(__name__)			silenttestrunner.main(__name__)