This is an archive of the discontinued Mercurial Phabricator instance.

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 22108

mercurial/merge.py


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

	mresult.updatevalues(diverge, renamedelete, commitinfo)			mresult.updatevalues(diverge, renamedelete, commitinfo)
	return mresult			return mresult


	def _resolvetrivial(repo, wctx, mctx, ancestor, actions):			def _resolvetrivial(repo, wctx, mctx, ancestor, mresult):
	"""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(mresult.actions.items()):
	if (			if (
	m == mergestatemod.ACTION_CHANGED_DELETED			m == mergestatemod.ACTION_CHANGED_DELETED
	and f in ancestor			and f in ancestor
	and not wctx[f].cmp(ancestor[f])			and not wctx[f].cmp(ancestor[f])
	):			):
	# local did change but ended up with same content			# local did change but ended up with same content
	actions[f] = mergestatemod.ACTION_REMOVE, None, b'prompt same'			mresult.addfile(
				f, mergestatemod.ACTION_REMOVE, None, b'prompt same'
				)
	elif (			elif (
	m == mergestatemod.ACTION_DELETED_CHANGED			m == mergestatemod.ACTION_DELETED_CHANGED
	and f in ancestor			and f in ancestor
	and not mctx[f].cmp(ancestor[f])			and not mctx[f].cmp(ancestor[f])
	):			):
	# remote did change but ended up with same content			# remote did change but ended up with same content
	del actions[f] # don't get = keep local deleted			mresult.removefile(f) # don't get = keep local deleted


	def calculateupdates(			def calculateupdates(
	repo,			repo,
	wctx,			wctx,
	mctx,			mctx,
	ancestors,			ancestors,
	branchmerge,			branchmerge,

	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
	)			)
	_resolvetrivial(repo, wctx, mctx, ancestors[0], mresult.actions)			_resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)

	mresult.setactions(prunedactions)			mresult.setactions(prunedactions)
	return mresult			return mresult


	def _getcwd():			def _getcwd():
	try:			try:
	return encoding.getcwd()			return encoding.getcwd()

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22108		Jul 25 2020, 6:00 AM	★	★
Diff 2	22207	rHG00e9c5edcd58a49cdd7bd7c2d3d0db439c5d5887	Jul 24 2020, 8:22 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

merge: pass mergeresult obj instead of actions dict in _resolvetrivial()ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22108

mercurial/merge.py

merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
ClosedPublic

Revision Contents
Changeset List