Show More
@@ -744,10 +744,10 b' class dirstate(object):' | |||||
744 | skipstep3 = True |
|
744 | skipstep3 = True | |
745 |
|
745 | |||
746 | if not exact and self._checkcase: |
|
746 | if not exact and self._checkcase: | |
747 | normalize = self._normalize |
|
747 | normalizefile = self._normalizefile | |
748 | skipstep3 = False |
|
748 | skipstep3 = False | |
749 | else: |
|
749 | else: | |
750 | normalize = None |
|
750 | normalizefile = None | |
751 |
|
751 | |||
752 | # step 1: find all explicit files |
|
752 | # step 1: find all explicit files | |
753 | results, work, dirsnotfound = self._walkexplicit(match, subrepos) |
|
753 | results, work, dirsnotfound = self._walkexplicit(match, subrepos) | |
@@ -772,8 +772,11 b' class dirstate(object):' | |||||
772 | continue |
|
772 | continue | |
773 | raise |
|
773 | raise | |
774 | for f, kind, st in entries: |
|
774 | for f, kind, st in entries: | |
775 | if normalize: |
|
775 | if normalizefile: | |
776 | nf = normalize(nd and (nd + "/" + f) or f, True, True) |
|
776 | # even though f might be a directory, we're only interested | |
|
777 | # in comparing it to files currently in the dmap -- | |||
|
778 | # therefore normalizefile is enough | |||
|
779 | nf = normalizefile(nd and (nd + "/" + f) or f, True, True) | |||
777 | else: |
|
780 | else: | |
778 | nf = nd and (nd + "/" + f) or f |
|
781 | nf = nd and (nd + "/" + f) or f | |
779 | if nf not in results: |
|
782 | if nf not in results: |
General Comments 0
You need to be logged in to leave comments.
Login now