Rev 2457: Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2457
revision-id: robertc at robertcollins.net-20070301042042-vmcypp3mjnvuwft5
parent: robertc at robertcollins.net-20070301041307-yendz2ijpubqmfgq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 15:20:42 +1100
message:
  Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
modified:
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2007-03-01 04:06:45 +0000
+++ b/bzrlib/transform.py	2007-03-01 04:20:42 +0000
@@ -1097,15 +1097,15 @@
       it is silently replaced.
     - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
     """
-    tree.lock_read()
+    wt.lock_tree_write()
     try:
-        wt.lock_tree_write()
+        tree.lock_read()
         try:
             return _build_tree(tree, wt)
         finally:
-            wt.unlock()
+            tree.unlock()
     finally:
-        tree.unlock()
+        wt.unlock()
 
 def _build_tree(tree, wt):
     """See build_tree."""