This is an archive of the discontinued Mercurial Phabricator instance.

mercurial/merge.py
299	I initially wrote a comment that `mresult` is likely always defined but see that `None` can be passed in. Do you think it makes more sense to pass in an empty merge result instance instead of `None`? That seems to be the pattern elsewhere in this merge code refactor. (This could be done as a follow-up, of course.)

This revision is now accepted and ready to land.Aug 8 2020, 12:03 PM

pulkit added a commit: rHGf569ca3eb430: merge: pass mergeresult obj instead of actions in _checkcollision() (API).Aug 8 2020, 12:55 PM

Closed by commit rHGf569ca3eb430: merge: pass mergeresult obj instead of actions in _checkcollision() (API) (authored by pulkit). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (55 lines)

Commit	Parents	Author	Summary	Date
54bc30e022fb	dc283bc7e033	Pulkit Goyal		Aug 3 2020, 4:00 AM

Status	Author	Revision
Closed	pulkit	D8904 merge: drop commitinfo argument to applyupdates (API)
Closed	pulkit	D8903 merge: remove emptyactions() and use collections.defaultdict(list) instead
Closed	pulkit	D8889 merge: pass mergeresult obj in _forgetremoved() (API)
Closed	pulkit	D8888 mergeresult: introduce filemap() which yields filename based mapping
Closed	pulkit	D8887 mergeresult: add `files()` and use it
Closed	pulkit	D8886 mergeresult: introduce getfile() and use it where required
Closed	pulkit	D8885 merge: use ACTION_* constants instead of values in _filternarrowactions()
Closed	pulkit	D8884 merge: rework iteration over mergeresult object in checkpathconflicts()
Closed	pulkit	D8883 applyupdates: simplfy calculation of number of updated files
Closed	pulkit	D8882 mergeresult: yield from getactions() instead of buidling a list and returning
Closed	pulkit	D8881 sparse: replace merge action values with mergestate.ACTION_* constants
Closed	pulkit	D8880 mergeresult: implement a len() function and use it
Closed	pulkit	D8879 merge: replace use of actions dict with mergeresult object
Closed	pulkit	D8878 mergeresult: add sort argument to getactions() method
Closed	pulkit	D8877 merge: pass mergeresult obj in merge._prefetchfiles()
Closed	pulkit	D8876 merge: pass mergeresult obj instead of actions in applyupdates() (API)
Closed	pulkit	D8875 merge: pass mergeresult obj instead of actions in _checkcollision() (API)

Diff 22256

