# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1376590370 18000
# Node ID d25fdd4c2fd1362e8262f236b47fc81c194315d7
# Parent  f0f8380ec516e69dc129ffe92cb48a6d6ff151d9
commitablefilectx: move __init__ from workingfilectx

diff -r f0f8380ec516 -r d25fdd4c2fd1 mercurial/context.py
--- a/mercurial/context.py	Thu Aug 15 13:11:51 2013 -0500
+++ b/mercurial/context.py	Thu Aug 15 13:12:50 2013 -0500
@@ -1192,12 +1192,6 @@
     """A commitablefilectx provides common functionality for a file context that
     wants the ability to commit, e.g. workingfilectx or memfilectx."""
     def __init__(self, repo, path, filelog=None, ctx=None):
-        pass
-
-class workingfilectx(commitablefilectx):
-    """A workingfilectx object makes access to data related to a particular
-       file in the working directory convenient."""
-    def __init__(self, repo, path, filelog=None, workingctx=None):
         self._repo = repo
         self._path = path
         self._changeid = None
@@ -1205,8 +1199,14 @@
 
         if filelog is not None:
             self._filelog = filelog
-        if workingctx:
-            self._changectx = workingctx
+        if ctx:
+            self._changectx = ctx
+
+class workingfilectx(commitablefilectx):
+    """A workingfilectx object makes access to data related to a particular
+       file in the working directory convenient."""
+    def __init__(self, repo, path, filelog=None, workingctx=None):
+        super(workingfilectx, self).__init__(repo, path, filelog, workingctx)
 
     @propertycache
     def _changectx(self):