/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:38:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2913.
  • Revision ID: mbp@sourcefrog.net-20071012063831-40o7w602gk4w5fgr
Remove old deprecated support for CommitBuilders that don't accept a root; capture deltas for selected-file commit

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
643
643
 
644
644
        # Check and warn about old CommitBuilders
645
645
        if not self.builder.record_root_entry:
646
 
            symbol_versioning.warn('CommitBuilders should support recording'
647
 
                ' the root entry as of bzr 0.10.', DeprecationWarning, 
648
 
                stacklevel=1)
649
 
            self.builder.new_inventory.add(self.basis_inv.root.copy())
 
646
            raise AssertionError('CommitBuilders should support recording'
 
647
                ' the root entry as of bzr 0.10.')
650
648
 
651
649
        # Build the new inventory
652
650
        self._populate_from_inventory(specific_files)
677
675
                    ie, self.parent_invs, path, self.basis_tree, None)
678
676
                if version_recorded:
679
677
                    self.any_entries_changed = True
 
678
                if delta: self.basis_delta.append(delta)
680
679
 
681
680
    def _report_and_accumulate_deletes(self):
682
681
        deleted_ids = set(self.basis_inv._byid.keys()) - \
706
705
        # XXX: Note that entries may have the wrong kind.
707
706
        entries = work_inv.iter_entries_by_dir(
708
707
            specific_file_ids=self.specific_file_ids, yield_parents=True)
709
 
        if not self.builder.record_root_entry:
710
 
            entries.next()
711
708
        for path, existing_ie in entries:
712
709
            file_id = existing_ie.file_id
713
710
            name = existing_ie.name