Phil Cohen <phillco@fb.com> [Fri, 01 Dec 2017 00:07:23 -0800] rev 35295
overlayworkingctx: make clean() public
It will be called directly by rebase after concluding a node.
Differential Revision: https://phab.mercurial-scm.org/D1230
Phil Cohen <phillco@fb.com> [Fri, 01 Dec 2017 00:07:23 -0800] rev 35294
overlayworkingctx: remove flushall()
Differential Revision: https://phab.mercurial-scm.org/D1216
Phil Cohen <phillco@fb.com> [Fri, 01 Dec 2017 00:07:23 -0800] rev 35293
merge: skip subrepo state, update hooks, and updating the dirstate in IMM
Differential Revision: https://phab.mercurial-scm.org/D1215
Phil Cohen <phillco@fb.com> [Fri, 01 Dec 2017 00:07:23 -0800] rev 35292
merge: remove calls to flushall()
Since D1105, these are unnecessary since IMM will now never use workers.
Differential Revision: https://phab.mercurial-scm.org/D1213
Phil Cohen <phillco@fb.com> [Fri, 01 Dec 2017 00:07:23 -0800] rev 35291
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
Merge conflicts might be supported in the future, but for now are kept out of
scope.
Any places where we used to call `flushall()` should be replaced with some kind
of exception. At this point, IMM M1 is no longer supported.
Differential Revision: https://phab.mercurial-scm.org/D1212
Phil Cohen <phillco@fb.com> [Fri, 01 Dec 2017 00:07:23 -0800] rev 35290
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