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 19333

	# 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]))
	# When collapsing in-place, the parent is the common ancestor, we
	# have to allow merging with it.			# See explanation in merge.graft()
				mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node())
	stats = mergemod.update(			stats = mergemod.update(
	repo,			repo,
	rev,			rev,
	branchmerge=True,			branchmerge=True,
	force=True,			force=True,
	ancestor=base,			ancestor=base,
	mergeancestor=collapse,			mergeancestor=mergeancestor,
	labels=[b'dest', b'source'],			labels=[b'dest', b'source'],
	wc=wctx,			wc=wctx,
	)			)
	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

	> \|\\|			> \|\\|
	> I C B			> I C B
	> \\|/			> \\|/
	> A			> A
	> EOF			> EOF

	$ hg rebase -s F --dest I --collapse # root (F) is not a merge			$ hg rebase -s F --dest I --collapse # root (F) is not a merge
	rebasing 6:c82b08f646f1 "F" (F)			rebasing 6:c82b08f646f1 "F" (F)
				file 'E' was deleted in local [dest] but was modified in other [source].
				You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
				What do you want to do? u
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ echo F > E
				$ hg resolve -m
				(no more unresolved files)
				continue: hg rebase --continue
				$ hg rebase -c
				rebasing 6:c82b08f646f1 "F" (F)
	rebasing 7:a6db7fa104e1 "G" (G)			rebasing 7:a6db7fa104e1 "G" (G)
	rebasing 8:e1d201b72d91 "H" (H tip)			rebasing 8:e1d201b72d91 "H" (H tip)
	saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg			saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg

	$ hg tglog			$ hg tglog
	o 6: 681daa3e686d 'Collapsed revision			o 6: 681daa3e686d 'Collapsed revision
	\|\ * F			\|\ * F
	\| \| * G			\| \| * G