Rev 2336: we don't need _inventory_fp. in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/make_locking_cheaper

John Arbash Meinel john at arbash-meinel.com
Wed Mar 21 18:16:05 GMT 2007


At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/make_locking_cheaper

------------------------------------------------------------
revno: 2336
revision-id: john at arbash-meinel.com-20070321181557-09nrfljkinlmyjmp
parent: john at arbash-meinel.com-20070321175142-052tm470fx9s0obl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Wed 2007-03-21 13:15:57 -0500
message:
  we don't need _inventory_fp.
  
  The bug is that calling self.read_working_inventory() acquires a read lock,
  which has a side effect of reading the working inventory,
  and then it reads the working inventory,
  and then because the overall tree is not locked (this is all happening in WorkingTree.__init__)
  all of this is being thrown away.
  So we end up with 2 inventory reads which will be completely thrown away.
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
-------------- next part --------------
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2007-03-21 17:51:42 +0000
+++ b/bzrlib/workingtree.py	2007-03-21 18:15:57 +0000
@@ -280,7 +280,6 @@
             # This will be acquired on lock_read() or lock_write()
             self._inventory_is_modified = False
             self._inventory = None
-            self._inventory_fp = None
         else:
             # the caller of __init__ has provided an inventory,
             # we assume they know what they are doing - as its only



More information about the bazaar-commits mailing list