Rev 2410: Better assertion message from InterDirStateTree._iter_changes in http://sourcefrog.net/bzr/dirstate

[Martin Pool]

At http://sourcefrog.net/bzr/dirstate

------------------------------------------------------------
revno: 2410
revision-id: mbp at sourcefrog.net-20070226032255-z0w592rrwil1xtqm
parent: mbp at sourcefrog.net-20070226031951-yd7bashmx3mjkmep
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 14:22:55 +1100
message:
  Better assertion message from InterDirStateTree._iter_changes
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-02-26 03:19:51 +0000
+++ b/bzrlib/workingtree_4.py	2007-02-26 03:22:55 +0000
@@ -1398,8 +1398,11 @@
         """
         # NB: show_status depends on being able to pass in non-versioned files
         # and report them as unknown
-            # TODO: handle extra trees in the dirstate.
-        if extra_trees:
+        # TODO: handle extra trees in the dirstate.
+        # TODO: handle comparisons as an empty tree as a different special
+        # case? mbp 20070226
+        if extra_trees or (self.source._revision_id == NULL_REVISION):
+            # we can't fast-path these cases (yet)
             for f in super(InterDirStateTree, self)._iter_changes(
                 include_unchanged, specific_files, pb, extra_trees,
                 require_versioned):