/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 workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-05 09:06:01 UTC
  • mfrom: (0.200.1813 work)
  • mto: (0.200.1814 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180305090601-zxbb4bpc58d0qsi2
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
839
839
        mode = stat_result.st_mode
840
840
        return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
841
841
 
 
842
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
 
843
        return self.basis_tree().is_executable(path)
 
844
 
842
845
    def stored_kind(self, path, file_id=None):
843
846
        with self.lock_read():
844
847
            try: