[Pkg-bazaar-commits] ./bzr/unstable r471: - actually avoid reporting unchanged files if not required

[Martin Pool]

------------------------------------------------------------
revno: 471
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-05-11 16:14:54 +1000
message:
  - actually avoid reporting unchanged files if not required
modified:
  bzrlib/diff.py
-------------- next part --------------
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py	2005-05-11 06:12:44 +0000
+++ b/bzrlib/diff.py	2005-05-11 06:14:54 +0000
@@ -329,12 +329,17 @@
             else:
                 ## mutter("no text to check for %r %r" % (file_id, kind))
                 text_modified = False
+
+            # TODO: Can possibly avoid calculating path strings if the
+            # two files are unchanged and their names and parents are
+            # the same and the parents are unchanged all the way up.
+            # May not be worthwhile.
             
             if old_path != new_path:
                 delta.renamed.append((old_path, new_path, file_id, text_modified))
             elif text_modified:
                 delta.modified.append((new_path, file_id))
-            else:
+            elif want_unchanged:
                 delta.unchanged.append((new_path, file_id))
         else:
             delta.removed.append((old_inv.id2path(file_id), file_id))