This is an archive of the discontinued Mercurial Phabricator instance.

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

Diff 5667

	repo = self.repo			repo = self.repo
	rulectx = repo[self.node]			rulectx = repo[self.node]
	repo.ui.pushbuffer(error=True, labeled=True)			repo.ui.pushbuffer(error=True, labeled=True)
	hg.update(repo, self.state.parentctxnode, quietempty=True)			hg.update(repo, self.state.parentctxnode, quietempty=True)
	stats = applychanges(repo.ui, repo, rulectx, {})			stats = applychanges(repo.ui, repo, rulectx, {})
	repo.dirstate.setbranch(rulectx.branch())			repo.dirstate.setbranch(rulectx.branch())
	if stats and stats[3] > 0:			if stats and stats[3] > 0:
	buf = repo.ui.popbuffer()			buf = repo.ui.popbuffer()
	repo.ui.write(*buf)			repo.ui.write(buf)
	raise error.InterventionRequired(			raise error.InterventionRequired(
	_('Fix up the change (%s %s)') %			_('Fix up the change (%s %s)') %
	(self.verb, node.short(self.node)),			(self.verb, node.short(self.node)),
	hint=_('hg histedit --continue to resume'))			hint=_('hg histedit --continue to resume'))
	else:			else:
	repo.ui.popbuffer()			repo.ui.popbuffer()

	def continuedirty(self):			def continuedirty(self):