[PATCH] When revlog._chunkbase is removed (backout 14075:bc101902a68d by Sune Foldager) there is no failing test. Does it mean that the change is not yet finished or the code is simply redundant ?

Andrey Somov py4fun at gmail.com
Wed Aug 3 04:19:32 CDT 2011


# HG changeset patch
# User py4fun
# Date 1312317905 -7200
# Node ID 1e50bf7946849b82078ef0202f7703ca529cdc10
# Parent  d0424f39984c6d623dc8c55b85de66f15e27abd6
When revlog._chunkbase is removed (backout 14075:bc101902a68d by Sune Foldager) there is no failing test. Does it mean that the change is not yet finished or the code is simply redundant ?

diff -r d0424f39984c -r 1e50bf794684 mercurial/revlog.py
--- a/mercurial/revlog.py	Mon Aug 01 18:10:05 2011 -0500
+++ b/mercurial/revlog.py	Tue Aug 02 22:45:05 2011 +0200
@@ -829,9 +829,6 @@
     def _chunk(self, rev):
         return decompress(self._chunkraw(rev, rev))
 
-    def _chunkbase(self, rev):
-        return self._chunk(rev)
-
     def _chunkclear(self):
         self._chunkcache = (0, '')
 
@@ -875,12 +872,11 @@
         # build delta chain
         chain = []
         index = self.index # for performance
-        generaldelta = self._generaldelta
         iterrev = rev
         e = index[iterrev]
         while iterrev != e[3] and iterrev != cachedrev:
             chain.append(iterrev)
-            if generaldelta:
+            if self._generaldelta:
                 iterrev = e[3]
             else:
                 iterrev -= 1
@@ -897,7 +893,7 @@
 
         self._chunkraw(base, rev)
         if text is None:
-            text = self._chunkbase(base)
+            text = self._chunk(base)
 
         bins = [self._chunk(r) for r in chain]
         text = mdiff.patches(text, bins)


More information about the Mercurial-devel mailing list