Mercurial > hg

changeset 23242:18168938e1c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 23 Oct 2014 17:00:38 -0700
parents dd610f1d46c9
children c58432685cff
files mercurial/context.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Thu Oct 23 16:19:56 2014 -0700
+++ b/mercurial/context.py	Thu Oct 23 17:00:38 2014 -0700
@@ -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