This is an archive of the discontinued Mercurial Phabricator instance.

merge: introduce 'commitinfo' in mergeresult
ClosedPublic

Authored by pulkit on Jul 14 2020, 8:31 AM.

Download Raw Diff

Details

Reviewers

indygreg
marmoute

Group Reviewers

hg-reviewers

Commits

rHG8e8d513941b4: merge: introduce 'commitinfo' in mergeresult

Summary

commitinfo will be used to pass information which is required on commit phase
from the merge phase.

One common example is, merge chooses filenode from second parent and we need to
tell commit to choose that. Right now this one and related cases are not very
neatly implement and there is no clear line on how to pass on such information.
Upcoming patches will try to work on in this area and make things easier.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Jul 14 2020, 8:31 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 14 2020, 8:31 AM

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

pulkit added a child revision: D8743: merge: pass commitinfo to applyupdates() and get it stored in mergestate.Jul 14 2020, 8:31 AM

This is mostly a test of phab eating comment

This revision now requires changes to proceed.Jul 20 2020, 3:41 PM

I can confirm phab eat my comment.

More serious question: Maybe we should stop passing around tuple of dictionnary and return an object holding all that data with a better API. What do you think ?

This revision now requires review to proceed.Jul 20 2020, 5:00 PM

pulkit edited parent revisions, added: D8799: merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API); removed: D8741: merge: document return values of manifestmerge() and calculateupdates().Jul 23 2020, 10:11 AM

pulkit retitled this revision from merge: return 'commitinfo' from manifestmerge() and calculateupdates() (API) to merge: introduce 'commitinfo' in mergeresult.

pulkit edited the summary of this revision. (Show Details)

pulkit updated this revision to Diff 22063.

In D8742#131158, @marmoute wrote:

More serious question: Maybe we should stop passing around tuple of dictionnary and return an object holding all that data with a better API. What do you think ?

Added a parent revision which starts returning a object. It's very basic as of now.

pulkit updated this revision to Diff 22097.Jul 25 2020, 5:57 AM

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

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

pulkit added a commit: rHG8e8d513941b4: merge: introduce 'commitinfo' in mergeresult.Aug 2 2020, 1:43 PM

