facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

addrevision: only use the incoming base if it is a good delta (issue4975)

Browse Source 
Before this change, the 'lazydeltabase' would blindly build a delta using the
base provided by the incoming bundle and try to use it. If that base was far
down the revlog, the delta would be seen as "no good" and we would fall back to
a full text revision.

We now check if the delta is good and fallback to a computing a delta again the
tipmost revision otherwise (as we would do without general delta).

Later changesets will improve the logic to compute the fallback delta using the
general delta logic.
This commit is contained in:
Pierre-Yves David 2015-12-01 16:06:20 -08:00
parent 41fc9ceddb
commit 453d103fad
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/revlog.py
View File

@ -1427,7 +1427,12 @@ class revlog(object):
if cachedelta and self._generaldelta and self._lazydeltabase:
# Assume what we received from the server is a good choice
# build delta will reuse the cache
delta = builddelta(cachedelta[0])
candidatedelta = builddelta(cachedelta[0])
if self._isgooddelta(candidatedelta, textlen):
delta = candidatedelta
elif prev != candidatedelta[3]:
# Try against prev to hopefully save us a fulltext.
delta = builddelta(prev)
elif self._generaldelta:
if p2r != nullrev and self._aggressivemergedeltas:
delta = builddelta(p1r)