Rev 2360: Unfuck InterTree.compare which I broke with the paths2ids implementation. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/dirstate/

[Robert Collins]

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

------------------------------------------------------------
revno: 2360
revision-id: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
parent: robertc at robertcollins.net-20070222050658-m9gdlj1ypv2gqvjx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 17:08:39 +1100
message:
  Unfuck InterTree.compare which I broke with the paths2ids implementation.
modified:
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2007-02-22 05:06:58 +0000
+++ b/bzrlib/tree.py	2007-02-22 06:08:39 +0000
@@ -233,7 +233,7 @@
         :param require_versioned: If False, do not raise NotVersionedError if
             an element of paths is not versioned in this tree and all of trees.
         """
-        return find_ids_across_trees(paths, [self] + trees, require_versioned)
+        return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
 
     def print_file(self, file_id):
         """Print file with id `file_id` to stdout."""
@@ -568,11 +568,11 @@
         """
         # NB: show_status depends on being able to pass in non-versioned files
         # and report them as unknown
-        trees = (self.source, self.target)
+        trees = (self.source,)
         if extra_trees is not None:
             trees = trees + tuple(extra_trees)
         # target is usually the newer tree:
-        specific_file_ids = self.target.paths2ids(specific_files, [self.source],
+        specific_file_ids = self.target.paths2ids(specific_files, trees,
             require_versioned=require_versioned)
         if specific_files and not specific_file_ids:
             # All files are unversioned, so just return an empty delta