/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/commit.py

  • Committer: Martin Pool
  • Date: 2007-10-12 06:54:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2913.
  • Revision ID: mbp@sourcefrog.net-20071012065423-81g0dgg2prhkfp47
Remove unnecessary double handling of deletions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
678
678
                if delta: self.basis_delta.append(delta)
679
679
 
680
680
    def _report_and_accumulate_deletes(self):
 
681
        # XXX: Could the list of deleted paths and ids be instead taken from
 
682
        # _populate_from_inventory?
681
683
        deleted_ids = set(self.basis_inv._byid.keys()) - \
682
684
            set(self.builder.new_inventory._byid.keys())
683
685
        if deleted_ids:
725
727
                    deleted_paths.add(path)
726
728
                    self.reporter.missing(path)
727
729
                    deleted_ids.append(file_id)
728
 
                    # Missing entries need to be deleted from the working
729
 
                    # inventory separately from files that were specifically
730
 
                    # removed.  Note: this doesn't include missing files
731
 
                    # within missing directories, but they should be
732
 
                    # implicitly deleted when the delta is applied.
733
 
                    self.basis_delta.append((path, None, file_id, None))
734
730
                    continue
735
731
            # TODO: have the builder do the nested commit just-in-time IF and
736
732
            # only if needed.