# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1594724512 -19800 # Tue Jul 14 16:31:52 2020 +0530 # Node ID 4021b2b860103442ac0d36b0cc5176ec74c92a6a # Parent 9fd8b89eee7e32ce4f3703d423cc320dec64da86 # EXP-Topic mergestate-refactor merge: pass commitinfo to applyupdates() and get it stored in mergestate
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. Differential Revision: https://phab.mercurial-scm.org/D8743 diff --git a/hgext/remotefilelog/__init__.py b/hgext/remotefilelog/__init__.py --- a/hgext/remotefilelog/__init__.py +++ b/hgext/remotefilelog/__init__.py @@ -479,7 +479,7 @@ def storewrapper(orig, requirements, pat # prefetch files before update def applyupdates( - orig, repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None + orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts ): if isenabled(repo): manifest = mctx.manifest() @@ -488,9 +488,7 @@ def applyupdates( files.append((f, hex(manifest[f]))) # batch fetch the needed files from the server repo.fileservice.prefetch(files) - return orig( - repo, actions, wctx, mctx, overwrite, wantfiledata, labels=labels - ) + return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts) # Prefetch merge checkunknownfiles diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1199,12 +1199,21 @@ def emptyactions(): 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 wctx is the working copy context 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 (updated, merged, removed, unresolved) that describes how many @@ -1219,6 +1228,15 @@ def applyupdates( 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 for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]: ms.addmergedother(e[0]) @@ -1891,7 +1909,14 @@ def update( wantfiledata = updatedirstate and not branchmerge stats, getfiledata = applyupdates( - repo, actions, wc, p2, overwrite, wantfiledata, labels=labels + repo, + actions, + wc, + p2, + overwrite, + wantfiledata, + labels=labels, + commitinfo=commitinfo, ) if updatedirstate: _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
