This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	19565		Jan 24 2020, 5:01 PM	★	★
Diff 2	19581		Jan 24 2020, 6:34 PM	★	★
Diff 3	19684	rHG4c90001a60841e62162b5d312bb9dba4669fb6ce	Jan 22 2020, 7:45 PM	★	★

Commit	Parents	Author	Summary	Date
e7bc96b20a97	afd6fe012271	Martin von Zweigbergk		Jan 22 2020, 7:45 PM

Status	Author	Revision
Closed	martinvonz	D7974 merge: when rename was made on both sides, use ancestor as merge base
Closed	martinvonz	D7990 merge: start using the per-side copy dicts
Closed	martinvonz	D7989 copies: define a type to return from mergecopies()
Closed	martinvonz	D7988 merge: move initialization of copy dicts to one place
Closed	martinvonz	D7987 copies: print debug information about copies per side/branch
Closed	martinvonz	D7986 copies: make mergecopies() distinguish between copies on each side
Closed	martinvonz	D7977 copies: extract function for finding directory renames
Closed	martinvonz	D7976 copies: avoid calculating debug-only stuff without --debug
Closed	martinvonz	D7975 copies: move early return in mergecopies() earlier
Closed	martinvonz	D7985 tests: test merge of renames of different sources to same target

Diff 19581


	branchmerge and force are as passed in to update			branchmerge and force are as passed in to update
	matcher = matcher to filter file lists			matcher = matcher to filter file lists
	acceptremote = accept the incoming changes without prompting			acceptremote = accept the incoming changes without prompting
	"""			"""
	if matcher is not None and matcher.always():			if matcher is not None and matcher.always():
	matcher = None			matcher = None

	copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {}

	# manifests fetched in order are going to be faster, so prime the caches			# manifests fetched in order are going to be faster, so prime the caches
	[			[
	x.manifest()			x.manifest()
	for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)			for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)
	]			]

				copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {}
	if followcopies:			if followcopies:
	ret = copies.mergecopies(repo, wctx, p2, pa)			ret = copies.mergecopies(repo, wctx, p2, pa)
	copy, movewithdir, diverge, renamedelete, dirmove = ret			copy, movewithdir, diverge, renamedelete, dirmove = ret

	boolbm = pycompat.bytestr(bool(branchmerge))			boolbm = pycompat.bytestr(bool(branchmerge))
	boolf = pycompat.bytestr(bool(force))			boolf = pycompat.bytestr(bool(force))
	boolm = pycompat.bytestr(bool(matcher))			boolm = pycompat.bytestr(bool(matcher))
	repo.ui.note(_(b"resolving manifests\n"))			repo.ui.note(_(b"resolving manifests\n"))