changeset 21480:d19f491e5d5b

workingctx: use inheritance for _buildstatus while keeping the fastpath This patch maintains the fast path for workingctx which is to not build a manifest if the working directory is being compared to its parent since, in this case, we can just copy the parent manifest.
author Sean Farley <sean.michael.farley@gmail.com>
date Thu, 24 Apr 2014 08:34:44 -0500
parents e18ef2e11219
children 2f1567ef70ba
files mercurial/context.py mercurial/localrepo.py
diffstat 2 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Tue Apr 22 19:06:37 2014 -0500
+++ b/mercurial/context.py	Thu Apr 24 08:34:44 2014 -0500
@@ -1327,6 +1327,21 @@
 
         return [modified, added, removed, deleted, unknown, ignored, clean]
 
+    def _buildstatus(self, other, s, match, listignored, listclean,
+                        listunknown):
+        """build a status with respect to another context
+
+        This includes logic for maintaining the fast path of status when
+        comparing the working directory against its parent, which is to skip
+        building a new manifest if self (working directory) is not comparing
+        against its parent (repo['.']).
+        """
+        if other != self._repo['.']:
+            s = super(workingctx, self)._buildstatus(other, s, match,
+                                                     listignored, listclean,
+                                                     listunknown)
+        return s
+
     def status(self, ignored=False, clean=False, unknown=False, match=None):
         """Explicit status query
         Unless this method is used to query the working copy status, the
--- a/mercurial/localrepo.py	Tue Apr 22 19:06:37 2014 -0500
+++ b/mercurial/localrepo.py	Thu Apr 24 08:34:44 2014 -0500
@@ -1551,11 +1551,8 @@
 
         r = [[], [], [], [], [], [], []]
         r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown)
-
-        if not parentworking:
-            r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
-                                  listunknown)
-
+        r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
+                              listunknown)
         r = ctx2._poststatus(ctx1, r, match, listignored, listclean,
                              listunknown)