This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8744

merge: remove no longer required ACTION_GET_OTHER_AND_STORE
ClosedPublic

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

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGc515c54f6530: merge: remove no longer required ACTION_GET_OTHER_AND_STORE

Summary

In 1b8fd4af33189c84feadb47c74d659ec31cde3b9 I (ab)used merge actions to pass
info from manifestmerge() to applyupdates() and store info in mergestate.

In previous patches, we introduced a separate return value from manifestmerge()
and calculateupdates() and an argument to applyupdates() which achieved the same
thing.

Let's remove this no longer required messy code.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

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 updated this revision to Diff 22065.Jul 23 2020, 10:12 AM

pulkit added a child revision: D8816: merge: introduce hasconflicts() on mergeresult object.Jul 25 2020, 5:58 AM

pulkit updated this revision to Diff 22099.

I agree that this action was a bit wonky and this is a useful cleanup!

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

pulkit added a commit: rHGc515c54f6530: merge: remove no longer required ACTION_GET_OTHER_AND_STORE.Aug 2 2020, 1:43 PM

Closed by commit rHGc515c54f6530: merge: remove no longer required ACTION_GET_OTHER_AND_STORE (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 (20 lines)
M			mercurial/mergestate.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21896		Jul 14 2020, 8:31 AM	★	★
Diff 2	22065		Jul 23 2020, 10:12 AM	★	★
Diff 3	22099		Jul 25 2020, 5:58 AM	★	★
Diff 4	22198	rHGc515c54f6530f04923827b575b3d9493f271e3c6	Jul 14 2020, 7:10 AM	★	★

Commit	Parents	Author	Summary	Date
1592fc2337b4	b349fbb3e5ae	Pulkit Goyal		Jul 14 2020, 7:10 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 22065

mercurial/merge.py

	if n1 == n2: # optimization: keep local content			if n1 == n2: # optimization: keep local content
	actions[f] = (			actions[f] = (
	mergestatemod.ACTION_EXEC,			mergestatemod.ACTION_EXEC,
	(fl2,),			(fl2,),
	b'update permissions',			b'update permissions',
	)			)
	else:			else:
	actions[f] = (			actions[f] = (
	mergestatemod.ACTION_GET_OTHER_AND_STORE			mergestatemod.ACTION_GET,
	if branchmerge
	else mergestatemod.ACTION_GET,
	(fl2, False),			(fl2, False),
	b'remote is newer',			b'remote is newer',
	)			)
	if branchmerge:			if branchmerge:
	commitinfo[f] = b'other'			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,
	if branchmerge
	else mergestatemod.ACTION_GET,
	(fl1, False),			(fl1, False),
	b'remote is newer',			b'remote is newer',
	)			)
	if branchmerge:			if branchmerge:
	commitinfo[f] = b'other'			commitinfo[f] = b'other'
	else: # both changed something			else: # both changed something
	actions[f] = (			actions[f] = (
	mergestatemod.ACTION_MERGE,			mergestatemod.ACTION_MERGE,
	diverge = mresult1.diverge			diverge = mresult1.diverge
	if renamedelete is None or len(renamedelete) < len(			if renamedelete is None or len(renamedelete) < len(
	mresult1.renamedelete			mresult1.renamedelete
	):			):
	renamedelete = mresult1.renamedelete			renamedelete = mresult1.renamedelete

	for f, a in sorted(pycompat.iteritems(mresult1.actions)):			for f, a in sorted(pycompat.iteritems(mresult1.actions)):
	m, args, msg = a			m, args, msg = a
	if m == mergestatemod.ACTION_GET_OTHER_AND_STORE:
	m = mergestatemod.ACTION_GET
	repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))			repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))
	if f in fbids:			if f in fbids:
	d = fbids[f]			d = fbids[f]
	if m in d:			if m in d:
	d[m].append(a)			d[m].append(a)
	else:			else:
	d[m] = [a]			d[m] = [a]
	else:			else:
	mergestatemod.ACTION_REMOVE,			mergestatemod.ACTION_REMOVE,
	mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,			mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,
	mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,			mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
	mergestatemod.ACTION_MERGE,			mergestatemod.ACTION_MERGE,
	mergestatemod.ACTION_EXEC,			mergestatemod.ACTION_EXEC,
	mergestatemod.ACTION_KEEP,			mergestatemod.ACTION_KEEP,
	mergestatemod.ACTION_PATH_CONFLICT,			mergestatemod.ACTION_PATH_CONFLICT,
	mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,			mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
	mergestatemod.ACTION_GET_OTHER_AND_STORE,
	)			)
	}			}


	def applyupdates(			def applyupdates(
	repo,			repo,
	actions,			actions,
	wctx,			wctx,
	commitinfo = {}			commitinfo = {}

	for f, op in pycompat.iteritems(commitinfo):			for f, op in pycompat.iteritems(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'other':			if op == b'other':
	ms.addmergedother(f)			ms.addmergedother(f)

	# add ACTION_GET_OTHER_AND_STORE to mergestate
	for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]:
	ms.addmergedother(e[0])

	moves = []			moves = []
	for m, l in actions.items():			for m, l in actions.items():
	l.sort()			l.sort()

	# 'cd' and 'dc' actions are treated like other merge conflicts			# 'cd' and 'dc' actions are treated like other merge conflicts
	mergeactions = sorted(actions[mergestatemod.ACTION_CHANGED_DELETED])			mergeactions = sorted(actions[mergestatemod.ACTION_CHANGED_DELETED])
	mergeactions.extend(sorted(actions[mergestatemod.ACTION_DELETED_CHANGED]))			mergeactions.extend(sorted(actions[mergestatemod.ACTION_DELETED_CHANGED]))
	mergeactions.extend(actions[mergestatemod.ACTION_MERGE])			mergeactions.extend(actions[mergestatemod.ACTION_MERGE])
	if updatecheck == UPDATECHECK_NO_CONFLICT:			if updatecheck == UPDATECHECK_NO_CONFLICT:
	for f, (m, args, msg) in pycompat.iteritems(actionbyfile):			for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
	if m not in (			if m not in (
	mergestatemod.ACTION_GET,			mergestatemod.ACTION_GET,
	mergestatemod.ACTION_KEEP,			mergestatemod.ACTION_KEEP,
	mergestatemod.ACTION_EXEC,			mergestatemod.ACTION_EXEC,
	mergestatemod.ACTION_REMOVE,			mergestatemod.ACTION_REMOVE,
	mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,			mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
	mergestatemod.ACTION_GET_OTHER_AND_STORE,
	):			):
	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.

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

	# ACTION_GET_OTHER_AND_STORE is a mergestatemod.ACTION_GET + store in mergestate
	for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]:
	actions[mergestatemod.ACTION_GET].append(e)

	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(), actions)

