~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
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):