Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 1847:94498a262d15
fix annotate for removed files
walk in the manifest files instead of the working dir files
when running annotate
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 07 Mar 2006 20:37:27 +0100 |
parents | d17f19d84fd3 |
children | 5c374776a8bc |
comparison
equal
deleted
inserted
replaced
1846:4d2791f4ef80 | 1847:94498a262d15 |
---|---|
591 else: | 591 else: |
592 node = repo.dirstate.parents()[0] | 592 node = repo.dirstate.parents()[0] |
593 change = repo.changelog.read(node) | 593 change = repo.changelog.read(node) |
594 mmap = repo.manifest.read(change[0]) | 594 mmap = repo.manifest.read(change[0]) |
595 | 595 |
596 for src, abs, rel, exact in walk(repo, pats, opts): | 596 for src, abs, rel, exact in walk(repo, pats, opts, node=node): |
597 if abs not in mmap: | |
598 ui.warn(_("warning: %s is not in the repository!\n") % | |
599 ((pats and rel) or abs)) | |
600 continue | |
601 | |
602 f = repo.file(abs) | 597 f = repo.file(abs) |
603 if not opts['text'] and util.binary(f.read(mmap[abs])): | 598 if not opts['text'] and util.binary(f.read(mmap[abs])): |
604 ui.write(_("%s: binary file\n") % ((pats and rel) or abs)) | 599 ui.write(_("%s: binary file\n") % ((pats and rel) or abs)) |
605 continue | 600 continue |
606 | 601 |