Patchwork D1240: overlayworkingctx: inherit from committablectx instead of workingctx

login
register
mail settings
Submitter phabricator
Date Dec. 7, 2017, 9:45 p.m.
Message ID <155afcd5098cc3850648896769a92618@localhost.localdomain>
Download mbox | patch
Permalink /patch/26039/
State Not Applicable
Headers show

Comments

phabricator - Dec. 7, 2017, 9:45 p.m.
phillco updated this revision to Diff 4205.

REPOSITORY
  rHG Mercurial

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

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

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




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

Patch

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?
@@ -2155,7 +2155,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()``."""