← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Merge the 2.3 branch changes up to 2.4. The final changes are
too invasive to do in a stable series (IMO).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
369
369
        state = self.current_dirstate()
370
370
        if stat_value is None:
371
371
            try:
372
 
                stat_value = os.lstat(file_abspath)
 
372
                stat_value = osutils.lstat(file_abspath)
373
373
            except OSError, e:
374
374
                if e.errno == errno.ENOENT:
375
375
                    return None
478
478
            self._must_be_locked()
479
479
            if not path:
480
480
                path = self.id2path(file_id)
481
 
            mode = os.lstat(self.abspath(path)).st_mode
 
481
            mode = osutils.lstat(self.abspath(path)).st_mode
482
482
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
483
483
 
484
484
    def all_file_ids(self):