##// END OF EJS Templates
match: don't print explicitly listed files with wrong case (BC)...
Martin von Zweigbergk -
r32397:2dac9d6a default
parent child Browse files
Show More
@@ -450,19 +450,11 b' class icasefsmatcher(matcher):'
450 init(root, cwd, patterns, include, exclude, default, auditor=auditor,
450 init(root, cwd, patterns, include, exclude, default, auditor=auditor,
451 ctx=ctx, listsubrepos=listsubrepos, badfn=badfn)
451 ctx=ctx, listsubrepos=listsubrepos, badfn=badfn)
452
452
453 # m.exact(file) must be based off of the actual user input, otherwise
454 # inexact case matches are treated as exact, and not noted without -v.
455 if self._files:
456 roots, dirs = _rootsanddirs(self._kp)
457 self._fileset = set(roots)
458 self._fileset.update(dirs)
459
460 def _normalize(self, patterns, default, root, cwd, auditor, warn):
453 def _normalize(self, patterns, default, root, cwd, auditor, warn):
461 self._kp = super(icasefsmatcher, self)._normalize(patterns, default,
454 kp = super(icasefsmatcher, self)._normalize(patterns, default, root,
462 root, cwd, auditor,
455 cwd, auditor, warn)
463 warn)
464 kindpats = []
456 kindpats = []
465 for kind, pats, source in self._kp:
457 for kind, pats, source in kp:
466 if kind not in ('re', 'relre'): # regex can't be normalized
458 if kind not in ('re', 'relre'): # regex can't be normalized
467 p = pats
459 p = pats
468 pats = self._dsnormalize(pats)
460 pats = self._dsnormalize(pats)
@@ -196,7 +196,6 b" Test that adding a directory doesn't req"
196 adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
196 adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
197
197
198 $ hg forget capsdir1/capsdir/abc.txt
198 $ hg forget capsdir1/capsdir/abc.txt
199 removing CapsDir1/CapsDir/AbC.txt (glob)
200
199
201 $ hg forget capsdir1/capsdir
200 $ hg forget capsdir1/capsdir
202 removing CapsDir1/CapsDir/SubDir/Def.txt (glob)
201 removing CapsDir1/CapsDir/SubDir/Def.txt (glob)
@@ -232,7 +231,6 b' and OS X'
232 +def
231 +def
233
232
234 $ hg mv CapsDir1/CapsDir/abc.txt CapsDir1/CapsDir/ABC.txt
233 $ hg mv CapsDir1/CapsDir/abc.txt CapsDir1/CapsDir/ABC.txt
235 moving CapsDir1/CapsDir/AbC.txt to CapsDir1/CapsDir/ABC.txt (glob)
236 $ hg ci -m "case changing rename" CapsDir1/CapsDir/AbC.txt CapsDir1/CapsDir/ABC.txt
234 $ hg ci -m "case changing rename" CapsDir1/CapsDir/AbC.txt CapsDir1/CapsDir/ABC.txt
237
235
238 $ hg status -A capsdir1/capsdir
236 $ hg status -A capsdir1/capsdir
@@ -9,7 +9,6 b' test file addition with bad case'
9 $ cd repo1
9 $ cd repo1
10 $ echo a > a
10 $ echo a > a
11 $ hg add A
11 $ hg add A
12 adding a
13 $ hg st
12 $ hg st
14 A a
13 A a
15 $ hg ci -m adda
14 $ hg ci -m adda
@@ -71,14 +70,12 b' test changing case of path components'
71 A D/c
70 A D/c
72 $ hg ci -m addc D/c
71 $ hg ci -m addc D/c
73 $ hg mv d/b d/e
72 $ hg mv d/b d/e
74 moving D/b to D/e (glob)
75 $ hg st
73 $ hg st
76 A D/e
74 A D/e
77 R D/b
75 R D/b
78 $ hg revert -aq
76 $ hg revert -aq
79 $ rm d/e
77 $ rm d/e
80 $ hg mv d/b D/B
78 $ hg mv d/b D/B
81 moving D/b to D/B (glob)
82 $ hg st
79 $ hg st
83 A D/B
80 A D/B
84 R D/b
81 R D/b
General Comments 0
You need to be logged in to leave comments. Login now