Show More
@@ -605,7 +605,7 b' class dirstate(object):' | |||||
605 | normalize = self._normalize |
|
605 | normalize = self._normalize | |
606 | skipstep3 = False |
|
606 | skipstep3 = False | |
607 | else: |
|
607 | else: | |
608 |
normalize = |
|
608 | normalize = None | |
609 |
|
609 | |||
610 | files = sorted(match.files()) |
|
610 | files = sorted(match.files()) | |
611 | subrepos.sort() |
|
611 | subrepos.sort() | |
@@ -626,7 +626,10 b' class dirstate(object):' | |||||
626 |
|
626 | |||
627 | # step 1: find all explicit files |
|
627 | # step 1: find all explicit files | |
628 | for ff in files: |
|
628 | for ff in files: | |
629 | nf = normalize(normpath(ff), False, True) |
|
629 | if normalize: | |
|
630 | nf = normalize(normpath(ff), False, True) | |||
|
631 | else: | |||
|
632 | nf = normpath(ff) | |||
630 | if nf in results: |
|
633 | if nf in results: | |
631 | continue |
|
634 | continue | |
632 |
|
635 | |||
@@ -676,7 +679,10 b' class dirstate(object):' | |||||
676 | continue |
|
679 | continue | |
677 | raise |
|
680 | raise | |
678 | for f, kind, st in entries: |
|
681 | for f, kind, st in entries: | |
679 | nf = normalize(nd and (nd + "/" + f) or f, True, True) |
|
682 | if normalize: | |
|
683 | nf = normalize(nd and (nd + "/" + f) or f, True, True) | |||
|
684 | else: | |||
|
685 | nf = nd and (nd + "/" + f) or f | |||
680 | if nf not in results: |
|
686 | if nf not in results: | |
681 | if kind == dirkind: |
|
687 | if kind == dirkind: | |
682 | if not ignore(nf): |
|
688 | if not ignore(nf): |
General Comments 0
You need to be logged in to leave comments.
Login now