This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8597

rebase: use merge.graft() instead of merge.update()
Changes PlannedPublic

Authored by martinvonz on May 29 2020, 11:57 AM.

Download Raw Diff

Details

Reviewers

marmoute

Group Reviewers

hg-reviewers

Summary

It's been possible to call merge.graft() here for a while (I don't
remember which of my previous changes made it possible), but it would
have meant that we did a redundant graftcopies() call. With the fix
to make merge.update() record copies in the overlayworkingctx (when
using that), we can now also remove the redundant graftcopies()
call. The next patch will do that.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

martinvonz created this revision.May 29 2020, 11:57 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMay 29 2020, 11:57 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

martinvonz added a child revision: D8598: rebase: drop duplicate call to copies.graftcopies().May 29 2020, 11:57 AM

martinvonz edited parent revisions, added: D8616: merge: chain copies with existing copies in working copy; removed: D8596: merge: mark copies in in-memory context when merging.Jun 5 2020, 9:39 PM

martinvonz edited the summary of this revision. (Show Details)

martinvonz updated this revision to Diff 21565.

This patch seems related to D8596 which @martinvonz pointed as "not meant to be merged". What should we do with this diff ? is it intended for landing ? If not could get we it out of need-review and marke it RFC ?

In D8597#128716, @marmoute wrote:

This patch seems related to D8596 which @martinvonz pointed as "not meant to be merged". What should we do with this diff ? is it intended for landing ? If not could get we it out of need-review and marke it RFC ?

That was on an earlier version of the series; this series is now ready.

Great.

Changes planned to earlier patch in the series

Revision Contents
Changeset List

			Path	Packages
M			hgext/rebase.py (14 lines)

Commit	Parents	Author	Summary	Date
a5aa461fbf3b	8d76a3dadc8f	Martin von Zweigbergk		Jan 13 2020, 8:44 PM

Status	Author	Revision
Changes Planned	martinvonz	D8599 rebase: remove now-unused arguments from rebasenode()
Changes Planned	martinvonz	D8598 rebase: drop duplicate call to copies.graftcopies()
Changes Planned	martinvonz	D8597 rebase: use merge.graft() instead of merge.update()
Changes Planned	martinvonz	D8616 merge: chain copies with existing copies in working copy
Changes Planned	martinvonz	D8595 copies: make _chain() and _filter() public
Changes Planned	martinvonz	D8596 merge: mark copies in in-memory context when merging
Closed	martinvonz	D8615 merge: move an inspection of the dirstate from record to calculate phase

Diff 21565

hgext/rebase.py

	# 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]
	repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx))			repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx))
	if base is not None:			if base is not None:
	repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base]))			repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base]))
				stats = mergemod.graft(
	# See explanation in merge.graft()			repo, ctx, repo[base], labels=[b'dest', b'source'], wctx=wctx,
	mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node())
	stats = mergemod.update(
	repo,
	rev,
	branchmerge=True,
	force=True,
	ancestor=base,
	mergeancestor=mergeancestor,
	labels=[b'dest', b'source'],
	wc=wctx,
	)			)
	wctx.setparents(p1ctx.node(), repo[p2].node())			wctx.setparents(p1ctx.node(), repo[p2].node())
	if collapse:			if collapse:
	copies.graftcopies(wctx, ctx, repo[dest])			copies.graftcopies(wctx, ctx, repo[dest])
	else:			else:
	# If we're not using --collapse, we need to			# If we're not using --collapse, we need to
	# duplicate copies between the revision we're			# duplicate copies between the revision we're
	# rebasing and its first parent.			# rebasing and its first parent.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21526		May 29 2020, 11:57 AM	★	★
Diff 2	21565		Jun 5 2020, 9:39 PM	★	★