Rev 4711: handle when content goes missing during an autopack (bug #495000) in http://bazaar.launchpad.net/~jameinel/bzr/2.0.4-495000-win32-autopack

John Arbash Meinel john at arbash-meinel.com
Wed Dec 16 20:20:18 GMT 2009


At http://bazaar.launchpad.net/~jameinel/bzr/2.0.4-495000-win32-autopack

------------------------------------------------------------
revno: 4711
revision-id: john at arbash-meinel.com-20091216202004-22zb9k6mzx4a4cgu
parent: pqm at pqm.ubuntu.com-20091215185122-u7np9em9l26jvfgj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.4-495000-win32-autopack
timestamp: Wed 2009-12-16 14:20:04 -0600
message:
  handle when content goes missing during an autopack (bug #495000)
  
  This is the trivial fix, which is to pass down the reload func
  while we are packing. Manual testing shows that this works, need
  to figure out why the test suite missed it. Probably because
  it invasively grabs part of the code to inject the concurrency,
  which is sub-ideal, but I don't have a great alternative in mind.
-------------- next part --------------
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py	2009-09-24 20:03:43 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py	2009-12-16 20:20:04 +0000
@@ -352,7 +352,8 @@
         """Build a VersionedFiles instance on top of this group of packs."""
         index_name = index_name + '_index'
         index_to_pack = {}
-        access = knit._DirectPackAccess(index_to_pack)
+        access = knit._DirectPackAccess(index_to_pack,
+                                        reload_func=self._reload_func)
         if for_write:
             # Use new_pack
             if self.new_pack is None:



More information about the bazaar-commits mailing list