Closed by commit rHG8e8d513941b4: merge: introduce 'commitinfo' in mergeresult (authored by pulkit). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/convert/hg.py (1 line)
M			mercurial/merge.py (22 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21894		Jul 14 2020, 8:31 AM	★	★
Diff 2	22063		Jul 23 2020, 10:11 AM	★	★
Diff 3	22097		Jul 25 2020, 5:56 AM	★	★
Diff 4	22196	rHG8e8d513941b4eee67966b234cd7a3bb640a19970	Jul 14 2020, 6:51 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 22196

hgext/convert/hg.py

	and p2, given that the merge is coming from the given source.			and p2, given that the merge is coming from the given source.

	This prevents us from losing files that only exist in the target p2 and			This prevents us from losing files that only exist in the target p2 and
	that don't come from the source repo (like if you're merging multiple			that don't come from the source repo (like if you're merging multiple
	repositories together).			repositories together).
	"""			"""
	anc = [p1ctx.ancestor(p2ctx)]			anc = [p1ctx.ancestor(p2ctx)]
	# Calculate what files are coming from p2			# Calculate what files are coming from p2
				# TODO: mresult.commitinfo might be able to get that info
	mresult = mergemod.calculateupdates(			mresult = mergemod.calculateupdates(
	self.repo,			self.repo,
	p1ctx,			p1ctx,
	p2ctx,			p2ctx,
	anc,			anc,
	branchmerge=True,			branchmerge=True,
	force=True,			force=True,
	acceptremote=False,			acceptremote=False,

mercurial/merge.py



	class mergeresult(object):			class mergeresult(object):
	''''An object representing result of merging manifests.			''''An object representing result of merging manifests.

	It has information about what actions need to be performed on dirstate			It has information about what actions need to be performed on dirstate
	mapping of divergent renames and other such cases. '''			mapping of divergent renames and other such cases. '''

	def __init__(self, actions, diverge, renamedelete):			def __init__(self, actions, diverge, renamedelete, commitinfo):
	"""			"""
	actions: dict of filename as keys and action related info as values			actions: dict of filename as keys and action related info as values
	diverge: mapping of source name -> list of dest name for			diverge: mapping of source name -> list of dest name for
	divergent renames			divergent renames
	renamedelete: mapping of source name -> list of destinations for files			renamedelete: mapping of source name -> list of destinations for files
	deleted on one side and renamed on other.			deleted on one side and renamed on other.
				commitinfo: dict containing data which should be used on commit
				contains a filename -> info mapping
	"""			"""

	self._actions = actions			self._actions = actions
	self._diverge = diverge			self._diverge = diverge
	self._renamedelete = renamedelete			self._renamedelete = renamedelete
				self._commitinfo = commitinfo

	@property			@property
	def actions(self):			def actions(self):
	return self._actions			return self._actions

	@property			@property
	def diverge(self):			def diverge(self):
	return self._diverge			return self._diverge

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

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

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


	def manifestmerge(			def manifestmerge(
	repo,			repo,
	wctx,			wctx,
	p2,			p2,
	[			[
	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)
	]			]

	branch_copies1 = copies.branch_copies()			branch_copies1 = copies.branch_copies()
	branch_copies2 = copies.branch_copies()			branch_copies2 = copies.branch_copies()
	diverge = {}			diverge = {}
				# information from merge which is needed at commit time
				# for example choosing filelog of which parent to commit
				# TODO: use specific constants in future for this mapping
				commitinfo = {}
	if followcopies:			if followcopies:
	branch_copies1, branch_copies2, diverge = copies.mergecopies(			branch_copies1, branch_copies2, diverge = copies.mergecopies(
	repo, wctx, p2, pa			repo, wctx, p2, pa
	)			)

	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))
	else:			else:
	actions[f] = (			actions[f] = (
	mergestatemod.ACTION_GET_OTHER_AND_STORE			mergestatemod.ACTION_GET_OTHER_AND_STORE
	if branchmerge			if branchmerge
	else mergestatemod.ACTION_GET,			else mergestatemod.ACTION_GET,
	(fl2, False),			(fl2, False),
	b'remote is newer',			b'remote is newer',
	)			)
				if branchmerge:
				commitinfo[f] = b'other'
	elif nol and n2 == a: # remote only changed 'x'			elif nol and n2 == a: # remote only changed 'x'
	actions[f] = (			actions[f] = (
	mergestatemod.ACTION_EXEC,			mergestatemod.ACTION_EXEC,
	(fl2,),			(fl2,),
	b'update permissions',			b'update permissions',
	)			)
	elif nol and n1 == a: # local only changed 'x'			elif nol and n1 == a: # local only changed 'x'
	actions[f] = (			actions[f] = (
	mergestatemod.ACTION_GET_OTHER_AND_STORE			mergestatemod.ACTION_GET_OTHER_AND_STORE
	if branchmerge			if branchmerge
	else mergestatemod.ACTION_GET,			else mergestatemod.ACTION_GET,
	(fl1, False),			(fl1, False),
	b'remote is newer',			b'remote is newer',
	)			)
				if branchmerge:
				commitinfo[f] = b'other'
	else: # both changed something			else: # both changed something
	actions[f] = (			actions[f] = (
	mergestatemod.ACTION_MERGE,			mergestatemod.ACTION_MERGE,
	(f, f, f, False, pa.node()),			(f, f, f, False, pa.node()),
	b'versions differ',			b'versions differ',
	)			)
	elif n1: # file exists only on local side			elif n1: # file exists only on local side
	if f in copied2:			if f in copied2:
	narrowmatch = repo.narrowmatch()			narrowmatch = repo.narrowmatch()
	if not narrowmatch.always():			if not narrowmatch.always():
	# Updates "actions" in place			# Updates "actions" in place
	_filternarrowactions(narrowmatch, branchmerge, actions)			_filternarrowactions(narrowmatch, branchmerge, actions)

	renamedelete = branch_copies1.renamedelete			renamedelete = branch_copies1.renamedelete
	renamedelete.update(branch_copies2.renamedelete)			renamedelete.update(branch_copies2.renamedelete)

	return mergeresult(actions, diverge, renamedelete)			return mergeresult(actions, diverge, renamedelete, commitinfo)


	def _resolvetrivial(repo, wctx, mctx, ancestor, actions):			def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
	"""Resolves false conflicts where the nodeid changed but the content			"""Resolves false conflicts where the nodeid changed but the content
	remained the same."""			remained the same."""
	# We force a copy of actions.items() because we're going to mutate			# We force a copy of actions.items() because we're going to mutate
	# actions as we resolve trivial conflicts.			# actions as we resolve trivial conflicts.
	for f, (m, args, msg) in list(actions.items()):			for f, (m, args, msg) in list(actions.items()):
	# Pick random action. TODO: Instead, prompt user when resolving			# Pick random action. TODO: Instead, prompt user when resolving
	m, l = list(bids.items())[0]			m, l = list(bids.items())[0]
	repo.ui.warn(			repo.ui.warn(
	_(b' %s: ambiguous merge - picked %s action\n') % (f, m)			_(b' %s: ambiguous merge - picked %s action\n') % (f, m)
	)			)
	actions[f] = l[0]			actions[f] = l[0]
	continue			continue
	repo.ui.note(_(b'end of auction\n\n'))			repo.ui.note(_(b'end of auction\n\n'))
	mresult = mergeresult(actions, diverge, renamedelete)			# TODO: think about commitinfo when bid merge is used
				mresult = mergeresult(actions, diverge, renamedelete, {})

	if wctx.rev() is None:			if wctx.rev() is None:
	fractions = _forgetremoved(wctx, mctx, branchmerge)			fractions = _forgetremoved(wctx, mctx, branchmerge)
	mresult.actions.update(fractions)			mresult.actions.update(fractions)

	prunedactions = sparse.filterupdatesactions(			prunedactions = sparse.filterupdatesactions(
	repo, wctx, mctx, branchmerge, mresult.actions			repo, wctx, mctx, branchmerge, mresult.actions
	)			)