# HG changeset patch # User Matt Mackall # Date 1288639122 18000 # Node ID e255a5dc29e6d0baaf9544c1005c7c3c6a9ce164 # Parent ae163a0a3cd098760e0af0e71e9be8088c1d0fa0 dirstate: skip optimization on case-folding FS (issue2440) diff -r ae163a0a3cd0 -r e255a5dc29e6 mercurial/dirstate.py --- 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