Show More
@@ -397,13 +397,20 b' class dirstate:' | |||||
397 | if os.path.isdir(f): |
|
397 | if os.path.isdir(f): | |
398 | for dir, subdirs, fl in os.walk(f): |
|
398 | for dir, subdirs, fl in os.walk(f): | |
399 | d = dir[len(self.root) + 1:] |
|
399 | d = dir[len(self.root) + 1:] | |
400 |
if ".hg" in subdirs: |
|
400 | if ".hg" in subdirs: | |
|
401 | subdirs.remove(".hg") | |||
|
402 | for sd in subdirs: | |||
|
403 | if ignore(os.path.join(d, sd + '/')): | |||
|
404 | subdirs.remove(sd) | |||
401 | for fn in fl: |
|
405 | for fn in fl: | |
402 | fn = util.pconvert(os.path.join(d, fn)) |
|
406 | fn = util.pconvert(os.path.join(d, fn)) | |
403 | yield fn |
|
407 | yield fn | |
404 | else: |
|
408 | else: | |
405 | yield f[len(self.root) + 1:] |
|
409 | yield f[len(self.root) + 1:] | |
406 |
|
410 | |||
|
411 | for k in dc.keys(): | |||
|
412 | yield k | |||
|
413 | ||||
407 | for fn in util.unique(walk(files)): |
|
414 | for fn in util.unique(walk(files)): | |
408 | try: s = os.stat(os.path.join(self.root, fn)) |
|
415 | try: s = os.stat(os.path.join(self.root, fn)) | |
409 | except: continue |
|
416 | except: continue |
General Comments 0
You need to be logged in to leave comments.
Login now