← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: Vincent Ladeuil
  • Date: 2011-01-20 21:15:10 UTC
  • mfrom: (5050.62.4 2.2)
  • mto: (5609.2.4 2.3)
  • mto: This revision was merged to the branch mainline in revision 5628.
  • Revision ID: v.ladeuil+lp@free.fr-20110120211510-9dl4tbl77dad86pl
Merge 2.2 into 2.3 including bugfix for #701940

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
110
110
    def is_executable(self, file_id, path=None):
111
111
        ie = self._inventory[file_id]
112
112
        if ie.kind != "file":
113
 
            return None
 
113
            return False
114
114
        return ie.executable
115
115
 
116
116
    def has_filename(self, filename):