comparison mercurial/revlog.py @ 30011:d81fe5af92b8

revlog: make code in builddelta() slightly easier to read self.compress() is destructured into its components. "l" is renamed to "deltalen."
author Gregory Szorc <gregory.szorc@gmail.com>
date Wed, 24 Aug 2016 20:00:52 -0700
parents b5e5ddf48bd2
children 60a66c79125f
comparison
equal deleted inserted replaced
30008:e83f89d3b1f7 30011:d81fe5af92b8
1438 fh = ifh 1438 fh = ifh
1439 else: 1439 else:
1440 fh = dfh 1440 fh = dfh
1441 ptext = self.revision(self.node(rev), _df=fh) 1441 ptext = self.revision(self.node(rev), _df=fh)
1442 delta = mdiff.textdiff(ptext, t) 1442 delta = mdiff.textdiff(ptext, t)
1443 data = self.compress(delta) 1443 header, data = self.compress(delta)
1444 l = len(data[1]) + len(data[0]) 1444 deltalen = len(header) + len(data)
1445 chainbase = self.chainbase(rev) 1445 chainbase = self.chainbase(rev)
1446 dist = l + offset - self.start(chainbase) 1446 dist = deltalen + offset - self.start(chainbase)
1447 if self._generaldelta: 1447 if self._generaldelta:
1448 base = rev 1448 base = rev
1449 else: 1449 else:
1450 base = chainbase 1450 base = chainbase
1451 chainlen, compresseddeltalen = self._chaininfo(rev) 1451 chainlen, compresseddeltalen = self._chaininfo(rev)
1452 chainlen += 1 1452 chainlen += 1
1453 compresseddeltalen += l 1453 compresseddeltalen += deltalen
1454 return dist, l, data, base, chainbase, chainlen, compresseddeltalen 1454 return (dist, deltalen, (header, data), base,
1455 chainbase, chainlen, compresseddeltalen)
1455 1456
1456 curr = len(self) 1457 curr = len(self)
1457 prev = curr - 1 1458 prev = curr - 1
1458 offset = self.end(prev) 1459 offset = self.end(prev)
1459 delta = None 1460 delta = None