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 17451

	return 1 if err else 0			return 1 if err else 0


	def _handleunavailable(ui, state, ex):			def _handleunavailable(ui, state, ex):
	"""Exception handler for Watchman interaction exceptions"""			"""Exception handler for Watchman interaction exceptions"""
	if isinstance(ex, watchmanclient.Unavailable):			if isinstance(ex, watchmanclient.Unavailable):
	# experimental config: fsmonitor.verbose			# experimental config: fsmonitor.verbose
	if ex.warn and ui.configbool(b'fsmonitor', b'verbose'):			if ex.warn and ui.configbool(b'fsmonitor', b'verbose'):
	if b'illegal_fstypes' not in str(ex):			if b'illegal_fstypes' not in forcebytestr(ex):
	ui.warn(str(ex) + b'\n')			ui.warn(forcebytestr(ex) + b'\n')
	if ex.invalidate:			if ex.invalidate:
	state.invalidate()			state.invalidate()
	# experimental config: fsmonitor.verbose			# experimental config: fsmonitor.verbose
	if ui.configbool(b'fsmonitor', b'verbose'):			if ui.configbool(b'fsmonitor', b'verbose'):
	ui.log(b'fsmonitor', b'Watchman unavailable: %s\n', ex.msg)			ui.log(b'fsmonitor', b'Watchman unavailable: %s\n', ex.msg)
	else:			else:
	ui.log(b'fsmonitor', b'Watchman exception: %s\n', ex)			ui.log(b'fsmonitor', b'Watchman exception: %s\n', ex)