Patchwork D2967: context: avoid using a context object as a changeid

login
register
mail settings
Submitter phabricator
Date March 30, 2018, 5:24 p.m.
Message ID <0f3e0c14296f1661d9ec3fab7b4e24ba@localhost.localdomain>
Download mbox | patch
Permalink /patch/29970/
State Not Applicable
Headers show

Comments

phabricator - March 30, 2018, 5:24 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdaef13da66fe: context: avoid using a context object as a changeid (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2967?vs=7369&id=7390

REVISION DETAIL
  https://phab.mercurial-scm.org/D2967

AFFECTED FILES
  mercurial/localrepo.py
  mercurial/merge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -561,7 +561,7 @@ 
         fcd = self._filectxorabsent(hash, wctx, dfile)
         fco = self._filectxorabsent(onode, octx, ofile)
         # TODO: move this to filectxorabsent
-        fca = self._repo.filectx(afile, fileid=anode, changeid=actx)
+        fca = self._repo.filectx(afile, fileid=anode, changectx=actx)
         # "premerge" x flags
         flo = fco.flags()
         fla = fca.flags()
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1086,10 +1086,11 @@ 
                     if f not in pctx and s not in pctx:
                         self.dirstate.copy(None, f)
 
-    def filectx(self, path, changeid=None, fileid=None):
+    def filectx(self, path, changeid=None, fileid=None, changectx=None):
         """changeid can be a changeset revision, node, or tag.
            fileid can be a file revision or node."""
-        return context.filectx(self, path, changeid, fileid)
+        return context.filectx(self, path, changeid, fileid,
+                               changectx=changectx)
 
     def getcwd(self):
         return self.dirstate.getcwd()