← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.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/workingtree.py
737
737
        if updated:
738
738
            self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
739
739
 
740
 
    def get_kind_and_executable_by_path(self, path, _lstat=os.lstat,
741
 
        _mapper=osutils.file_kind_from_stat_mode):
742
 
        abspath = self.abspath(path)
743
 
        try:
744
 
            stat_result = _lstat(abspath)
745
 
        except OSError, e:
746
 
            if getattr(e, 'errno', None) == errno.ENOENT:
747
 
                # no file.
748
 
                return 'missing', None
749
 
            # propagate other errors
750
 
            raise
751
 
        kind = _mapper(stat_result.st_mode)
752
 
        if kind == 'file':
753
 
            executable = self._is_executable_from_path_and_stat(path, stat_result)
754
 
            return kind, executable
755
 
        elif kind == 'directory':
756
 
            # perhaps it looks like a plain directory, but it's really a
757
 
            # reference.
758
 
            if self._directory_is_tree_reference(path):
759
 
                kind = 'tree-reference'
760
 
        return kind, None
761
 
 
762
740
    def path_content_summary(self, path, _lstat=os.lstat,
763
741
        _mapper=osutils.file_kind_from_stat_mode):
764
742
        """See Tree.path_content_summary."""