committablectx: move status to workingctx
authorSean Farley <sean.michael.farley@gmail.com>
Tue, 11 Mar 2014 18:28:09 -0500
changeset 21396 3925d9460d27
parent 21395 f251b92d9ed9
child 21397 38743c59f3f8
committablectx: move status to workingctx This method was accidentally placed into the committablectx class. It contains logic for querying the dirstate so we move it to the correct class.
mercurial/context.py
--- a/mercurial/context.py	Tue Mar 11 18:10:00 2014 -0500
+++ b/mercurial/context.py	Tue Mar 11 18:28:09 2014 -0500
@@ -931,22 +931,6 @@
     def _date(self):
         return util.makedate()
 
-    def status(self, ignored=False, clean=False, unknown=False):
-        """Explicit status query
-        Unless this method is used to query the working copy status, the
-        _status property will implicitly read the status using its default
-        arguments."""
-        stat = self._repo.status(ignored=ignored, clean=clean, unknown=unknown)
-        self._unknown = self._ignored = self._clean = None
-        if unknown:
-            self._unknown = stat[4]
-        if ignored:
-            self._ignored = stat[5]
-        if clean:
-            self._clean = stat[6]
-        self._status = stat[:4]
-        return stat
-
     def user(self):
         return self._user or self._repo.ui.username()
     def date(self):
@@ -1229,6 +1213,22 @@
                 pass
         return modified, fixup
 
+    def status(self, ignored=False, clean=False, unknown=False):
+        """Explicit status query
+        Unless this method is used to query the working copy status, the
+        _status property will implicitly read the status using its default
+        arguments."""
+        stat = self._repo.status(ignored=ignored, clean=clean, unknown=unknown)
+        self._unknown = self._ignored = self._clean = None
+        if unknown:
+            self._unknown = stat[4]
+        if ignored:
+            self._ignored = stat[5]
+        if clean:
+            self._clean = stat[6]
+        self._status = stat[:4]
+        return stat
+
 
 class committablefilectx(basefilectx):
     """A committablefilectx provides common functionality for a file context