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

revlog: move textlen calculation to be above delta chooser

Browse Source 
This moves the textlen calculation to be above the delta chooser. Since textlen
is needed for calling isgooddelta, we need it above the delta chooser so future
patches can call isgooddelta.
This commit is contained in:
Durham Goode 2015-08-30 13:34:30 -07:00
parent 2ff0cbe125
commit 47e86258b9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mercurial/revlog.py
View File

@ -1332,6 +1332,14 @@ class revlog(object):
basecache = self._basecache
p1r, p2r = self.rev(p1), self.rev(p2)
# full versions are inserted when the needed deltas
# become comparable to the uncompressed text
if text is None:
textlen = mdiff.patchedsize(self.rawsize(cachedelta[0]),
cachedelta[1])
else:
textlen = len(text)
# should we try to build a delta?
if prev != nullrev:
if self._generaldelta:
@ -1345,14 +1353,6 @@ class revlog(object):
d = builddelta(prev)
dist, l, data, base, chainbase, chainlen, compresseddeltalen = d
# full versions are inserted when the needed deltas
# become comparable to the uncompressed text
if text is None:
textlen = mdiff.patchedsize(self.rawsize(cachedelta[0]),
cachedelta[1])
else:
textlen = len(text)
if not self._isgooddelta(d, textlen):
text = buildtext()
data = self.compress(text)