Mercurial > hg-stable
comparison mercurial/dirstate.py @ 12387:4f8067c94729
cleanup: use x in (a, b) instead of x == a or x == b
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Thu, 23 Sep 2010 00:02:31 -0500 |
parents | e0ee3e822a9a |
children | 4cdaf1adafc8 |
comparison
equal
deleted
inserted
replaced
12386:8eedf53547b8 | 12387:4f8067c94729 |
---|---|
529 #file deleted on disk but still in dirstate | 529 #file deleted on disk but still in dirstate |
530 results[nf] = None | 530 results[nf] = None |
531 match.dir(nf) | 531 match.dir(nf) |
532 if not dirignore(nf): | 532 if not dirignore(nf): |
533 wadd(nf) | 533 wadd(nf) |
534 elif kind == regkind or kind == lnkkind: | 534 elif kind in (regkind, lnkkind): |
535 results[nf] = st | 535 results[nf] = st |
536 else: | 536 else: |
537 badfn(ff, badtype(kind)) | 537 badfn(ff, badtype(kind)) |
538 if nf in dmap: | 538 if nf in dmap: |
539 results[nf] = None | 539 results[nf] = None |