This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8817

merge: move conversion of file-key dict to action-key dict in mergeresult
ClosedPublic

Authored by pulkit on Jul 25 2020, 5:59 AM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGf4a2b329717b: merge: move conversion of file-key dict to action-key dict in mergeresult

Summary

Initially the actions dict which we get has file has keys, but later we want a
dict which has actions as keys. This patch moves code computing that to
mergeresult class as that's where it should be anyway.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

pulkit created this revision.Jul 25 2020, 5:59 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 25 2020, 5:59 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

pulkit added a child revision: D8818: merge: improve documentation of fbid dict used for merge bid.Jul 25 2020, 5:59 AM

indygreg accepted this revision.Aug 2 2020, 12:56 PM

indygreg added a subscriber: indygreg.

indygreg added inline comments.

mercurial/merge.py
590	Nit: a more concise way of writing this is `actions.setdefault(m, []).append((f, args, msg))`
1824	Thank you for removing this alias.

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

pulkit added a commit: rHGf4a2b329717b: merge: move conversion of file-key dict to action-key dict in mergeresult.Aug 2 2020, 1:43 PM

Closed by commit rHGf4a2b329717b: merge: move conversion of file-key dict to action-key dict in mergeresult (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 (35 lines)

Commit	Parents	Author	Summary	Date
90aa9c3e8a0e	b96b39636881	Pulkit Goyal		Jul 24 2020, 5:15 AM

Status	Author	Revision
Closed	pulkit	D8837 mergeresult: make actionmapping a dict of dict instead of dict of lists
Closed	pulkit	D8836 largefiles: introduce a constant for 'lfmr' action
Closed	pulkit	D8835 largefiles: override merge.emptyactions() to include `lfmr`
Closed	pulkit	D8834 merge: unify logic of couple of if-else's in manifestmerge()
Closed	pulkit	D8833 sparse: add comment for an if condition which I tried to refactor
Closed	pulkit	D8832 mergeactions: use action constants instead of string values
Closed	pulkit	D8831 merge: use the new action based mapping introduced in mergeresult obj
Closed	pulkit	D8830 mergeresult: introduce action -> (filename, data, msg) mapping and related API
Closed	pulkit	D8829 mergeresult: rename _actions to _filemapping
Closed	pulkit	D8828 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
Closed	pulkit	D8827 merge: filter actions before calling _resolvetrivial()
Closed	pulkit	D8826 merge: introduce mergeresult.updateactions() and use it
Closed	pulkit	D8825 merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
Closed	pulkit	D8824 merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
Closed	pulkit	D8823 merge: pass mergeresult obj instead of actions in _filternarrowactions()
Closed	pulkit	D8822 merge: pass mergeresult in checkpassconflicts() instead of actions (API)
Closed	pulkit	D8821 merge: add removefile() to mergeresult object
Closed	pulkit	D8820 merge: introduce mergeresult.addfile() and use it
Closed	pulkit	D8819 merge: make mergeresult constructor initialize empty object
Closed	pulkit	D8818 merge: improve documentation of fbid dict used for merge bid
Closed	pulkit	D8817 merge: move conversion of file-key dict to action-key dict in mergeresult
Closed	pulkit	D8816 merge: introduce hasconflicts() on mergeresult object
Closed	pulkit	D8744 merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Closed	pulkit	D8743 merge: pass commitinfo to applyupdates() and get it stored in mergestate
Closed	pulkit	D8742 merge: introduce 'commitinfo' in mergeresult
Closed	pulkit	D8799 merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)

Diff 22101

