Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 4256:fe0fe0b4d73b
Merge additional fixes for my matcher changes
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 20 Mar 2007 22:21:05 -0300 |
parents | 0d51eb296fb9 a7cae4e22749 |
children | 1cc5fc1d0994 |
comparison
equal
deleted
inserted
replaced
4251:e76e52145c3d | 4256:fe0fe0b4d73b |
---|---|
440 continue | 440 continue |
441 p = os.path.join(top, f) | 441 p = os.path.join(top, f) |
442 # don't trip over symlinks | 442 # don't trip over symlinks |
443 st = os.lstat(p) | 443 st = os.lstat(p) |
444 if stat.S_ISDIR(st.st_mode): | 444 if stat.S_ISDIR(st.st_mode): |
445 if not ignore(p): | 445 if not ignore(np): |
446 work.append(p) | 446 work.append(p) |
447 if directories: | 447 if directories: |
448 yield 'd', np, st | 448 yield 'd', np, st |
449 if imatch(np) and np in dc: | 449 if imatch(np) and np in dc: |
450 yield 'm', np, st | 450 yield 'm', np, st |