This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D7899 merge: define updatedirstate a little earlier and reuse it
Closed	martinvonz	D7898 merge: don't call update hook when using in-memory context
Closed	martinvonz	D7897 rebase: fix bug where `--collapse` would apply diff on missing file
Closed	martinvonz	D7896 rebase: extract a variable for a repeated `repo[p1]`
Closed	martinvonz	D7861 graftcopies: document why the function is useful at all
Closed	martinvonz	D7860 graftcopies: remove `skip` and `repo` arguments
Closed	martinvonz	D7859 graftcopies: use _filter() for filtering out invalid copies
Closed	martinvonz	D7858 copies: replace duplicatecopies() by function that takes contexts
Closed	martinvonz	D7857 graft: extract repo[None] to a variable

Diff 19373

	repo.dirstate.setbranch(repo[newnode].branch())			repo.dirstate.setbranch(repo[newnode].branch())
	return newnode			return newnode


	def rebasenode(repo, rev, p1, base, collapse, dest, wctx):			def rebasenode(repo, rev, p1, base, collapse, dest, wctx):
	"""Rebase a single revision rev on top of p1 using base as merge ancestor"""			"""Rebase a single revision rev on top of p1 using base as merge ancestor"""
	# Merge phase			# Merge phase
	# Update to destination and merge it with local			# Update to destination and merge it with local
				p1ctx = repo[p1]
	if wctx.isinmemory():			if wctx.isinmemory():
	wctx.setbase(repo[p1])			wctx.setbase(p1ctx)
	else:			else:
	if repo[b'.'].rev() != p1:			if repo[b'.'].rev() != p1:
	repo.ui.debug(b" update to %d:%s\n" % (p1, repo[p1]))			repo.ui.debug(b" update to %d:%s\n" % (p1, p1ctx))
	mergemod.update(repo, p1, branchmerge=False, force=True)			mergemod.update(repo, p1, branchmerge=False, force=True)
	else:			else:
	repo.ui.debug(b" already in destination\n")			repo.ui.debug(b" already in destination\n")
	# This is, alas, necessary to invalidate workingctx's manifest cache,			# This is, alas, necessary to invalidate workingctx's manifest cache,
	# as well as other data we litter on it in other places.			# as well as other data we litter on it in other places.
	wctx = repo[None]			wctx = repo[None]
	repo.dirstate.write(repo.currenttransaction())			repo.dirstate.write(repo.currenttransaction())
	ctx = repo[rev]			ctx = repo[rev]