Merge lp:~gagern/trac-bzr/bug484324 into lp:trac-bzr

[Martin von Gagern]

=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2009-06-03 21:18:09 +0000
+++ tracbzr/backend.py	2009-11-18 09:20:26 +0000
@@ -131,6 +131,31 @@
             repo.unlock()
 
 
+class LockedBranches(object):
+
+    """Keep track of locks and ensure they get unlocked one day.
+    This deals with the fact that Trac doesn't always call the repository
+    close method, and that a __del__ method in the repository itself causes
+    trouble as described in https://bugs.launchpad.net/trac-bzr/+bug/484324"""
+
+    def __init__(self):
+        self._locked_branches = []
+
+    def __del__(self):
+        # XXX Eeeeeww. Unfortunately for us trac does not actually call the
+        # close method of BzrRepository. So we do this. Quite silly, since
+        # bzr does the same thing (printing a warning...)
+        self.unlock()
+
+    def append(self, branch):
+        self._locked_branches.append(branch)
+
+    def unlock(self):
+        for branch in self._locked_branches:
+            branch.unlock()
+        self._locked_branches = []
+
+
 class BzrRepository(versioncontrol.Repository):
 
     """Present a bzr branch as a trac repository."""
@@ -139,7 +164,7 @@
         versioncontrol.Repository.__init__(self, location, None, log)
         self.root_transport = transport.get_transport(location)
         self._tree_cache = {}
-        self._locked_branches = []
+        self._locked_branches = LockedBranches()
         self._branch_cache = {}
         self._history = None
         self._previous = None
@@ -263,18 +288,11 @@
         # Unsupported format.
         raise versioncontrol.NoSuchChangeset(rev)
 
-    def __del__(self):
-        # XXX Eeeeeww. Unfortunately for us trac does not actually call the
-        # close method. So we do this. Quite silly, since bzr does the same
-        # thing (printing a warning...)
-        self.close()
-
     # Trac api methods.
 
     def close(self):
         """Release our branches. Trac does not *have* to call this!"""
-        for branch in self._locked_branches:
-            branch.unlock()
+        self._locked_branches.unlock()
 
     def get_branch(self, location):
         if location in self._branch_cache: