This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D3140 rebase: remove unnecessary and incorrect handling of nullid
Closed	martinvonz	D3139 rebase: convert "oldrev" to revnum earlier
Closed	martinvonz	D3138 rebase: make "destnode" consistently a revnum and rename it to "destrev"

Diff 7739

	activebookmark = l			activebookmark = l
	else:			else:
	args = l.split(':')			args = l.split(':')
	oldrev = args[0]			oldrev = args[0]
	newrev = args[1]			newrev = args[1]
	if newrev in legacystates:			if newrev in legacystates:
	continue			continue
	if len(args) > 2:			if len(args) > 2:
	destnode = args[2]			destrev = repo[args[2]].rev()
	else:			else:
	destnode = legacydest			destrev = legacydest
	destmap[repo[oldrev].rev()] = repo[destnode].rev()			destmap[repo[oldrev].rev()] = destrev
	if newrev in (nullid, revtodostr):			if newrev in (nullid, revtodostr):
	state[repo[oldrev].rev()] = revtodo			state[repo[oldrev].rev()] = revtodo
	# Legacy compat special case			# Legacy compat special case
	else:			else:
	state[repo[oldrev].rev()] = repo[newrev].rev()			state[repo[oldrev].rev()] = repo[newrev].rev()

	except IOError as err:			except IOError as err:
	if err.errno != errno.ENOENT:			if err.errno != errno.ENOENT: