At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3750
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Mon 2008-09-29 06:42:34 +0100
message:
(jam) Fix 'bzr revert' on win32 by taking a write lock out earlier.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3737.2.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: jam-integration
timestamp: Thu 2008-09-25 17:05:46 -0500
message:
Take out a write lock right away for 'bzr revert'
Fixes a regression where 'bzr revert' stopped working on win32.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-09-24 13:43:48 +0000
+++ b/bzrlib/builtins.py 2008-09-25 22:05:46 +0000
@@ -3263,10 +3263,14 @@
def run(self, revision=None, no_backup=False, file_list=None,
forget_merges=None):
tree, file_list = tree_files(file_list)
- if forget_merges:
- tree.set_parent_ids(tree.get_parent_ids()[:1])
- else:
- self._revert_tree_to_revision(tree, revision, file_list, no_backup)
+ tree.lock_write()
+ try:
+ if forget_merges:
+ tree.set_parent_ids(tree.get_parent_ids()[:1])
+ else:
+ self._revert_tree_to_revision(tree, revision, file_list,
no_backup)
+ finally:
+ tree.unlock()
@staticmethod
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
