D1211: context: switch ctx() use to changectx()
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Fri Dec 1 03:03:06 EST 2017
phillco updated this revision to Diff 4037.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1211?vs=4036&id=4037
REVISION DETAIL
https://phab.mercurial-scm.org/D1211
AFFECTED FILES
mercurial/context.py
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -481,7 +481,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
@@ -2160,7 +2160,7 @@
def cmp(self, fctx):
return self.data() != fctx.data()
- def ctx(self):
+ def changectx(self):
return self._parent
def data(self):
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list