Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context.status: inline _poststatus()
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 23 Oct 2014 16:19:56 -0700
changeset 23241 dd610f1d46c9
parent 23240 c26073dfbbe6
child 23242 18168938e1c1
context.status: inline _poststatus() By inlining _poststatus() into _buildstatus(), it becomes clearer that it is only called for the workingctx.
mercurial/context.py file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Sun Oct 12 00:06:40 2014 -0700
+++ b/mercurial/context.py	Thu Oct 23 16:19:56 2014 -0700
@@ -93,14 +93,6 @@
         """
         return match or matchmod.always(self._repo.root, self._repo.getcwd())
 
-    def _poststatus(self, other, s, match, listignored, listclean, listunknown):
-        """provide a hook to allow child objects to postprocess status results
-
-        For example, this allows other contexts, such as workingctx, to filter
-        suspect symlinks in the case of FAT32 and NTFS filesystems.
-        """
-        return s
-
     def _buildstatus(self, other, s, match, listignored, listclean,
                      listunknown):
         """build a status with respect to another context"""
@@ -306,8 +298,6 @@
         r = [[], [], [], [], [], [], []]
         r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
                               listunknown)
-        r = ctx2._poststatus(ctx1, r, match, listignored, listclean,
-                             listunknown)
 
         if reversed:
             # reverse added and removed
@@ -1401,17 +1391,6 @@
                 del mf[f]
         return mf
 
-    def _poststatus(self, other, s, match, listignored, listclean, listunknown):
-        """override the parent hook with a filter for suspect symlinks
-
-        We use this _poststatus hook to filter out symlinks that might have
-        accidentally ended up with the entire contents of the file they are
-        supposed to be linking to.
-        """
-        s[0] = self._filtersuspectsymlink(s[0])
-        self._status = scmutil.status(*s)
-        return s
-
     def _dirstatestatus(self, match=None, ignored=False, clean=False,
                         unknown=False):
         '''Gets the status from the dirstate -- internal use only.'''
@@ -1449,6 +1428,11 @@
             s = super(workingctx, self)._buildstatus(other, s, match,
                                                      listignored, listclean,
                                                      listunknown)
+        # Filter out symlinks that, in the case of FAT32 and NTFS filesytems,
+        # might have accidentally ended up with the entire contents of the file
+        # they are susposed to be linking to.
+        s[0] = self._filtersuspectsymlink(s[0])
+        self._status = scmutil.status(*s)
         return s
 
     def _matchstatus(self, other, match):
mercurial