# HG changeset patch # User Phil Cohen # Date 1512115643 28800 # Node ID 010179e21e91fa341ba06acc388a171315b65a34 # Parent 8e72f9152c4dbd3820a750539dc5eef53d040bfa context: switch ctx() use to changectx() I added `ctx()` to `overlayworkingfilectx`, (and before that, `absentfilectx`), because `absentfilectx` had reference to this function in its `cmp()` function. But the standard is actually `changectx()`, and no other class implements `ctx()`. So let's use the standard name. (As a result, I'm not sure that part of the `absentfilectx` comparator ever worked! It was written before I added either function.) This will be necessary in the next patch. Differential Revision: https://phab.mercurial-scm.org/D1211 diff -r 8e72f9152c4d -r 010179e21e91 mercurial/context.py --- a/mercurial/context.py Wed Dec 06 22:56:15 2017 -0500 +++ b/mercurial/context.py Fri Dec 01 00:07:23 2017 -0800 @@ -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): diff -r 8e72f9152c4d -r 010179e21e91 mercurial/filemerge.py --- a/mercurial/filemerge.py Wed Dec 06 22:56:15 2017 -0500 +++ b/mercurial/filemerge.py Fri Dec 01 00:07:23 2017 -0800 @@ -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())