Patchwork D1211: context: switch ctx() use to changectx()

login
register
mail settings
Submitter phabricator
Date Dec. 7, 2017, 7:48 p.m.
Message ID <3ec852d10c4bb4ca94f11058550b5c7c@localhost.localdomain>
Download mbox | patch
Permalink /patch/26005/
State Not Applicable
Headers show

Comments

phabricator - Dec. 7, 2017, 7:48 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG010179e21e91: context: switch ctx() use to changectx() (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1211?vs=4037&id=4168

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

AFFECTED FILES
  mercurial/context.py
  mercurial/filemerge.py

CHANGE DETAILS




To: phillco, #hg-reviewers, dlax
Cc: sid0, martinvonz, mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -469,7 +469,7 @@ 
     # calls might be depending on.
     from . import context
     if isinstance(fcd, context.overlayworkingfilectx):
-        fcd.ctx().flushall()
+        fcd.changectx().flushall()
 
     util.writefile(a + ".local", fcd.decodeddata())
     repo.wwrite(fd + ".other", fco.data(), fco.flags())
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -2129,7 +2129,7 @@ 
     def cmp(self, fctx):
         return self.data() != fctx.data()
 
-    def ctx(self):
+    def changectx(self):
         return self._parent
 
     def data(self):