/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2005-05-11 07:50:07 UTC
  • Revision ID: mbp@sourcefrog.net-20050511075007-9ce9c01a6a5e6660
- 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
208
208
    mutter('start compare_trees')
209
209
    for file_id in old_tree:
210
210
        if file_id in new_tree:
211
 
            old_path = old_inv.id2path(file_id)
212
 
            new_path = new_inv.id2path(file_id)
213
 
 
214
211
            kind = old_inv.get_file_kind(file_id)
215
212
            assert kind == new_inv.get_file_kind(file_id)
216
213
            
217
214
            assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
218
215
                   'invalid file kind %r' % kind
 
216
 
 
217
            if kind == 'root_directory':
 
218
                continue
 
219
            
 
220
            old_path = old_inv.id2path(file_id)
 
221
            new_path = new_inv.id2path(file_id)
 
222
 
219
223
            if kind == 'file':
220
224
                old_sha1 = old_tree.get_file_sha1(file_id)
221
225
                new_sha1 = new_tree.get_file_sha1(file_id)