Mercurial > hg-stable

changeset 12907:e255a5dc29e6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: skip optimization on case-folding FS (issue2440)
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Nov 2010 14:18:42 -0500
parents ae163a0a3cd0
children 333421b9e0f9
files mercurial/dirstate.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Mon Nov 01 01:56:12 2010 +0100
+++ b/mercurial/dirstate.py	Mon Nov 01 14:18:42 2010 -0500
@@ -485,11 +485,6 @@
         work = []
         wadd = work.append
 
-        if self._checkcase:
-            normalize = self._normalize
-        else:
-            normalize = lambda x, y: x
-
         exact = skipstep3 = False
         if matchfn == match.exact: # match.exact
             exact = True
@@ -497,6 +492,12 @@
         elif match.files() and not match.anypats(): # match.match, no patterns
             skipstep3 = True
 
+        if self._checkcase:
+            normalize = self._normalize
+            skipstep3 = False
+        else:
+            normalize = lambda x, y: x
+
         files = sorted(match.files())
         subrepos.sort()
         i, j = 0, 0