/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 bzrlib/workingtree_4.py

  • Committer: Andrew Bennetts
  • Date: 2011-04-08 03:31:54 UTC
  • mfrom: (5766 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5767.
  • Revision ID: andrew.bennetts@canonical.com-20110408033154-la08nghd4391sw5m
Merge latest lp:bzr, move our new release notes entries to the current release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
31
31
import errno
32
32
import stat
33
33
 
34
 
import bzrlib
35
34
from bzrlib import (
36
35
    bzrdir,
37
36
    cache_utf8,
46
45
    transform,
47
46
    views,
48
47
    )
49
 
import bzrlib.branch
50
 
import bzrlib.ui
51
48
""")
52
49
 
53
50
from bzrlib.decorators import needs_read_lock, needs_write_lock
62
59
    realpath,
63
60
    safe_unicode,
64
61
    )
65
 
from bzrlib.trace import mutter
66
62
from bzrlib.transport.local import LocalTransport
67
63
from bzrlib.tree import InterTree
68
64
from bzrlib.tree import Tree
85
81
        self._format = _format
86
82
        self.bzrdir = _bzrdir
87
83
        basedir = safe_unicode(basedir)
88
 
        mutter("opening working tree %r", basedir)
 
84
        trace.mutter("opening working tree %r", basedir)
89
85
        self._branch = branch
90
86
        self.basedir = realpath(basedir)
91
87
        # if branch is at our basedir and is a format 6 or less
369
365
        state = self.current_dirstate()
370
366
        if stat_value is None:
371
367
            try:
372
 
                stat_value = os.lstat(file_abspath)
 
368
                stat_value = osutils.lstat(file_abspath)
373
369
            except OSError, e:
374
370
                if e.errno == errno.ENOENT:
375
371
                    return None
478
474
            self._must_be_locked()
479
475
            if not path:
480
476
                path = self.id2path(file_id)
481
 
            mode = os.lstat(self.abspath(path)).st_mode
 
477
            mode = osutils.lstat(self.abspath(path)).st_mode
482
478
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
483
479
 
484
480
    def all_file_ids(self):