status: don't override _buildstatus() in workingcommitctx
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 08 Jan 2015 13:29:06 -0800
changeset 23777 a4951adebfb0
parent 23776 70bf92b87410
child 23778 a5dbec255f14
status: don't override _buildstatus() in workingcommitctx Now that the caching into _status is done in workingctx._dirstatestatus(), which workingcommitctx._dirstatestatus() does not call, there is no caching to prevent in _buildstatus(), so stop overriding it.
mercurial/context.py
--- a/mercurial/context.py	Thu Jan 08 13:12:44 2015 -0800
+++ b/mercurial/context.py	Thu Jan 08 13:29:06 2015 -0800
@@ -1647,18 +1647,6 @@
         super(workingctx, self).__init__(repo, text, user, date, extra,
                                          changes)
 
-    def _buildstatus(self, other, s, match,
-                     listignored, listclean, listunknown):
-        """Prevent ``workingctx._buildstatus`` from changing ``self._status``
-        """
-        s = self._dirstatestatus(match, listignored, listclean, listunknown)
-        if other != self._repo['.']:
-            # workingctx._buildstatus doesn't change self._status in this case
-            superself = super(workingcommitctx, self)
-            s = superself._buildstatus(other, s, match,
-                                       listignored, listclean, listunknown)
-        return s
-
     def _dirstatestatus(self, match=None, ignored=False, clean=False,
                         unknown=False):
         """Return matched files only in ``self._status``