Rev 2481: WorkingTree._add only needs to lock the tree - avoids lock reentry error in http://sourcefrog.net/bzr/dirstate-robert

Martin Pool mbp at sourcefrog.net
Thu Mar 1 11:22:19 GMT 2007


At http://sourcefrog.net/bzr/dirstate-robert

------------------------------------------------------------
revno: 2481
revision-id: mbp at sourcefrog.net-20070301112142-blqdo0tmp0loms7y
parent: robertc at robertcollins.net-20070301111653-xz97hibpktk2y5co
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate-robert
timestamp: Thu 2007-03-01 22:21:42 +1100
message:
  WorkingTree._add only needs to lock the tree - avoids lock reentry error
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2007-03-01 08:50:03 +0000
+++ b/bzrlib/workingtree.py	2007-03-01 11:21:42 +0000
@@ -611,7 +611,7 @@
             mode = os.lstat(self.abspath(path)).st_mode
             return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
 
-    @needs_write_lock
+    @needs_tree_write_lock
     def _add(self, files, ids, kinds):
         """See MutableTree._add."""
         # TODO: Re-adding a file that is removed in the working copy




More information about the bazaar-commits mailing list