← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: John Arbash Meinel
  • Date: 2008-08-22 05:54:44 UTC
  • mto: This revision was merged to the branch mainline in revision 3653.
  • Revision ID: john@arbash-meinel.com-20080822055444-5kcr0csbbvkqbbiw
If we repack earlier, it catches this case.
Still need to fix the other tests, but at least
the too_much test passes now.
Impact on real-world results is measurable
(2-3% final compression). Is it worth it?

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
690
690
                # required after that changes.
691
691
                if len(self.parents) > 1:
692
692
                    ie.revision = None
693
 
                delta, version_recorded, _ = self.builder.record_entry_contents(
 
693
                delta, version_recorded = self.builder.record_entry_contents(
694
694
                    ie, self.parent_invs, path, self.basis_tree, None)
695
695
                if version_recorded:
696
696
                    self.any_entries_changed = True
697
 
                if delta:
698
 
                    self._basis_delta.append(delta)
 
697
                if delta: self._basis_delta.append(delta)
699
698
 
700
699
    def _report_and_accumulate_deletes(self):
701
700
        # XXX: Could the list of deleted paths and ids be instead taken from
844
843
        else:
845
844
            ie = existing_ie.copy()
846
845
            ie.revision = None
847
 
        # For carried over entries we don't care about the fs hash - the repo
848
 
        # isn't generating a sha, so we're not saving computation time.
849
 
        delta, version_recorded, fs_hash = self.builder.record_entry_contents(
850
 
            ie, self.parent_invs, path, self.work_tree, content_summary)
 
846
        delta, version_recorded = self.builder.record_entry_contents(ie,
 
847
            self.parent_invs, path, self.work_tree, content_summary)
851
848
        if delta:
852
849
            self._basis_delta.append(delta)
853
850
        if version_recorded:
854
851
            self.any_entries_changed = True
855
852
        if report_changes:
856
853
            self._report_change(ie, path)
857
 
        if fs_hash:
858
 
            self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
859
854
        return ie
860
855
 
861
856
    def _report_change(self, ie, path):