/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: Canonical.com Patch Queue Manager
  • Date: 2007-10-03 07:01:15 UTC
  • mfrom: (2871.1.4 commit-builder)
  • Revision ID: pqm@pqm.ubuntu.com-20071003070115-95pox4ok1e47a7v0
(robertc) Have CommitBuilder.record_entry_contents return inventory delta information. (Robert Collins).

Show diffs side-by-side

added added

removed removed

Lines of Context:
665
665
                # required after that changes.
666
666
                if len(self.parents) > 1:
667
667
                    ie.revision = None
668
 
                if self.builder.record_entry_contents(ie, self.parent_invs, path,
669
 
                    self.basis_tree, None):
 
668
                delta, version_recorded = self.builder.record_entry_contents(
 
669
                    ie, self.parent_invs, path, self.basis_tree, None)
 
670
                if version_recorded:
670
671
                    self.any_entries_changed = True
671
672
 
672
673
        # note that deletes have occurred
784
785
        else:
785
786
            ie = existing_ie.copy()
786
787
            ie.revision = None
787
 
        if self.builder.record_entry_contents(ie, self.parent_invs,
788
 
            path, self.work_tree, content_summary):
 
788
        delta, version_recorded = self.builder.record_entry_contents(ie,
 
789
            self.parent_invs, path, self.work_tree, content_summary)
 
790
        if version_recorded:
789
791
            self.any_entries_changed = True
790
792
        if report_changes:
791
793
            self._report_change(ie, path)