mercurial/merge.py

	mergestatemod.ACTION_FORGET,			mergestatemod.ACTION_FORGET,
	None,			None,
	b"forget removed",			b"forget removed",
	)			)

	return actions			return actions


	def _checkcollision(repo, wmf, actions):			def _checkcollision(repo, wmf, mresult):
	"""			"""
	Check for case-folding collisions.			Check for case-folding collisions.
	"""			"""
	# If the repo is narrowed, filter out files outside the narrowspec.			# If the repo is narrowed, filter out files outside the narrowspec.
	narrowmatch = repo.narrowmatch()			narrowmatch = repo.narrowmatch()
	if not narrowmatch.always():			if not narrowmatch.always():
	pmmf = set(wmf.walk(narrowmatch))			pmmf = set(wmf.walk(narrowmatch))
	if actions:			if mresult:
				indygregUnsubmitted Not Done I initially wrote a comment that `mresult` is likely always defined but see that `None` can be passed in. Do you think it makes more sense to pass in an empty merge result instance instead of `None`? That seems to be the pattern elsewhere in this merge code refactor. (This could be done as a follow-up, of course.) indygreg: I initially wrote a comment that `mresult` is likely always defined but see that `None` can be…
	narrowactions = {}			for f, actionsfortype in pycompat.iteritems(mresult.actions):
	for m, actionsfortype in pycompat.iteritems(actions):			if not narrowmatch(f):
	narrowactions[m] = []			mresult.removefile(f)
	for (f, args, msg) in actionsfortype:
	if narrowmatch(f):
	narrowactions[m].append((f, args, msg))
	actions = narrowactions
	else:			else:
	# build provisional merged manifest up			# build provisional merged manifest up
	pmmf = set(wmf)			pmmf = set(wmf)

	if actions:			if mresult:
	# KEEP and EXEC are no-op			# KEEP and EXEC are no-op
	for m in (			for f, args, msg in mresult.getactions(
				(
	mergestatemod.ACTION_ADD,			mergestatemod.ACTION_ADD,
	mergestatemod.ACTION_ADD_MODIFIED,			mergestatemod.ACTION_ADD_MODIFIED,
	mergestatemod.ACTION_FORGET,			mergestatemod.ACTION_FORGET,
	mergestatemod.ACTION_GET,			mergestatemod.ACTION_GET,
	mergestatemod.ACTION_CHANGED_DELETED,			mergestatemod.ACTION_CHANGED_DELETED,
	mergestatemod.ACTION_DELETED_CHANGED,			mergestatemod.ACTION_DELETED_CHANGED,
				)
	):			):
	for f, args, msg in actions[m]:
	pmmf.add(f)			pmmf.add(f)
	for f, args, msg in actions[mergestatemod.ACTION_REMOVE]:			for f, args, msg in mresult.getactions([mergestatemod.ACTION_REMOVE]):
	pmmf.discard(f)			pmmf.discard(f)
	for f, args, msg in actions[mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL]:			for f, args, msg in mresult.getactions(
				[mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL]
				):
	f2, flags = args			f2, flags = args
	pmmf.discard(f2)			pmmf.discard(f2)
	pmmf.add(f)			pmmf.add(f)
	for f, args, msg in actions[mergestatemod.ACTION_LOCAL_DIR_RENAME_GET]:			for f, args, msg in mresult.getactions(
				[mergestatemod.ACTION_LOCAL_DIR_RENAME_GET]
				):
	pmmf.add(f)			pmmf.add(f)
	for f, args, msg in actions[mergestatemod.ACTION_MERGE]:			for f, args, msg in mresult.getactions([mergestatemod.ACTION_MERGE]):
	f1, f2, fa, move, anc = args			f1, f2, fa, move, anc = args
	if move:			if move:
	pmmf.discard(f1)			pmmf.discard(f1)
	pmmf.add(f)			pmmf.add(f)

	# check case-folding collision in provisional merged manifest			# check case-folding collision in provisional merged manifest
	foldmap = {}			foldmap = {}
	for f in pmmf:			for f in pmmf:
	f,			f,
	mergestatemod.ACTION_GET,			mergestatemod.ACTION_GET,
	(flags, False),			(flags, False),
	b'prompt recreating',			b'prompt recreating',
	)			)
	else:			else:
	mresult.removefile(f)			mresult.removefile(f)

	# Convert to dictionary-of-lists format
	actions = mresult.actionsdict

	if not util.fscasesensitive(repo.path):			if not util.fscasesensitive(repo.path):
	# check collision between files only in p2 for clean update			# check collision between files only in p2 for clean update
	if not branchmerge and (			if not branchmerge and (
	force or not wc.dirty(missing=True, branch=False)			force or not wc.dirty(missing=True, branch=False)
	):			):
	_checkcollision(repo, p2.manifest(), None)			_checkcollision(repo, p2.manifest(), None)
	else:			else:
	_checkcollision(repo, wc.manifest(), actions)			_checkcollision(repo, wc.manifest(), mresult)

	# divergent renames			# divergent renames
	for f, fl in sorted(pycompat.iteritems(mresult.diverge)):			for f, fl in sorted(pycompat.iteritems(mresult.diverge)):
	repo.ui.warn(			repo.ui.warn(
	_(			_(
	b"note: possible conflict - %s was renamed "			b"note: possible conflict - %s was renamed "
	b"multiple times to:\n"			b"multiple times to:\n"
	)			)
	# the dirstate.			# the dirstate.
	always = matcher is None or matcher.always()			always = matcher is None or matcher.always()
	updatedirstate = updatedirstate and always and not wc.isinmemory()			updatedirstate = updatedirstate and always and not wc.isinmemory()
	if updatedirstate:			if updatedirstate:
	repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)			repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
	# note that we're in the middle of an update			# note that we're in the middle of an update
	repo.vfs.write(b'updatestate', p2.hex())			repo.vfs.write(b'updatestate', p2.hex())

				# Convert to dictionary-of-lists format
				actions = mresult.actionsdict

	_advertisefsmonitor(			_advertisefsmonitor(
	repo, len(actions[mergestatemod.ACTION_GET]), p1.node()			repo, len(actions[mergestatemod.ACTION_GET]), p1.node()
	)			)

	wantfiledata = updatedirstate and not branchmerge			wantfiledata = updatedirstate and not branchmerge
	stats, getfiledata = applyupdates(			stats, getfiledata = applyupdates(
	repo,			repo,
	actions,			actions,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22256		Aug 5 2020, 4:50 AM	★	★
Diff 2	22333	rHGf569ca3eb430edb494f2b79e576959445be3cd19	Aug 3 2020, 4:00 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

merge: pass mergeresult obj instead of actions in _checkcollision() (API)ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22256

mercurial/merge.py

merge: pass mergeresult obj instead of actions in _checkcollision() (API)
ClosedPublic

Revision Contents
Changeset List