Rev 2444: show_diff_trees() should lock any extra trees it is passed. in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

------------------------------------------------------------
revno: 2444
revision-id: john at arbash-meinel.com-20070301010753-ga844l1djraerga7
parent: robertc at robertcollins.net-20070301010230-fh8p34iloqh7ua5j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 19:07:53 -0600
message:
  show_diff_trees() should lock any extra trees it is passed.
modified:
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
-------------- next part --------------
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py	2006-12-21 03:59:43 +0000
+++ b/bzrlib/diff.py	2007-03-01 01:07:53 +0000
@@ -397,6 +397,9 @@
     """
     old_tree.lock_read()
     try:
+        if extra_trees is not None:
+            for tree in extra_trees:
+                tree.lock_read()
         new_tree.lock_read()
         try:
             return _show_diff_trees(old_tree, new_tree, to_file,
@@ -405,6 +408,9 @@
                                     extra_trees=extra_trees)
         finally:
             new_tree.unlock()
+            if extra_trees is not None:
+                for tree in extra_trees:
+                    tree.unlock()
     finally:
         old_tree.unlock()