This is an archive of the discontinued Mercurial Phabricator instance.

mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)
ClosedPublic

Authored by pulkit on Aug 10 2020, 7:18 AM.

Download Raw Diff

Details

Reviewers

marmoute
indygreg

Group Reviewers

hg-reviewers

Commits

rHG05d19ca33b33: mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)

Summary

Storing that a file is resolved for the other parent while merging is just one
case of things we will like to store in the mergestate. There are more which we
will like to store.

This patch replaces addmergedother() with a much more generic
addcommitinfo(). Doing this, we also blinding stores the same key value pair
generated by the merge code instead of touching them.

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.Aug 10 2020, 7:18 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 10 2020, 7:18 AM

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

This seems to conflict with my request for D8921, do we have a good way forward that allow to still rename the key ?

This revision now requires changes to proceed.Aug 10 2020, 1:22 PM

pulkit updated this revision to Diff 22395.Aug 11 2020, 3:47 AM

In D8923#133565, @marmoute wrote:

This seems to conflict with my request for D8921, do we have a good way forward that allow to still rename the key ?

Updated the previous patches and renamed the key. My further plan is to start storing filenodes in _stateextras of mergestate. However we will need to keep the current {b'filenode-source': b'other'} trick in place because old versions don't store the filenode.

indygreg accepted this revision.Aug 22 2020, 6:50 PM

pulkit added a commit: rHG05d19ca33b33: mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API).Aug 22 2020, 7:32 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG05d19ca33b33: mergestate: replace `addmergedother()` with generic `addcommitinfo()` (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 (3 lines)
M			mercurial/mergestate.py (6 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22378		Aug 10 2020, 7:18 AM	★	★
Diff 2	22395		Aug 11 2020, 3:47 AM	★	★
Diff 3	22426	rHG05d19ca33b33820c1c36d756200d6e036e56449c	Aug 10 2020, 6:17 AM	★	★

Status	Author	Revision
Closed	pulkit	D8923 mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)
Closed	pulkit	D8922 merge: introduce `addcommitinfo()` on mergeresult object
Closed	pulkit	D8921 merge: use collections.defaultdict() for mergeresult.commitinfo
Closed	pulkit	D8920 mergestate: use _stateextras instead of merge records for commit related info
Closed	pulkit	D8919 mergestate: use collections.defaultdict(dict) for _stateextras

Diff 22426

mercurial/merge.py

	updated, merged, removed = 0, 0, 0			updated, merged, removed = 0, 0, 0
	ms = mergestatemod.mergestate.clean(			ms = mergestatemod.mergestate.clean(
	repo, wctx.p1().node(), mctx.node(), labels			repo, wctx.p1().node(), mctx.node(), labels
	)			)

	for f, op in pycompat.iteritems(mresult.commitinfo):			for f, op in pycompat.iteritems(mresult.commitinfo):
	# the other side of filenode was choosen while merging, store this in			# the other side of filenode was choosen while merging, store this in
	# mergestate so that it can be reused on commit			# mergestate so that it can be reused on commit
	if op[b'filenode-source'] == b'other':			ms.addcommitinfo(f, op)
	ms.addmergedother(f)

	moves = []			moves = []

	# 'cd' and 'dc' actions are treated like other merge conflicts			# 'cd' and 'dc' actions are treated like other merge conflicts
	mergeactions = list(			mergeactions = list(
	mresult.getactions(			mresult.getactions(
	[			[
	mergestatemod.ACTION_CHANGED_DELETED,			mergestatemod.ACTION_CHANGED_DELETED,

mercurial/mergestate.py

	"""add a new conflicting path to the merge state			"""add a new conflicting path to the merge state
	path: the path that conflicts			path: the path that conflicts
	frename: the filename the conflicting file was renamed to			frename: the filename the conflicting file was renamed to
	forigin: origin of the file ('l' or 'r' for local/remote)			forigin: origin of the file ('l' or 'r' for local/remote)
	"""			"""
	self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin]			self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin]
	self._dirty = True			self._dirty = True

	def addmergedother(self, path):			def addcommitinfo(self, path, data):
	self._stateextras[path] = {b'filenode-source': b'other'}			""" stores information which is required at commit
				into _stateextras """
				self._stateextras[path].update(data)
	self._dirty = True			self._dirty = True

	def __contains__(self, dfile):			def __contains__(self, dfile):
	return dfile in self._state			return dfile in self._state

	def __getitem__(self, dfile):			def __getitem__(self, dfile):
	return self._state[dfile][0]			return self._state[dfile][0]