/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

Remove get_kind_and_executable_by_path; go back to using plain path_content_summary

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
801
801
                # Skip excluded paths. Excluded paths are processed by
802
802
                # _update_builder_with_changes.
803
803
                continue
804
 
            kind, executable = self.work_tree.get_kind_and_executable_by_path(
805
 
                path)
 
804
            content_summary = self.work_tree.path_content_summary(path)
 
805
            kind = content_summary[0]
806
806
            # Note that when a filter of specific files is given, we must only
807
807
            # skip/record deleted files matching that filter.
808
808
            if not specific_files or is_inside_any(specific_files, path):
817
817
                    self._next_progress_entry()
818
818
                    deleted_ids.append(file_id)
819
819
                    continue
820
 
            content_summary = self.work_tree.path_content_summary(path)
821
820
            # TODO: specific_files filtering before nested tree processing
822
821
            if kind == 'tree-reference':
823
822
                # TODO: have the builder do the nested commit just-in-time IF and