[Pkg-bazaar-commits] ./bzr/unstable r957: - try to avoid calling id2path from compare_trees when unnecessary

[Martin Pool]

------------------------------------------------------------
revno: 957
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-22 16:33:37 -0300
message:
  - try to avoid calling id2path from compare_trees when unnecessary
modified:
  bzrlib/diff.py
-------------- next part --------------
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py	2005-06-29 02:55:33 +0000
+++ b/bzrlib/diff.py	2005-07-22 19:33:37 +0000
@@ -389,8 +389,11 @@
 
     for file_id in old_tree:
         if file_id in new_tree:
-            kind = old_inv.get_file_kind(file_id)
-            assert kind == new_inv.get_file_kind(file_id)
+            old_ie = old_inv[file_id]
+            new_ie = new_inv[file_id]
+
+            kind = old_ie.kind
+            assert kind == new_ie.kind
             
             assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
                    'invalid file kind %r' % kind
@@ -398,15 +401,9 @@
             if kind == 'root_directory':
                 continue
             
-            old_path = old_inv.id2path(file_id)
-            new_path = new_inv.id2path(file_id)
-
-            old_ie = old_inv[file_id]
-            new_ie = new_inv[file_id]
-
             if specific_files:
-                if (not is_inside_any(specific_files, old_path) 
-                    and not is_inside_any(specific_files, new_path)):
+                if (not is_inside_any(specific_files, old_inv.id2path(file_id)) 
+                    and not is_inside_any(specific_files, new_inv.id2path(file_id))):
                     continue
 
             if kind == 'file':
@@ -424,12 +421,14 @@
             
             if (old_ie.name != new_ie.name
                 or old_ie.parent_id != new_ie.parent_id):
-                delta.renamed.append((old_path, new_path, file_id, kind,
+                delta.renamed.append((old_inv.id2path(file_id),
+                                      new_inv.id2path(file_id),
+                                      file_id, kind,
                                       text_modified))
             elif text_modified:
-                delta.modified.append((new_path, file_id, kind))
+                delta.modified.append((new_inv.id2path(file_id), file_id, kind))
             elif want_unchanged:
-                delta.unchanged.append((new_path, file_id, kind))
+                delta.unchanged.append((new_inv.id2path(file_id), file_id, kind))
         else:
             kind = old_inv.get_file_kind(file_id)
             old_path = old_inv.id2path(file_id)