Rev 2357: Use Tree.path2ids in status operations. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/dirstate/

[Robert Collins]

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

------------------------------------------------------------
revno: 2357
revision-id: robertc at robertcollins.net-20070222024555-fxhlp024havpj9hd
parent: robertc at robertcollins.net-20070222014109-t8lpcgnp6xr63zv8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-02-22 13:45:55 +1100
message:
  Use Tree.path2ids in status operations.
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2007-02-17 03:34:50 +0000
+++ b/bzrlib/status.py	2007-02-22 02:45:55 +0000
@@ -143,8 +143,8 @@
         try:
             _raise_if_nonexistent(specific_files, old, new)
             if short:
-                specific_file_ids = tree.find_ids_across_trees(specific_files,
-                    (old, new), require_versioned=False)
+                specific_file_ids = new.paths2ids(specific_files, [old],
+                                                  require_versioned=False)
                 changes = new._iter_changes(old, show_unchanged,
                                             specific_file_ids)
                 reporter = _mod_delta.ChangeReporter(old.inventory,

=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2007-02-22 01:41:09 +0000
+++ b/bzrlib/tree.py	2007-02-22 02:45:55 +0000
@@ -568,8 +568,9 @@
         trees = (self.source, self.target)
         if extra_trees is not None:
             trees = trees + tuple(extra_trees)
-        specific_file_ids = find_ids_across_trees(specific_files,
-            trees, require_versioned=require_versioned)
+        # target is usually the newer tree:
+        specific_file_ids = self.target.paths2ids(specific_files, [self.source],
+            require_versioned=require_versioned)
         if specific_files and not specific_file_ids:
             # All files are unversioned, so just return an empty delta
             # _compare_trees would think we want a complete delta