[PATCH 7 of 7] context.status: only filter suspect symlinks in the dirstate status

[Martin von Zweigbergk]

# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1414108838 25200
#      Thu Oct 23 17:00:38 2014 -0700
# Branch stable
# Node ID 56e742cf0a448300308458166eabb623dfdf0217
# Parent  38535ef5532437be7eb415ace3122034d7a0fbf2
context.status: only filter suspect symlinks in the dirstate status

We don't care about filtering out symlinks that have already been
committed with full content, only those that have been accidentally
resolved in the working directory.

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1424,14 +1424,14 @@
         against its parent (repo['.']).
         """
         s = self._dirstatestatus(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])
         if other != self._repo['.']:
             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