Show More
@@ -25,21 +25,15 b' class rootcache(filecache):' | |||
|
25 | 25 | def join(self, obj, fname): |
|
26 | 26 | return obj._join(fname) |
|
27 | 27 | |
|
28 | def _finddirs(path): | |
|
29 | pos = path.rfind('/') | |
|
30 | while pos != -1: | |
|
31 | yield path[:pos] | |
|
32 | pos = path.rfind('/', 0, pos) | |
|
33 | ||
|
34 | 28 | def _incdirs(dirs, path): |
|
35 |
for base in |
|
|
29 | for base in scmutil.finddirs(path): | |
|
36 | 30 | if base in dirs: |
|
37 | 31 | dirs[base] += 1 |
|
38 | 32 | return |
|
39 | 33 | dirs[base] = 1 |
|
40 | 34 | |
|
41 | 35 | def _decdirs(dirs, path): |
|
42 |
for base in |
|
|
36 | for base in scmutil.finddirs(path): | |
|
43 | 37 | if dirs[base] > 1: |
|
44 | 38 | dirs[base] -= 1 |
|
45 | 39 | return |
@@ -346,7 +340,7 b' class dirstate(object):' | |||
|
346 | 340 | if f in self._dirs: |
|
347 | 341 | raise util.Abort(_('directory %r already in dirstate') % f) |
|
348 | 342 | # shadows |
|
349 |
for d in |
|
|
343 | for d in scmutil.finddirs(f): | |
|
350 | 344 | if d in self._dirs: |
|
351 | 345 | break |
|
352 | 346 | if d in self._map and self[d] != 'r': |
@@ -540,7 +534,7 b' class dirstate(object):' | |||
|
540 | 534 | return False |
|
541 | 535 | if self._ignore(f): |
|
542 | 536 | return True |
|
543 |
for p in |
|
|
537 | for p in scmutil.finddirs(f): | |
|
544 | 538 | if self._ignore(p): |
|
545 | 539 | return True |
|
546 | 540 | return False |
General Comments 0
You need to be logged in to leave comments.
Login now