# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1288424854 18000
# Node ID 8ce6240587b1ac3add9e5ad3e7efb6d845f01ff4
# Parent  c25945a148c1514b3f459c93150e899ae4e0e957
revlog: simplify cachedelta handling

diff -r c25945a148c1 -r 8ce6240587b1 mercurial/revlog.py
--- a/mercurial/revlog.py	Sat Oct 30 02:47:34 2010 -0500
+++ b/mercurial/revlog.py	Sat Oct 30 02:47:34 2010 -0500
@@ -1188,14 +1188,12 @@
         # should we try to build a delta?
         if deltarev != nullrev:
             # can we use the cached delta?
-            if cachedelta:
-                cacherev, d = cachedelta
-                if cacherev != deltarev:
-                    text = buildtext()
-                    d = None
-            if d is None:
+            if cachedelta and cachedelta[0] == deltarev:
+                d = cachedelta[1]
+            else:
+                t = buildtext()
                 ptext = self.revision(deltanode)
-                d = mdiff.textdiff(ptext, text)
+                d = mdiff.textdiff(ptext, t)
             data = compress(d)
             l = len(data[1]) + len(data[0])
             base = self.base(deltarev)