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 5683

	# Extension to write out fake unsupported records into the merge state			# Extension to write out fake unsupported records into the merge state
	#			#
	#			#

	from __future__ import absolute_import			from __future__ import absolute_import

	from mercurial import (			from mercurial import (
	merge,			merge,
	registrar,			registrar,
	)			)

	cmdtable = {}			cmdtable = {}
	command = registrar.command(cmdtable)			command = registrar.command(cmdtable)

	@command('fakemergerecord',			@command(b'fakemergerecord',
	[('X', 'mandatory', None, 'add a fake mandatory record'),			[(b'X', b'mandatory', None, b'add a fake mandatory record'),
	('x', 'advisory', None, 'add a fake advisory record')], '')			(b'x', b'advisory', None, b'add a fake advisory record')], '')
	def fakemergerecord(ui, repo, pats, *opts):			def fakemergerecord(ui, repo, pats, *opts):
	with repo.wlock():			with repo.wlock():
	ms = merge.mergestate.read(repo)			ms = merge.mergestate.read(repo)
	records = ms._makerecords()			records = ms._makerecords()
	if opts.get('mandatory'):			if opts.get('mandatory'):
	records.append(('X', 'mandatory record'))			records.append((b'X', b'mandatory record'))
	if opts.get('advisory'):			if opts.get('advisory'):
	records.append(('x', 'advisory record'))			records.append((b'x', b'advisory record'))
	ms._writerecords(records)			ms._writerecords(records)