This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8921

merge: use collections.defaultdict() for mergeresult.commitinfo
ClosedPublic

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

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf970cca30989: merge: use collections.defaultdict() for mergeresult.commitinfo
Summary

We will be storing info from mergeresult.commitinfo to mergestate._stateextras
in upcoming patches, let's make them use same structure so that we don't have to
make much efforts in transferring info from one to other.

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
marmoute accepted this revision.Aug 10 2020, 1:17 PM
marmoute requested changes to this revision.

Having a filenode key that does not contains a filenode is quite misleading. Can we use a different key ? (and align the extrastate dict in the same direction?)

This revision now requires changes to proceed.Aug 10 2020, 1:18 PM
pulkit updated this revision to Diff 22393.Aug 11 2020, 3:46 AM
pulkit added a comment.Aug 11 2020, 3:47 AM
In D8921#133559, @marmoute wrote:

Having a filenode key that does not contains a filenode is quite misleading. Can we use a different key ? (and align the extrastate dict in the same direction?)

Sure, renamed to filenode-source.

indygreg accepted this revision.Aug 22 2020, 6:44 PM
pulkit added a commit: rHGf970cca30989: merge: use collections.defaultdict() for mergeresult.commitinfo.Aug 22 2020, 7:32 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf970cca30989: merge: use collections.defaultdict() for mergeresult.commitinfo (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (10 lines)

Diff 22424

mercurial/merge.py

commitinfo: dict containing data which should be used on commit commitinfo: dict containing data which should be used on commit
contains a filename -> info mapping contains a filename -> info mapping
actionmapping: dict of action names as keys and values are dict of actionmapping: dict of action names as keys and values are dict of
filename as key and related data as values filename as key and related data as values
""" """
self._filemapping = {} self._filemapping = {}
self._diverge = {} self._diverge = {}
self._renamedelete = {} self._renamedelete = {}
self._commitinfo = {} self._commitinfo = collections.defaultdict(dict)
self._actionmapping = collections.defaultdict(dict) self._actionmapping = collections.defaultdict(dict)
def updatevalues(self, diverge, renamedelete, commitinfo): def updatevalues(self, diverge, renamedelete, commitinfo):
self._diverge = diverge self._diverge = diverge
self._renamedelete = renamedelete self._renamedelete = renamedelete
self._commitinfo = commitinfo self._commitinfo = commitinfo
def addfile(self, filename, action, data, message): def addfile(self, filename, action, data, message):
] ]
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 # information from merge which is needed at commit time
# for example choosing filelog of which parent to commit # for example choosing filelog of which parent to commit
# TODO: use specific constants in future for this mapping # TODO: use specific constants in future for this mapping
commitinfo = {} commitinfo = collections.defaultdict(dict)
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:
mresult.addfile( mresult.addfile(
f, f,
mergestatemod.ACTION_GET, 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'filenode-source'] = b'other'
elif nol and n2 == a: # remote only changed 'x' elif nol and n2 == a: # remote only changed 'x'
mresult.addfile( mresult.addfile(
f, 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'
mresult.addfile( mresult.addfile(
f, f,
mergestatemod.ACTION_GET, 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'filenode-source'] = b'other'
else: # both changed something else: # both changed something
mresult.addfile( mresult.addfile(
f, 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
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'other': if op[b'filenode-source'] == b'other':
ms.addmergedother(f) 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(
[ [