← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

merge bzr.dev 4807, resolve test conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1973
1973
                statval = os.lstat(limbo_name)
1974
1974
                size = statval.st_size
1975
1975
                if not supports_executable():
1976
 
                    executable = None
 
1976
                    executable = False
1977
1977
                else:
1978
1978
                    executable = statval.st_mode & S_IEXEC
1979
1979
            else:
1981
1981
                executable = None
1982
1982
            if kind == 'symlink':
1983
1983
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
1984
 
        if supports_executable():
1985
 
            executable = tt._new_executability.get(trans_id, executable)
 
1984
        executable = tt._new_executability.get(trans_id, executable)
1986
1985
        return kind, size, executable, link_or_sha1
1987
1986
 
1988
1987
    def iter_changes(self, from_tree, include_unchanged=False,