Mercurial > hg
comparison mercurial/commands.py @ 3384:5e6c19919741
log --copies: use manifest.find instead of delta when manifest parent is not rev-1
This fixes issue391.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Fri, 13 Oct 2006 09:58:55 -0700 |
parents | e4aa22eaa0e4 |
children | 55476ce8e59c |
comparison
equal
deleted
inserted
replaced
3383:c7c6f1a45348 | 3384:5e6c19919741 |
---|---|
1838 ncache[fn][node] = renamed | 1838 ncache[fn][node] = renamed |
1839 if lr >= endrev: | 1839 if lr >= endrev: |
1840 break | 1840 break |
1841 if rev in rcache[fn]: | 1841 if rev in rcache[fn]: |
1842 return rcache[fn][rev] | 1842 return rcache[fn][rev] |
1843 if repo.manifest.parentrevs(rev) != (rev - 1, -1): | |
1844 return ncache[fn].get(repo.manifest.find(man, fn)[0]) | |
1843 if not dcache or dcache[0] != man: | 1845 if not dcache or dcache[0] != man: |
1844 dcache[:] = [man, repo.manifest.readdelta(man)] | 1846 dcache[:] = [man, repo.manifest.readdelta(man)] |
1845 if fn in dcache[1]: | 1847 if fn in dcache[1]: |
1846 return ncache[fn].get(dcache[1][fn]) | 1848 return ncache[fn].get(dcache[1][fn]) |
1847 return None | 1849 return None |