From patchwork Fri Dec  8 20:39:27 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D1240: overlayworkingctx: inherit from committablectx instead of
 workingctx
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 26122
Message-Id: <e0c3d548c9ee3f0b5cf4d9bda3725f22@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Fri, 8 Dec 2017 20:39:27 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8e1386b342f7: overlayworkingctx: inherit from committablectx instead of workingctx (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1240?vs=4232&id=4269

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

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




To: phillco, #hg-reviewers, durin42
Cc: mercurial-devel

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1976,9 +1976,9 @@
     def setflags(self, l, x):
         self._repo.wvfs.setflags(self._path, l, x)
 
-class overlayworkingctx(workingctx):
-    """Wraps another mutable context with a write-back cache that can be flushed
-    at a later time.
+class overlayworkingctx(committablectx):
+    """Wraps another mutable context with a write-back cache that can be
+    converted into a commit context.
 
     self._cache[path] maps to a dict with keys: {
         'exists': bool?
@@ -2161,7 +2161,7 @@
         return overlayworkingfilectx(self._repo, path, parent=self,
                                      filelog=filelog)
 
-class overlayworkingfilectx(workingfilectx):
+class overlayworkingfilectx(committablefilectx):
     """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory
     cache, which can be flushed through later by calling ``flush()``."""