equal
deleted
inserted
replaced
395 for f in util.unique(files): |
395 for f in util.unique(files): |
396 f = os.path.join(self.root, f) |
396 f = os.path.join(self.root, f) |
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: |
|
401 subdirs.remove(".hg") |
|
402 for sd in subdirs: |
400 for sd in subdirs: |
403 if ignore(os.path.join(d, sd + '/')): |
401 if sd == ".hg" or ignore(os.path.join(d, sd +'/')): |
404 subdirs.remove(sd) |
402 subdirs.remove(sd) |
405 for fn in fl: |
403 for fn in fl: |
406 fn = util.pconvert(os.path.join(d, fn)) |
404 fn = util.pconvert(os.path.join(d, fn)) |
407 yield fn |
405 yield fn |
408 else: |
406 else: |