mercurial/mergestate.py

	ACTION_DELETED_CHANGED = b'dc'			ACTION_DELETED_CHANGED = b'dc'
	ACTION_CHANGED_DELETED = b'cd'			ACTION_CHANGED_DELETED = b'cd'
	ACTION_MERGE = b'm'			ACTION_MERGE = b'm'
	ACTION_LOCAL_DIR_RENAME_GET = b'dg'			ACTION_LOCAL_DIR_RENAME_GET = b'dg'
	ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'			ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
	ACTION_KEEP = b'k'			ACTION_KEEP = b'k'
	ACTION_EXEC = b'e'			ACTION_EXEC = b'e'
	ACTION_CREATED_MERGE = b'cm'			ACTION_CREATED_MERGE = b'cm'
	# GET the other/remote side and store this info in mergestate
	ACTION_GET_OTHER_AND_STORE = b'gs'


	class mergestate(object):			class mergestate(object):
	'''track 3-way merge state of individual files			'''track 3-way merge state of individual files

	The merge state is stored on disk when needed. Two files are used: one with			The merge state is stored on disk when needed. Two files are used: one with
	an old format (version 1), and one with a new format (version 2). Version 2			an old format (version 1), and one with a new format (version 2). Version 2
	stores a superset of the data in version 1, including new kinds of records			stores a superset of the data in version 1, including new kinds of records