/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: Aaron Bentley
  • Date: 2007-11-21 14:03:03 UTC
  • mto: (3008.1.2 transform_preview)
  • mto: This revision was merged to the branch mainline in revision 3036.
  • Revision ID: abentley@panoramicfeedback.com-20071121140303-eil5haph3u2ovwjg
Detect missing files from inv operation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
417
417
        old_name = '%s%s\t%s' % (old_label, path,
418
418
                                 _patch_header_date(old_tree, file_id, path))
419
419
        new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
420
 
        differ.diff(file_id, old_tree, None, old_name, new_name)
 
420
        differ.diff(file_id, old_tree, new_tree, old_name, new_name)
421
421
    for path, file_id, kind in delta.added:
422
422
        has_changes = 1
423
423
        path_encoded = path.encode(path_encoding, "replace")
515
515
            old_entry = old_tree.inventory[file_id]
516
516
        except errors.NoSuchId:
517
517
            old_entry = None
518
 
        if new_tree is None:
 
518
        try:
 
519
            new_entry = new_tree.inventory[file_id]
 
520
        except errors.NoSuchId:
519
521
            new_entry = None
520
 
        else:
521
 
            new_entry = new_tree.inventory[file_id]
522
522
        if old_entry is None:
523
523
            new_entry.diff(self.text_diff, new_name, new_tree, old_name,
524
524
                           old_entry, old_tree, self.to_file, reverse=True)