This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	20344		Feb 26 2020, 2:14 PM	★	★
Diff 2	20346		Feb 26 2020, 2:16 PM	★	★
Diff 3	20358		Feb 27 2020, 11:35 AM	★	★
Diff 4	20367	rHGa45ffad9ae98d545ba8f68e019511de2be6abaf6	Feb 26 2020, 1:40 PM	★	★

Commit	Parents	Author	Summary	Date
05fb0e9afc2f	2de176a87427	Martin von Zweigbergk		Feb 26 2020, 1:40 PM

Status	Author	Revision
Closed	martinvonz	D8169 tests: use new, use-case-specific methods from merge module
Closed	martinvonz	D8168 merge: introduce a merge() for that use-case
Closed	martinvonz	D8167 merge: drop redundant mergeforce argument from hg.merge()
Closed	martinvonz	D8166 merge: change default of hg.merge()'s "force" argument from None to False

Diff 20346

	displayer.close()			displayer.close()
	return 0			return 0

	# ui.forcemerge is an internal variable, do not document			# ui.forcemerge is an internal variable, do not document
	overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}			overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
	with ui.configoverride(overrides, b'merge'):			with ui.configoverride(overrides, b'merge'):
	force = opts.get(b'force')			force = opts.get(b'force')
	labels = [b'working copy', b'merge rev']			labels = [b'working copy', b'merge rev']
	return hg.merge(			return hg.merge(repo, node, force=force, labels=labels)
				pulkitUnsubmitted Done This seems like unrelated change and should be part of previous patch. pulkit: This seems like unrelated change and should be part of previous patch.
	repo, node, force=force, labels=labels
	)


	statemod.addunfinished(			statemod.addunfinished(
	b'merge',			b'merge',
	fname=None,			fname=None,
	clearable=True,			clearable=True,
	allowcommit=True,			allowcommit=True,
	cmdmsg=_(b'outstanding uncommitted merge'),			cmdmsg=_(b'outstanding uncommitted merge'),

	return ret			return ret


	def merge(			def merge(
	repo, node, force=False, remind=True, labels=None,			repo, node, force=False, remind=True, labels=None,
	):			):
	"""Branch merge with node, resolving changes. Return true if any			"""Branch merge with node, resolving changes. Return true if any
	unresolved conflicts."""			unresolved conflicts."""
	stats = mergemod.update(			stats = mergemod.merge(repo[node], force=force, labels=labels,)
	repo,
	node,
	branchmerge=True,
	force=force,
	mergeforce=force,
	labels=labels,
	)
	_showstats(repo, stats)			_showstats(repo, stats)
	if stats.unresolvedcount:			if stats.unresolvedcount:
	repo.ui.status(			repo.ui.status(
	_(			_(
	b"use 'hg resolve' to retry unresolved file merges "			b"use 'hg resolve' to retry unresolved file merges "
	b"or 'hg merge --abort' to abandon\n"			b"or 'hg merge --abort' to abandon\n"
	)			)
	)			)


	if updatedirstate:			if updatedirstate:
	repo.hook(			repo.hook(
	b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount			b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
	)			)
	return stats			return stats


				def merge(ctx, labels=None, force=False, wc=None):
				"""Merge another topological branch into the working copy.

				force = whether the merge was run with 'merge --force' (deprecated)
				"""

				return update(
				ctx.repo(),
				ctx.rev(),
				labels=labels,
				branchmerge=True,
				force=force,
				mergeforce=force,
				wc=wc,
				)


	def clean_update(ctx, wc=None):			def clean_update(ctx, wc=None):
	"""Do a clean update to the given commit.			"""Do a clean update to the given commit.

	This involves updating to the commit and discarding any changes in the			This involves updating to the commit and discarding any changes in the
	working copy.			working copy.
	"""			"""
	return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)			return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)