← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

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
75
74
from bzrlib.lock import LogicalLockResult
76
75
import bzrlib.mutabletree
77
76
from bzrlib.mutabletree import needs_tree_write_lock
303
302
                if view_files:
304
303
                    file_list = view_files
305
304
                    view_str = views.view_display_str(view_files)
306
 
                    note(gettext("Ignoring files outside view. View is %s") % view_str)
 
305
                    note("Ignoring files outside view. View is %s" % view_str)
307
306
            return tree, file_list
308
307
        if default_directory == u'.':
309
308
            seed = file_list[0]
1499
1498
                                             show_base=show_base)
1500
1499
            if nb_conflicts:
1501
1500
                self.add_parent_tree((old_tip, other_tree))
1502
 
                note(gettext('Rerun update after fixing the conflicts.'))
 
1501
                note('Rerun update after fixing the conflicts.')
1503
1502
                return nb_conflicts
1504
1503
 
1505
1504
        if last_rev != _mod_revision.ensure_null(revision):
2134
2133
        """See Tree.get_file_mtime."""
2135
2134
        if not path:
2136
2135
            path = self.inventory.id2path(file_id)
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
 
2136
        return os.lstat(self.abspath(path)).st_mtime
2143
2137
 
2144
2138
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
2145
2139
        file_id = self.path2id(path)
3091
3085
    def unregister_format(klass, format):
3092
3086
        format_registry.remove(format)
3093
3087
 
3094
 
    def get_controldir_for_branch(self):
3095
 
        """Get the control directory format for creating branches.
3096
 
 
3097
 
        This is to support testing of working tree formats that can not exist
3098
 
        in the same control directory as a branch.
3099
 
        """
3100
 
        return self._matchingbzrdir
3101
 
 
3102
3088
 
3103
3089
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3104
3090
    "bzrlib.workingtree_4", "WorkingTreeFormat4")