This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	19588		Jan 24 2020, 7:16 PM	★	★
Diff 2	19603		Jan 25 2020, 1:05 AM	★	★
Diff 3	19616	rHGbd4f666b55a7a7ed6487fc130b9b6c5033fa4642	Jan 24 2020, 7:07 PM	★	★

Commit	Parents	Author	Summary	Date
58e950058c91	ae08696add6b	Martin von Zweigbergk		Jan 24 2020, 7:07 PM

Status	Author	Revision
Closed	martinvonz	D8000 mq: don't tell user to commit merge that we already committed
Closed	martinvonz	D7999 merge: make hg.merge() take a context instead of a node
Closed	martinvonz	D7998 merge: replace a repo.lookup('.') by more typical repo['.'].node()
Closed	martinvonz	D7997 merge: drop now-unused "abort" argument from hg.merge()
Closed	martinvonz	D7996 merge: don't auto-pick destination with `hg merge 'wdir()'`
Closed	martinvonz	D7995 merge: call hg.abortmerge() directly and return early
Closed	martinvonz	D7994 merge: check that there are no conflicts after --abort
Closed	martinvonz	D7993 merge: use check_incompatible_arguments() for --abort

Diff 19588

	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,			repo, node, force=force, mergeforce=force, labels=labels
	node,
	force=force,
	mergeforce=force,
	labels=labels,
	)			)


	statemod.addunfinished(			statemod.addunfinished(
	b'merge',			b'merge',
	fname=None,			fname=None,
	clearable=True,			clearable=True,
	allowcommit=True,			allowcommit=True,


	if warndest:			if warndest:
	destutil.statusotherdests(ui, repo)			destutil.statusotherdests(ui, repo)

	return ret			return ret


	def merge(			def merge(
	repo,			repo, node, force=None, remind=True, mergeforce=False, labels=None,
	node,
	force=None,
	remind=True,
	mergeforce=False,
	labels=None,
	abort=False,
	):			):
	"""Branch merge with node, resolving changes. Return true if any			"""Branch merge with node, resolving changes. Return true if any
	unresolved conflicts."""			unresolved conflicts."""
	if abort:
	return abortmerge(repo.ui, repo)

	stats = mergemod.update(			stats = mergemod.update(
	repo,			repo,
	node,			node,
	branchmerge=True,			branchmerge=True,
	force=force,			force=force,
	mergeforce=mergeforce,			mergeforce=mergeforce,
	labels=labels,			labels=labels,
	)			)

	== New Features ==			== New Features ==


	== New Experimental Features ==			== New Experimental Features ==


	== Bug Fixes ==			== Bug Fixes ==


	== Backwards Compatibility Changes ==			== Backwards Compatibility Changes ==


	== Internal API Changes ==			== Internal API Changes ==

	* The deprecated `ui.progress()` has now been deleted. Please use			* The deprecated `ui.progress()` has now been deleted. Please use
	`ui.makeprogress()` instead.			`ui.makeprogress()` instead.

				* `hg.merge()` has lost its `abort` argument. Please call
				`hg.abortmerge()` directly instead.