mercurial/merge.py

	@property			@property
	def renamedelete(self):			def renamedelete(self):
	return self._renamedelete			return self._renamedelete

	@property			@property
	def commitinfo(self):			def commitinfo(self):
	return self._commitinfo			return self._commitinfo

				@property
				def actionsdict(self):
				""" returns a dictionary of actions to be perfomed with action as key
				and a list of files and related arguments as values """
				# Convert to dictionary-of-lists format
				actions = emptyactions()
				for f, (m, args, msg) in pycompat.iteritems(self._actions):
				if m not in actions:
				actions[m] = []
				actions[m].append((f, args, msg))
				indygregUnsubmitted Not Done Nit: a more concise way of writing this is `actions.setdefault(m, []).append((f, args, msg))` indygreg: Nit: a more concise way of writing this is `actions.setdefault(m, []).append((f, args, msg))`

				return actions

	def setactions(self, actions):			def setactions(self, actions):
	self._actions = actions			self._actions = actions

	def hasconflicts(self):			def hasconflicts(self):
	""" tells whether this merge resulted in some actions which can			""" tells whether this merge resulted in some actions which can
	result in conflicts or not """			result in conflicts or not """
	for _, (m, _, _) in pycompat.iteritems(self._actions):			for _, (m, _, _) in pycompat.iteritems(self._actions):
	if m not in (			if m not in (
	branchmerge,			branchmerge,
	force,			force,
	mergeancestor,			mergeancestor,
	followcopies,			followcopies,
	matcher=matcher,			matcher=matcher,
	mergeforce=mergeforce,			mergeforce=mergeforce,
	)			)

	actionbyfile = mresult.actions
	indygregUnsubmitted Not Done Thank you for removing this alias. indygreg: Thank you for removing this alias.

	if updatecheck == UPDATECHECK_NO_CONFLICT:			if updatecheck == UPDATECHECK_NO_CONFLICT:
	if mresult.hasconflicts():			if mresult.hasconflicts():
	msg = _(b"conflicting changes")			msg = _(b"conflicting changes")
	hint = _(b"commit or update --clean to discard changes")			hint = _(b"commit or update --clean to discard changes")
	raise error.Abort(msg, hint=hint)			raise error.Abort(msg, hint=hint)

	# Prompt and create actions. Most of this is in the resolve phase			# Prompt and create actions. Most of this is in the resolve phase
	# already, but we can't handle .hgsubstate in filemerge or			# already, but we can't handle .hgsubstate in filemerge or
	# subrepoutil.submerge yet so we have to keep prompting for it.			# subrepoutil.submerge yet so we have to keep prompting for it.
	if b'.hgsubstate' in actionbyfile:			if b'.hgsubstate' in mresult.actions:
	f = b'.hgsubstate'			f = b'.hgsubstate'
	m, args, msg = actionbyfile[f]			m, args, msg = mresult.actions[f]
	prompts = filemerge.partextras(labels)			prompts = filemerge.partextras(labels)
	prompts[b'f'] = f			prompts[b'f'] = f
	if m == mergestatemod.ACTION_CHANGED_DELETED:			if m == mergestatemod.ACTION_CHANGED_DELETED:
	if repo.ui.promptchoice(			if repo.ui.promptchoice(
	_(			_(
	b"local%(l)s changed %(f)s which other%(o)s deleted\n"			b"local%(l)s changed %(f)s which other%(o)s deleted\n"
	b"use (c)hanged version or (d)elete?"			b"use (c)hanged version or (d)elete?"
	b"$$ &Changed $$ &Delete"			b"$$ &Changed $$ &Delete"
	)			)
	% prompts,			% prompts,
	0,			0,
	):			):
	actionbyfile[f] = (			mresult.actions[f] = (
	mergestatemod.ACTION_REMOVE,			mergestatemod.ACTION_REMOVE,
	None,			None,
	b'prompt delete',			b'prompt delete',
	)			)
	elif f in p1:			elif f in p1:
	actionbyfile[f] = (			mresult.actions[f] = (
	mergestatemod.ACTION_ADD_MODIFIED,			mergestatemod.ACTION_ADD_MODIFIED,
	None,			None,
	b'prompt keep',			b'prompt keep',
	)			)
	else:			else:
	actionbyfile[f] = (			mresult.actions[f] = (
	mergestatemod.ACTION_ADD,			mergestatemod.ACTION_ADD,
	None,			None,
	b'prompt keep',			b'prompt keep',
	)			)
	elif m == mergestatemod.ACTION_DELETED_CHANGED:			elif m == mergestatemod.ACTION_DELETED_CHANGED:
	f1, f2, fa, move, anc = args			f1, f2, fa, move, anc = args
	flags = p2[f2].flags()			flags = p2[f2].flags()
	if (			if (
	repo.ui.promptchoice(			repo.ui.promptchoice(
	_(			_(
	b"other%(o)s changed %(f)s which local%(l)s deleted\n"			b"other%(o)s changed %(f)s which local%(l)s deleted\n"
	b"use (c)hanged version or leave (d)eleted?"			b"use (c)hanged version or leave (d)eleted?"
	b"$$ &Changed $$ &Deleted"			b"$$ &Changed $$ &Deleted"
	)			)
	% prompts,			% prompts,
	0,			0,
	)			)
	== 0			== 0
	):			):
	actionbyfile[f] = (			mresult.actions[f] = (
	mergestatemod.ACTION_GET,			mergestatemod.ACTION_GET,
	(flags, False),			(flags, False),
	b'prompt recreating',			b'prompt recreating',
	)			)
	else:			else:
	del actionbyfile[f]			del mresult.actions[f]

	# Convert to dictionary-of-lists format			# Convert to dictionary-of-lists format
	actions = emptyactions()			actions = mresult.actionsdict
	for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
	if m not in actions:
	actions[m] = []
	actions[m].append((f, args, msg))

	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:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22101		Jul 25 2020, 5:59 AM	★	★
Diff 2	22200	rHGf4a2b329717b28c7569fdbcb7878e62212b5219f	Jul 24 2020, 5:15 AM	★	★