Mercurial > hg
comparison mercurial/revlogutils/deltas.py @ 39594:bdb41eaa8b59
snapshot: fix line order when skipping over empty deltas
The code movement in 37957e07138c introduced an error.
Since 8f83a953dddf, we discarded some revisions because they are identical to
their delta base (and use that delta base instead). That logic is good,
however, in 37957e07138c we mixed up the order of two line, adding the "new"
revision to the set of already tested one, instead of the discarded one. So in
practice, we were never investigating any revisions in a chain starting with
an empty delta. Creating significantly worst delta chain (eg: Mercurial's
manifest move goes from about 60MB up to about 80MB).
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 10 Sep 2018 10:11:21 +0200 |
parents | c6b8eab5db19 |
children | a911932d5003 |
comparison
equal
deleted
inserted
replaced
39593:c8514f858788 | 39594:bdb41eaa8b59 |
---|---|
594 break | 594 break |
595 group = [] | 595 group = [] |
596 for rev in temptative: | 596 for rev in temptative: |
597 # skip over empty delta (no need to include them in a chain) | 597 # skip over empty delta (no need to include them in a chain) |
598 while not (rev == nullrev or rev in tested or deltalength(rev)): | 598 while not (rev == nullrev or rev in tested or deltalength(rev)): |
599 tested.add(rev) | |
599 rev = deltaparent(rev) | 600 rev = deltaparent(rev) |
600 tested.add(rev) | |
601 # filter out revision we tested already | 601 # filter out revision we tested already |
602 if rev in tested: | 602 if rev in tested: |
603 continue | 603 continue |
604 tested.add(rev) | 604 tested.add(rev) |
605 # filter out delta base that will never produce good delta | 605 # filter out delta base that will never produce good delta |