/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: Jelmer Vernooij
  • Date: 2006-06-06 13:36:04 UTC
  • mto: This revision was merged to the branch mainline in revision 1753.
  • Revision ID: jelmer@samba.org-20060606133604-0e59c01dabfdd0aa
Introduce and use CommitBuilder objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
322
322
                raise NotImplementedError('selected-file commit of merges is not supported yet: files %r',
323
323
                        self.specific_files)
324
324
            self._check_parents_present()
 
325
            self.builder = self.branch.get_commit_builder(self.parents)
325
326
            
326
327
            self._remove_deleted()
327
328
            self._populate_new_inv()
555
556
        self._emit_progress_update()
556
557
        for path, ie in self.new_inv.iter_entries():
557
558
            self._emit_progress_update()
558
 
            previous_entries = ie.find_previous_heads(
559
 
                self.parent_invs,
560
 
                self.weave_store,
561
 
                self.branch.repository.get_transaction())
562
 
            if ie.revision is None:
563
 
                # we are creating a new revision for ie in the history store
564
 
                # and inventory.
565
 
                ie.snapshot(self.rev_id, path, previous_entries,
566
 
                    self.work_tree, self.weave_store,
567
 
                    self.branch.repository.get_transaction())
 
559
            self.builder.record_entry_contents(ie, self.parent_invs, 
 
560
                self.rev_id, path, self.work_tree)
568
561
            # describe the nature of the change that has occured relative to
569
562
            # the basis inventory.
570
563
            if (self.basis_inv.has_id(ie.file_id)):