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: subdirs.remove(".hg") |
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:] |
|
410 |
|
411 for k in dc.keys(): |
|
412 yield k |
406 |
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 |
410 |
417 |