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 5674

	repo, wctx, p2, pa, branchmerge, args, *kwargs)			repo, wctx, p2, pa, branchmerge, args, *kwargs)

	if not util.safehasattr(repo, 'narrowmatch'):			if not util.safehasattr(repo, 'narrowmatch'):
	return actions, diverge, renamedelete			return actions, diverge, renamedelete

	nooptypes = set(['k']) # TODO: handle with nonconflicttypes			nooptypes = set(['k']) # TODO: handle with nonconflicttypes
	nonconflicttypes = set('a am c cm f g r e'.split())			nonconflicttypes = set('a am c cm f g r e'.split())
	narrowmatch = repo.narrowmatch()			narrowmatch = repo.narrowmatch()
	for f, action in actions.items():			# We mutate the items in the dict during iteration, so iterate
				# over a copy.
				for f, action in list(actions.items()):
	if narrowmatch(f):			if narrowmatch(f):
	pass			pass
	elif not branchmerge:			elif not branchmerge:
	del actions[f] # just updating, ignore changes outside clone			del actions[f] # just updating, ignore changes outside clone
	elif action[0] in nooptypes:			elif action[0] in nooptypes:
	del actions[f] # merge does not affect file			del actions[f] # merge does not affect file
	elif action[0] in nonconflicttypes:			elif action[0] in nonconflicttypes:
	raise error.Abort(_('merge affects file \'%s\' outside narrow, '			raise error.Abort(_('merge affects file \'%s\' outside narrow, '