Rev 2478: Update cmd_deleted to lock around inventory access. in http://bazaar.launchpad.net/~bzr/bzr/dirstate
Robert Collins
robertc at robertcollins.net
Thu Mar 1 09:47:43 GMT 2007
At http://bazaar.launchpad.net/~bzr/bzr/dirstate
------------------------------------------------------------
revno: 2478
revision-id: robertc at robertcollins.net-20070301094642-jjtzsx00wz14j110
parent: robertc at robertcollins.net-20070301093426-yavn95x00rpc5nyb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 20:46:42 +1100
message:
Update cmd_deleted to lock around inventory access.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-03-01 08:44:14 +0000
+++ b/bzrlib/builtins.py 2007-03-01 09:46:42 +0000
@@ -1446,14 +1446,22 @@
@display_command
def run(self, show_ids=False):
tree = WorkingTree.open_containing(u'.')[0]
- old = tree.basis_tree()
- for path, ie in old.inventory.iter_entries():
- if not tree.has_id(ie.file_id):
- self.outf.write(path)
- if show_ids:
- self.outf.write(' ')
- self.outf.write(ie.file_id)
- self.outf.write('\n')
+ tree.lock_read()
+ try:
+ old = tree.basis_tree()
+ old.lock_read()
+ try:
+ for path, ie in old.inventory.iter_entries():
+ if not tree.has_id(ie.file_id):
+ self.outf.write(path)
+ if show_ids:
+ self.outf.write(' ')
+ self.outf.write(ie.file_id)
+ self.outf.write('\n')
+ finally:
+ old.unlock()
+ finally:
+ tree.unlock()
class cmd_modified(Command):
More information about the bazaar-commits
mailing list