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

login
register
mail settings
Submitter phabricator
Date Dec. 1, 2017, 7:59 a.m.
Message ID <b53784fcb3d038b3d2a68666f101e3b9@localhost.localdomain>
Download mbox | patch
Permalink /patch/25848/
State Not Applicable
Headers show

Comments

phabricator - Dec. 1, 2017, 7:59 a.m.
phillco updated this revision to Diff 4036.
phillco edited the summary of this revision.
phillco retitled this revision from "context: add ctx() to workingfilectx and absentfilectx" to "context: switch ctx() use to changectx()".

REPOSITORY
  rHG Mercurial

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

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

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

CHANGE DETAILS




To: phillco, #hg-reviewers
Cc: 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
@@ -2124,7 +2124,7 @@ 
     def cmp(self, fctx):
         return self.data() != fctx.data()
 
-    def ctx(self):
+    def changectx(self):
         return self._parent
 
     def data(self):