[Pkg-bazaar-commits] ./bzr/unstable r477: - fix header for listing of unknown files

[Martin Pool]

------------------------------------------------------------
revno: 477
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-05-11 17:50:07 +1000
message:
  - fix header for listing of unknown files
  - don't report root directory in status listing, since it's never 
    changed
  - fix up status format in tests
modified:
  bzrlib/diff.py
  bzrlib/status.py
  testbzr
-------------- next part --------------
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py	2005-05-11 07:46:46 +0000
+++ b/bzrlib/diff.py	2005-05-11 07:50:07 +0000
@@ -208,14 +208,18 @@
     mutter('start compare_trees')
     for file_id in old_tree:
         if file_id in new_tree:
-            old_path = old_inv.id2path(file_id)
-            new_path = new_inv.id2path(file_id)
-
             kind = old_inv.get_file_kind(file_id)
             assert kind == new_inv.get_file_kind(file_id)
             
             assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
                    'invalid file kind %r' % kind
+
+            if kind == 'root_directory':
+                continue
+            
+            old_path = old_inv.id2path(file_id)
+            new_path = new_inv.id2path(file_id)
+
             if kind == 'file':
                 old_sha1 = old_tree.get_file_sha1(file_id)
                 new_sha1 = new_tree.get_file_sha1(file_id)

=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2005-05-11 06:12:44 +0000
+++ b/bzrlib/status.py	2005-05-11 07:50:07 +0000
@@ -48,6 +48,6 @@
     done_header = False
     for path in unknowns:
         if not done_header:
-            print 'unknown files:'
+            print 'unknown:'
             done_header = True
         print ' ', path

=== modified file 'testbzr'
--- a/testbzr	2005-05-11 04:25:35 +0000
+++ b/testbzr	2005-05-11 07:50:07 +0000
@@ -179,13 +179,13 @@
     assert out == 'test.txt\n'
 
     out = backtick("bzr status")
-    assert out == '''?       test.txt\n'''
+    assert out == 'unknown:\n  test.txt\n'
 
     out = backtick("bzr status --all")
-    assert out == "?       test.txt\n"
+    assert out == "unknown:\n  test.txt\n"
 
     out = backtick("bzr status test.txt --all")
-    assert out == "?       test.txt\n"
+    assert out == "unknown:\n  test.txt\n"
 
     f = file('test2.txt', 'wt')
     f.write('goodbye cruel world...\n')