This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D12085 relnotes: add note about changed labels texts
Closed	martinvonz	D12025 graft: attempt to make merge labels more helpful
Closed	martinvonz	D12024 shelve: attempt to make merge labels more helpful
Closed	martinvonz	D12023 histedit: attempt to make merge labels more helpful
Closed	martinvonz	D12022 update: set custom conflict label for base commit
Closed	martinvonz	D12021 merge: set custom conflict label for base commit
Closed	martinvonz	D12020 rebase: set custom conflict label for base commit
Closed	martinvonz	D12019 simplemerge: take over formatting of label from `filemerge`
Closed	martinvonz	D12018 filemerge: pass `simplemerge.MergeInput` to tool functions
Closed	martinvonz	D12017 filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Closed	martinvonz	D12016 filemerge: always define a "base" label
Closed	martinvonz	D12015 filemerge: set default labels a little earlier
Closed	martinvonz	D12014 filemerge: remove unused arguments from `_merge()`
Closed	martinvonz	D12013 simplemerge: take arguments as annotated context objects
Closed	martinvonz	D12012 filemerge: make `labels` a required arg for `_premerge()`
Closed	martinvonz	D12011 filemerge: remove unnecessary check for empty string
Closed	martinvonz	D12010 tests: also test spaces in conflict marker labels

Diff 31723

	cmdutil.revert(ui, repo, ctx, all=True)			cmdutil.revert(ui, repo, ctx, all=True)
	stats = mergemod.updateresult(0, 0, 0, 0)			stats = mergemod.updateresult(0, 0, 0, 0)
	else:			else:
	try:			try:
	# ui.forcemerge is an internal variable, do not document			# ui.forcemerge is an internal variable, do not document
	repo.ui.setconfig(			repo.ui.setconfig(
	b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'			b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
	)			)
	stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit'])			stats = mergemod.graft(
				repo,
				ctx,
				labels=[
				b'already edited',
				b'current change',
				b'parent of current change',
				],
				)
	finally:			finally:
	repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')			repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
	return stats			return stats


	def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False):			def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False):
	"""collapse the set of revisions from first to last as new one.			"""collapse the set of revisions from first to last as new one.

	merging e			merging e
	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')			warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
	Fix up the change (pick e860deea161a)			Fix up the change (pick e860deea161a)
	(hg histedit --continue to resume)			(hg histedit --continue to resume)

	insert unsupported advisory merge record			insert unsupported advisory merge record
	$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x			$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
	$ hg debugmergestate			$ hg debugmergestate
	local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758			local (already edited): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
	other (histedit): e860deea161a2f77de56603b340ebbb4536308ae			other (current change): e860deea161a2f77de56603b340ebbb4536308ae
	file: e (state "u")			file: e (state "u")
	local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "")			local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "")
	ancestor path: e (node 0000000000000000000000000000000000000000)			ancestor path: e (node 0000000000000000000000000000000000000000)
	other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)			other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)
	extra: ancestorlinknode = 0000000000000000000000000000000000000000			extra: ancestorlinknode = 0000000000000000000000000000000000000000
	extra: merged = yes			extra: merged = yes
	$ hg resolve -l			$ hg resolve -l
	U e			U e