Mercurial > hg

changeset 26117:4dc5b51f38fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: change generaldelta delta parent heuristic The old generaldelta heuristic was "if p1 (or p2) was closer than the last full text, use it, otherwise use prev". This was problematic when a repo contained multiple branches that were very different. If commits to branch A were pushed, and the last full text was branch B, it would generate a fulltext. Then if branch B was pushed, it would generate another fulltext. The problem is that the last fulltext (and delta'ing against `prev` in general) has no correlation with the contents of the incoming revision, and therefore will always have degenerate cases. According to the blame, that algorithm was chosen to minimize the chain length. Since there is already code that protects against that (the delta-vs-fulltext code), and since it has been improved since the original generaldelta algorithm went in (2011), I believe the chain length criteria will still be preserved. The new algorithm always diffs against p1 (or p2 if it's closer), unless the resulting delta will fail the delta-vs-fulltext check, in which case we delta against prev. Some before and after stats on manifest.d size. internal large repo old heuristic - 2.0 GB new heuristic - 1.2 GB mozilla-central old heuristic - 242 MB new heuristic - 261 MB The regression in mozilla central is due to the new heuristic choosing p2r as the delta when it's closer to the tip. Switching the algorithm to always prefer p1r brings the size back down (242 MB). This is result of the way in which mozilla does merges and pushes, and the result could easily swing the other direction in other repos (depending on if they merge X into Y or Y into X), but will never be as degenerate as before. I future patch will address the regression by introducing an optional, even more aggressive delta heuristic which will knock the mozilla manifest size down dramatically.
author Durham Goode <durham@fb.com>
date Sun, 30 Aug 2015 13:58:11 -0700
parents 562cfc99e611
children 049005de325e
files mercurial/revlog.py
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revlog.py	Sun Aug 30 13:34:30 2015 -0700
+++ b/mercurial/revlog.py	Sun Aug 30 13:58:11 2015 -0700
@@ -1343,11 +1343,14 @@
         # should we try to build a delta?
         if prev != nullrev:
             if self._generaldelta:
-                if p1r >= basecache[1]:
-                    d = builddelta(p1r)
-                elif p2r >= basecache[1]:
-                    d = builddelta(p2r)
-                else:
+                # Pick whichever parent is closer to us (to minimize the
+                # chance of having to build a fulltext). Since
+                # nullrev == -1, any non-merge commit will always pick p1r.
+                drev = p2r if p2r > p1r else p1r
+                d = builddelta(drev)
+                # If the chosen delta will result in us making a full text,
+                # give it one last try against prev.
+                if drev != prev and not self._isgooddelta(d, textlen):
                     d = builddelta(prev)
             else:
                 d = builddelta(prev)