/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

Change commit back to using path_content_summary rather than synthesizing it

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
817
817
                    self._next_progress_entry()
818
818
                    deleted_ids.append(file_id)
819
819
                    continue
820
 
            # We don't want to use a contents_summary anymore, but it's still
821
 
            # part of the contract of record_entry_contents, so we fake one
822
 
            # with the right form: (kind, length, exec,
823
 
            # sha_or_link_target_or_tree_revid)
824
 
            if kind == 'symlink':
825
 
                content_summary = (kind, None, None,
826
 
                    self.work_tree.get_symlink_target(file_id))
 
820
            content_summary = self.work_tree.path_content_summary(path)
827
821
            # TODO: specific_files filtering before nested tree processing
828
 
            elif kind == 'tree-reference':
 
822
            if kind == 'tree-reference':
829
823
                # TODO: have the builder do the nested commit just-in-time IF and
830
824
                # only if needed.
831
825
                # enforce repository nested tree policy.
841
835
                else:
842
836
                    nested_revision_id = self.work_tree.get_reference_revision(file_id)
843
837
                    content_summary = (kind, None, None, nested_revision_id)
844
 
            elif kind == 'file':
845
 
                content_summary = (kind, None, executable, None)
846
 
            else:
847
 
                content_summary = (kind, None, None, None)
848
838
 
849
839
            # Record an entry for this item
850
840
            # Note: I don't particularly want to have the existing_ie