# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2016-08-25 03:00:52
# Node ID d81fe5af92b810f07c61575a0675a00b47724e5f
# Parent  e83f89d3b1f733d0ee5f23f6a2293279a17fbbfb

revlog: make code in builddelta() slightly easier to read

self.compress() is destructured into its components. "l" is renamed
to "deltalen."

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -1440,18 +1440,19 @@ class revlog(object):
                         fh = dfh
                     ptext = self.revision(self.node(rev), _df=fh)
                     delta = mdiff.textdiff(ptext, t)
-            data = self.compress(delta)
-            l = len(data[1]) + len(data[0])
+            header, data = self.compress(delta)
+            deltalen = len(header) + len(data)
             chainbase = self.chainbase(rev)
-            dist = l + offset - self.start(chainbase)
+            dist = deltalen + offset - self.start(chainbase)
             if self._generaldelta:
                 base = rev
             else:
                 base = chainbase
             chainlen, compresseddeltalen = self._chaininfo(rev)
             chainlen += 1
-            compresseddeltalen += l
-            return dist, l, data, base, chainbase, chainlen, compresseddeltalen
+            compresseddeltalen += deltalen
+            return (dist, deltalen, (header, data), base,
+                    chainbase, chainlen, compresseddeltalen)
 
         curr = len(self)
         prev = curr - 1