Rev 5796: Revert weakref addition, addressed in the config-lock-remote thread. in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5796
revision-id: v.ladeuil+lp at free.fr-20110527081141-1ljbvx3v4wdtvruy
parent: v.ladeuil+lp at free.fr-20110525144714-rdwfx364m9tt0k2t
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-lock-branch
timestamp: Fri 2011-05-27 10:11:41 +0200
message:
  Revert weakref addition, addressed in the config-lock-remote thread.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-05-18 19:08:42 +0000
+++ b/bzrlib/config.py	2011-05-27 08:11:41 +0000
@@ -2368,11 +2368,8 @@
     def __init__(self, branch):
         super(BranchStore, self).__init__(branch.control_transport,
                                           'branch.conf')
-        # We don't want to create a cycle here when the BranchStore becomes
-        # part of an object (roughly a Stack, directly or indirectly) that is
-        # an attribute of the branch object itself. Since the BranchStore
-        # cannot exist without a branch, it's safe to make it a weakref.
-        self.branch = weakref.ref(branch)
+        # FIXME: This creates a cycle -- vila 2011-05-27
+        self.branch = branch
 
     def lock_write(self, token=None):
         return self.branch.lock_write(token)