/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/transform.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/transform.py
1684
1684
        return self.__by_parent
1685
1685
 
1686
1686
    def _comparison_data(self, entry, path):
1687
 
        kind, executable = self.get_kind_and_executable_by_path(path)
 
1687
        kind, size, executable, link_or_sha1 = self.path_content_summary(path)
1688
1688
        if kind == 'missing':
1689
1689
            kind = None
1690
1690
            executable = False
1955
1955
            executable = tt._new_executability.get(trans_id, executable)
1956
1956
        return kind, size, executable, link_or_sha1
1957
1957
 
1958
 
    def get_kind_and_executable_by_path(self, path):
1959
 
        trans_id = self._path2trans_id(path)
1960
 
        tt = self._transform
1961
 
        tree_path = tt._tree_id_paths.get(trans_id)
1962
 
        kind = tt._new_contents.get(trans_id)
1963
 
        if kind is None:
1964
 
            if tree_path is None or trans_id in tt._removed_contents:
1965
 
                return 'missing', None, None, None
1966
 
            kind, executable = tt._tree.get_kind_and_executable_by_path(tree_path)
1967
 
        else:
1968
 
            limbo_name = tt._limbo_name(trans_id)
1969
 
            if trans_id in tt._new_reference_revision:
1970
 
                kind = 'tree-reference'
1971
 
            if kind == 'file':
1972
 
                statval = os.lstat(limbo_name)
1973
 
                if not supports_executable():
1974
 
                    executable = None
1975
 
                else:
1976
 
                    executable = statval.st_mode & S_IEXEC
1977
 
            else:
1978
 
                executable = None
1979
 
        if supports_executable():
1980
 
            executable = tt._new_executability.get(trans_id, executable)
1981
 
        return kind, executable
1982
 
 
1983
1958
    def iter_changes(self, from_tree, include_unchanged=False,
1984
1959
                      specific_files=None, pb=None, extra_trees=None,
1985
1960
                      require_versioned=True, want_unversioned=False):