mercurial-scm/hg-stable: mercurial/revlog.py comparison

revlog: extract delta building to a subfunction

comparison

equal deleted inserted replaced

-:8ce6240587b1
+:ad01fe38afe6
 chk = hash(btext[0], p1, p2)
 if chk != node:
 raise RevlogError(_("consistency error in delta"))
 return btext[0]
+def builddelta(rev):
+# can we use the cached delta?
+if cachedelta and cachedelta[0] == rev:
+delta = cachedelta[1]
+else:
+t = buildtext()
+ptext = self.revision(self.node(rev))
+delta = mdiff.textdiff(ptext, t)
+data = compress(delta)
+l = len(data[1]) + len(data[0])
+base = self.base(rev)
+dist = l + offset - self.start(base)
+return dist, l, data, base
 curr = len(self)
 prev = curr - 1
 base = curr
 offset = self.end(prev)
 flags = 0
 else:
 deltarev, deltanode = prev, self.node(prev)
 # should we try to build a delta?
 if deltarev != nullrev:
-# can we use the cached delta?
+d = builddelta(deltarev)
-if cachedelta and cachedelta[0] == deltarev:
+dist, l, data, base = d
-d = cachedelta[1]
-else:
-t = buildtext()
-ptext = self.revision(deltanode)
-d = mdiff.textdiff(ptext, t)
-data = compress(d)
-l = len(data[1]) + len(data[0])
-base = self.base(deltarev)
-dist = l + offset - self.start(base)
 # full versions are inserted when the needed deltas
 # become comparable to the uncompressed text
 # or the base revision is punched
 if text is None:

Mercurial > public > mercurial-scm > hg-stable