← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-26 07:56:05 UTC
  • mfrom: (6165 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6170.
  • Revision ID: john@arbash-meinel.com-20110926075605-czuukdiawz68dpbd
Merge bzr.dev 6165, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
71
71
 
72
72
from bzrlib import symbol_versioning
73
73
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
74
from bzrlib.i18n import gettext
74
75
from bzrlib.lock import LogicalLockResult
75
76
import bzrlib.mutabletree
76
77
from bzrlib.mutabletree import needs_tree_write_lock
302
303
                if view_files:
303
304
                    file_list = view_files
304
305
                    view_str = views.view_display_str(view_files)
305
 
                    note("Ignoring files outside view. View is %s" % view_str)
 
306
                    note(gettext("Ignoring files outside view. View is %s") % view_str)
306
307
            return tree, file_list
307
308
        if default_directory == u'.':
308
309
            seed = file_list[0]
1498
1499
                                             show_base=show_base)
1499
1500
            if nb_conflicts:
1500
1501
                self.add_parent_tree((old_tip, other_tree))
1501
 
                note('Rerun update after fixing the conflicts.')
 
1502
                note(gettext('Rerun update after fixing the conflicts.'))
1502
1503
                return nb_conflicts
1503
1504
 
1504
1505
        if last_rev != _mod_revision.ensure_null(revision):
2133
2134
        """See Tree.get_file_mtime."""
2134
2135
        if not path:
2135
2136
            path = self.inventory.id2path(file_id)
2136
 
        return os.lstat(self.abspath(path)).st_mtime
 
2137
        try:
 
2138
            return os.lstat(self.abspath(path)).st_mtime
 
2139
        except OSError, e:
 
2140
            if e.errno == errno.ENOENT:
 
2141
                raise errors.FileTimestampUnavailable(path)
 
2142
            raise
2137
2143
 
2138
2144
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2139
2145
        file_id = self.path2id(path)