equal
deleted
inserted
replaced
456 continue |
456 continue |
457 for sd in subdirs: |
457 for sd in subdirs: |
458 ds = os.path.join(nd, sd +'/') |
458 ds = os.path.join(nd, sd +'/') |
459 if self.ignore(ds) or not match(ds): |
459 if self.ignore(ds) or not match(ds): |
460 subdirs.remove(sd) |
460 subdirs.remove(sd) |
|
461 subdirs.sort() |
|
462 fl.sort() |
461 for fn in fl: |
463 for fn in fl: |
462 fn = util.pconvert(os.path.join(d, fn)) |
464 fn = util.pconvert(os.path.join(d, fn)) |
463 yield 'f', fn |
465 yield 'f', fn |
464 else: |
466 else: |
465 yield 'f', f[len(self.root) + 1:] |
467 yield 'f', f[len(self.root) + 1:] |
466 |
468 |
467 for k in dc.keys(): |
469 ks = dc.keys() |
|
470 ks.sort() |
|
471 for k in ks: |
468 yield 'm', k |
472 yield 'm', k |
469 |
473 |
470 # yield only files that match: all in dirstate, others only if |
474 # yield only files that match: all in dirstate, others only if |
471 # not in .hgignore |
475 # not in .hgignore |
472 |
476 |