This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8743

merge: pass commitinfo to applyupdates() and get it stored in mergestate
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGcb6a72dc0511: merge: pass commitinfo to applyupdates() and get it stored in mergestate
Summary

This patch passes the commitinfo calulcated in manifestmerge() to applyupdates()
so that it can be read there and stored in mergestate. On commit, we can read
mergestate for such information and act accordingly.

This patch also makes ACTION_GET_OTHER_AND_STORE not required anymore. Next
patch will remove the messy code surrounding it.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/__init__.py (6 lines)
Mmercurial/merge.py (29 lines)

Diff 22197

hgext/remotefilelog/__init__.py

if constants.SHALLOWREPO_REQUIREMENT in requirements: if constants.SHALLOWREPO_REQUIREMENT in requirements:
s = shallowstore.wrapstore(s) s = shallowstore.wrapstore(s)
return s return s
# prefetch files before update # prefetch files before update
def applyupdates( def applyupdates(
orig, repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts
): ):
if isenabled(repo): if isenabled(repo):
manifest = mctx.manifest() manifest = mctx.manifest()
files = [] files = []
for f, args, msg in actions[b'g']: for f, args, msg in actions[b'g']:
files.append((f, hex(manifest[f]))) files.append((f, hex(manifest[f])))
# batch fetch the needed files from the server # batch fetch the needed files from the server
repo.fileservice.prefetch(files) repo.fileservice.prefetch(files)
return orig( return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts)
repo, actions, wctx, mctx, overwrite, wantfiledata, labels=labels
)
# Prefetch merge checkunknownfiles # Prefetch merge checkunknownfiles
def checkunknownfiles(orig, repo, wctx, mctx, force, actions, *args, **kwargs): def checkunknownfiles(orig, repo, wctx, mctx, force, actions, *args, **kwargs):
if isenabled(repo): if isenabled(repo):
files = [] files = []
sparsematch = repo.maybesparsematch(mctx.rev()) sparsematch = repo.maybesparsematch(mctx.rev())
for f, (m, actionargs, msg) in pycompat.iteritems(actions): for f, (m, actionargs, msg) in pycompat.iteritems(actions):

mercurial/merge.py

mergestatemod.ACTION_PATH_CONFLICT, mergestatemod.ACTION_PATH_CONFLICT,
mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
mergestatemod.ACTION_GET_OTHER_AND_STORE, mergestatemod.ACTION_GET_OTHER_AND_STORE,
) )
} }
def applyupdates( def applyupdates(
repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None repo,
actions,
wctx,
mctx,
overwrite,
wantfiledata,
labels=None,
commitinfo=None,
): ):
"""apply the merge action list to the working directory """apply the merge action list to the working directory
wctx is the working copy context wctx is the working copy context
mctx is the context to be merged into the working copy mctx is the context to be merged into the working copy
commitinfo is a mapping of information which needs to be stored somewhere
(probably mergestate) so that it can be used at commit time.
Return a tuple of (counts, filedata), where counts is a tuple Return a tuple of (counts, filedata), where counts is a tuple
(updated, merged, removed, unresolved) that describes how many (updated, merged, removed, unresolved) that describes how many
files were affected by the update, and filedata is as described in files were affected by the update, and filedata is as described in
batchget. batchget.
""" """
_prefetchfiles(repo, mctx, actions) _prefetchfiles(repo, mctx, actions)
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
) )
if commitinfo is None:
commitinfo = {}
for f, op in pycompat.iteritems(commitinfo):
# the other side of filenode was choosen while merging, store this in
# mergestate so that it can be reused on commit
if op == b'other':
ms.addmergedother(f)
# add ACTION_GET_OTHER_AND_STORE to mergestate # add ACTION_GET_OTHER_AND_STORE to mergestate
for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]: for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]:
ms.addmergedother(e[0]) ms.addmergedother(e[0])
moves = [] moves = []
for m, l in actions.items(): for m, l in actions.items():
l.sort() l.sort()
repo.vfs.write(b'updatestate', p2.hex()) repo.vfs.write(b'updatestate', p2.hex())
_advertisefsmonitor( _advertisefsmonitor(
repo, len(actions[mergestatemod.ACTION_GET]), p1.node() repo, len(actions[mergestatemod.ACTION_GET]), p1.node()
) )
wantfiledata = updatedirstate and not branchmerge wantfiledata = updatedirstate and not branchmerge
stats, getfiledata = applyupdates( stats, getfiledata = applyupdates(
repo, actions, wc, p2, overwrite, wantfiledata, labels=labels repo,
actions,
wc,
p2,
overwrite,
wantfiledata,
labels=labels,
commitinfo=mresult.commitinfo,
) )
if updatedirstate: if updatedirstate:
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(fp1, fp2) repo.setparents(fp1, fp2)
mergestatemod.recordupdates( mergestatemod.recordupdates(
repo, actions, branchmerge, getfiledata repo, actions, branchmerge, getfiledata
) )