memfilectx: inherit from committablefilectx
authorSean Farley <sean.michael.farley@gmail.com>
Thu, 15 Aug 2013 15:23:36 -0500
changeset 21688 cc677803bad4
parent 21687 da67d855a8a2
child 21689 503bb3af70fe
memfilectx: inherit from committablefilectx This patch marks the beginning of having memfilectx become a full-fledged file contex so that we can handle diffing and merging.
mercurial/context.py
--- a/mercurial/context.py	Thu Aug 15 15:20:56 2013 -0500
+++ b/mercurial/context.py	Thu Aug 15 15:23:36 2013 -0500
@@ -1586,7 +1586,7 @@
         """commit context to the repo"""
         return self._repo.commitctx(self)
 
-class memfilectx(object):
+class memfilectx(committablefilectx):
     """memfilectx represents an in-memory file to commit.
 
     See memctx for more details.