Rev 2454: Deprecated and make work with DirState trees 'transform.find_interesting'. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

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

------------------------------------------------------------
revno: 2454
revision-id: robertc at robertcollins.net-20070301035615-apsvyiyqk6pqext2
parent: robertc at robertcollins.net-20070301035205-lfdthhpjoudb07b8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 14:56:15 +1100
message:
  Deprecated and make work with DirState trees 'transform.find_interesting'.
modified:
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2007-02-09 15:28:12 +0000
+++ b/bzrlib/tests/test_transform.py	2007-03-01 03:56:15 +0000
@@ -21,6 +21,7 @@
 from bzrlib import (
     errors,
     generate_ids,
+    symbol_versioning,
     tests,
     urlutils,
     )
@@ -516,8 +517,9 @@
         create.new_file('vfile', root, 'myfile-text', 'myfile-id')
         create.new_file('uvfile', root, 'othertext')
         create.apply()
-        self.assertEqual(find_interesting(wt, wt, ['vfile']),
-                         set(['myfile-id']))
+        result = self.applyDeprecated(symbol_versioning.zero_fifteen,
+            find_interesting, wt, wt, ['vfile'])
+        self.assertEqual(result, set(['myfile-id']))
         self.assertRaises(PathsNotVersionedError, find_interesting, wt, wt,
                           ['uvfile'])
 

=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2007-02-26 01:06:36 +0000
+++ b/bzrlib/transform.py	2007-03-01 03:56:15 +0000
@@ -30,6 +30,7 @@
 from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
                             delete_any)
 from bzrlib.progress import DummyProgress, ProgressPhase
+from bzrlib.symbol_versioning import deprecated_function, zero_fifteen
 from bzrlib.trace import mutter, warning
 from bzrlib import tree
 import bzrlib.ui 
@@ -1245,10 +1246,21 @@
         tt.set_executability(entry.executable, trans_id)
 
 
+ at deprecated_function(zero_fifteen)
 def find_interesting(working_tree, target_tree, filenames):
-    """Find the ids corresponding to specified filenames."""
-    trees = (working_tree, target_tree)
-    return tree.find_ids_across_trees(filenames, trees)
+    """Find the ids corresponding to specified filenames.
+    
+    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
+    """
+    working_tree.lock_read()
+    try:
+        target_tree.lock_read()
+        try:
+            return working_tree.paths2ids(filenames, [target_tree])
+        finally:
+            target_tree.unlock()
+    finally:
+        working_tree.unlock()
 
 
 def change_entry(tt, file_id, working_tree, target_tree,