This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D2262 py3: add couple of missing b'' in fakemergerecord.py
Closed	pulkit	D2261 py3: use pycompat.bytestr to convert str to bytes
Closed	pulkit	D2260 py3: add b'' to make sure regex pattern are bytes in hgweb/webutil.py
Abandoned	pulkit	D2259 py3: use pycompat.bytestr to convert int/bytes to bytes
Closed	pulkit	D2258 py3: add b'' prefixes in test-worker.t
Closed	pulkit	D2257 py3: add b'' prefixes to make printrevset.py work in test-glog.t
Closed	pulkit	D2256 py3: slice over bytes to prevent getting ascii values

Diff 5702


	@command(b'fakemergerecord',			@command(b'fakemergerecord',
	[(b'X', b'mandatory', None, b'add a fake mandatory record'),			[(b'X', b'mandatory', None, b'add a fake mandatory record'),
	(b'x', b'advisory', None, b'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(b'mandatory'):
	records.append((b'X', b'mandatory record'))			records.append((b'X', b'mandatory record'))
	if opts.get('advisory'):			if opts.get(b'advisory'):
	records.append((b'x', b'advisory record'))			records.append((b'x', b'advisory record'))
	ms._writerecords(records)			ms._writerecords(records)