mercurial/bundlerepo.py
changeset 18115 6db318a15a12
parent 18014 a39fe76c4c65
child 18142 11d1a9143adb
--- a/mercurial/bundlerepo.py	Thu Dec 20 13:23:29 2012 +0100
+++ b/mercurial/bundlerepo.py	Thu Dec 20 12:17:44 2012 +0100
@@ -32,6 +32,7 @@
         self.bundle = bundle
         self.basemap = {}
         n = len(self)
+        self.disktiprev = n - 1
         chain = None
         self.bundlenodes = []
         while True:
@@ -284,9 +285,11 @@
     def getcwd(self):
         return os.getcwd() # always outside the repo
 
-    def _writebranchcache(self, branches, tip, tiprev):
-        # don't overwrite the disk cache with bundle-augmented data
-        pass
+    def _cacheabletip(self):
+        # we should not cache data from the bundle on disk
+        ret = super(bundlerepository, self)._cacheabletip()
+        return min(self.changelog.disktiprev, ret)
+
 
 def instance(ui, path, create):
     if create: