← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2008-09-19 06:53:41 UTC
  • mto: (3696.5.1 commit-updates)
  • mto: This revision was merged to the branch mainline in revision 3741.
  • Revision ID: robertc@robertcollins.net-20080919065341-5t5w1p2gi926nfia
First cut - make it work - at updating the tree stat cache during commit.

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: self._basis_delta.append(delta)
 
697
                if delta:
 
698
                    self._basis_delta.append(delta)
698
699
 
699
700
    def _report_and_accumulate_deletes(self):
700
701
        # XXX: Could the list of deleted paths and ids be instead taken from
843
844
        else:
844
845
            ie = existing_ie.copy()
845
846
            ie.revision = None
846
 
        delta, version_recorded = self.builder.record_entry_contents(ie,
847
 
            self.parent_invs, path, self.work_tree, content_summary)
 
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)
848
851
        if delta:
849
852
            self._basis_delta.append(delta)
850
853
        if version_recorded:
851
854
            self.any_entries_changed = True
852
855
        if report_changes:
853
856
            self._report_change(ie, path)
 
857
        if fs_hash:
 
858
            self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
854
859
        return ie
855
860
 
856
861
    def _report_change(self, ie, path):