This is an archive of the discontinued Mercurial Phabricator instance.

ui: coerce system exception to bytes before dropping it in our StdioError
ClosedPublic

Authored by durin42 on Feb 13 2018, 7:13 PM.

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

Summary

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

This revision is now accepted and ready to land.Feb 14 2018, 12:06 AM

This revision was automatically updated to reflect the committed changes.

This breaks test-basic.t and is wrong because StdioError is an IOError,
which takes a system string.

@@ -36,10 +36,10 @@

 #if devfull
   $ hg status >/dev/full 2>&1
-  [255]
+  [1]

   $ hg status ENOENT 2>/dev/full
-  [255]
+  [1]
 #endif

I'll drop this from hg-committed.

			Path	Packages
M			mercurial/ui.py (2 lines)

Status	Author	Revision
Closed	durin42	D2249 py3: whitelist more passing tests
Closed	durin42	D2248 tests: port fakemergerecord to python3
Closed	durin42	D2247 tests: add some b-prefixes on local script in test-histedit-arguments
Closed	durin42	D2246 tests: add bytes prefixes to test-histedit-fold.t's local extension
Closed	durin42	D2245 ui: coerce system exception to bytes before dropping it in our StdioError
Closed	durin42	D2244 histedit: binascii.unhexlify (aka node.bin) throws new exception type on py3
Closed	durin42	D2243 histedit: fix silly bug that was unpacking a bytestr before writing it
Closed	durin42	D2242 py3: whitelist another 8 passing tests
Closed	durin42	D2241 histedit: modernize write of histedit-last-edit file
Closed	durin42	D2240 histedit: convert bool to bytestring manually
Closed	durin42	D2239 narrowcommands: more byteskwargs cleanup
Closed	durin42	D2238 narrowmerge: iterate over a copy of dict items so we can mutate the dict

	for a in msgs:			for a in msgs:
	self.ferr.write(a)			self.ferr.write(a)
	# stderr may be buffered under win32 when redirected to files,			# stderr may be buffered under win32 when redirected to files,
	# including stdout.			# including stdout.
	if not getattr(self.ferr, 'closed', False):			if not getattr(self.ferr, 'closed', False):
	self.ferr.flush()			self.ferr.flush()
	except IOError as inst:			except IOError as inst:
	if inst.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):			if inst.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
	raise error.StdioError(inst)			raise error.StdioError(pycompat.bytestr(inst))

	def flush(self):			def flush(self):
	# opencode timeblockedsection because this is a critical path			# opencode timeblockedsection because this is a critical path
	starttime = util.timer()			starttime = util.timer()
	try:			try:
	try:			try:
	self.fout.flush()			self.fout.flush()
	except IOError as err:			except IOError as err: