This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D2511 py3: add 14 new passing tests to whitelist
Closed	pulkit	D2510 py3: add b'' prefixes in tests/test-rollback.t
Closed	pulkit	D2509 py3: add b'' prefix in tests/test-revlog-v2.t
Closed	pulkit	D2508 py3: add b'' prefixes in tests/test-revlog.t
Closed	pulkit	D2507 py3: make sure we open the file in bytes mode
Closed	pulkit	D2506 py3: add b'' prefixes in tests/test-revlog-ancestry.py
Closed	pulkit	D2505 py3: port the markdirver extension in tests/test-resolve.t
Closed	pulkit	D2504 py3: backout changeset 56635c506608 which wrongly added couple of b''
Closed	pulkit	D2503 py3: add a missing b'' in tests/bruterebase.py
Closed	pulkit	D2502 py3: use '%d' for integers instead of b'%s'
Closed	pulkit	D2501 py3: make sure we write in mergestate in bytes mode
Closed	pulkit	D2500 py3: add b'' prefixes in tests/test-rebase-scenario-global.t
Closed	pulkit	D2499 py3: replace str() calls with their preferred bytes equivalent
Closed	pulkit	D2498 py3: use util.forcebytestr to convert str to bytes
Closed	pulkit	D2497 py3: convert error messages to bytes using util.forcebytestr()
Closed	pulkit	D2496 py3: slice over bytes or use startswith() to prevent getting ascii values

Diff 6234

	for p in repo[rev].parents():			for p in repo[rev].parents():
	if (p.rev() not in state			if (p.rev() not in state
	and p.rev() not in destancestors):			and p.rev() not in destancestors):
	parents.add(p.rev())			parents.add(p.rev())
	if not parents:			if not parents:
	return nullrev			return nullrev
	if len(parents) == 1:			if len(parents) == 1:
	return parents.pop()			return parents.pop()
	raise error.Abort(_('unable to collapse on top of %s, there is more '			raise error.Abort(_('unable to collapse on top of %d, there is more '
	'than one external parent: %s') %			'than one external parent: %s') %
	(max(destancestors),			(max(destancestors),
	', '.join("%d" % p for p in sorted(parents))))			', '.join("%d" % p for p in sorted(parents))))

	def concludememorynode(repo, rev, p1, p2, wctx=None,			def concludememorynode(repo, rev, p1, p2, wctx=None,
	commitmsg=None, editor=None, extrafn=None,			commitmsg=None, editor=None, extrafn=None,
	keepbranches=False, date=None):			keepbranches=False, date=None):
	'''Commit the memory changes with parents p1 and p2. Reuse commit info from			'''Commit the memory changes with parents p1 and p2. Reuse commit info from