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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-09 20:23:07 UTC
  • mfrom: (4265.1.4 bbc-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20090409202307-n0depb16qepoe21o
(jam) Change _fetch_uses_deltas = False for CHK repos until we can
        write a better fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
42
48
import itertools
43
49
import operator
44
50
import stat
 
51
from time import time
 
52
import warnings
45
53
import re
46
54
 
47
55
import bzrlib
49
57
    branch,
50
58
    bzrdir,
51
59
    conflicts as _mod_conflicts,
 
60
    dirstate,
52
61
    errors,
53
62
    generate_ids,
54
63
    globbing,
55
 
    graph as _mod_graph,
56
64
    hashcache,
57
65
    ignores,
58
 
    inventory,
59
66
    merge,
60
67
    revision as _mod_revision,
61
68
    revisiontree,
 
69
    repository,
 
70
    textui,
62
71
    trace,
63
72
    transform,
64
 
    transport,
65
73
    ui,
 
74
    urlutils,
66
75
    views,
67
76
    xml5,
 
77
    xml6,
68
78
    xml7,
69
79
    )
 
80
import bzrlib.branch
 
81
from bzrlib.transport import get_transport
 
82
import bzrlib.ui
70
83
from bzrlib.workingtree_4 import (
71
84
    WorkingTreeFormat4,
72
85
    WorkingTreeFormat5,
76
89
 
77
90
from bzrlib import symbol_versioning
78
91
from bzrlib.decorators import needs_read_lock, needs_write_lock
79
 
from bzrlib.lock import LogicalLockResult
 
92
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
80
93
from bzrlib.lockable_files import LockableFiles
81
94
from bzrlib.lockdir import LockDir
82
95
import bzrlib.mutabletree
83
96
from bzrlib.mutabletree import needs_tree_write_lock
84
97
from bzrlib import osutils
85
98
from bzrlib.osutils import (
 
99
    compact_date,
86
100
    file_kind,
87
101
    isdir,
88
102
    normpath,
89
103
    pathjoin,
 
104
    rand_chars,
90
105
    realpath,
91
106
    safe_unicode,
92
107
    splitpath,
95
110
from bzrlib.filters import filtered_input_file
96
111
from bzrlib.trace import mutter, note
97
112
from bzrlib.transport.local import LocalTransport
98
 
from bzrlib.revision import CURRENT_REVISION
 
113
from bzrlib.progress import DummyProgress, ProgressPhase
 
114
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
115
from bzrlib.rio import RioReader, rio_file, Stanza
100
 
from bzrlib.symbol_versioning import (
101
 
    deprecated_passed,
102
 
    DEPRECATED_PARAMETER,
103
 
    )
 
116
from bzrlib.symbol_versioning import (deprecated_passed,
 
117
        deprecated_method,
 
118
        deprecated_function,
 
119
        DEPRECATED_PARAMETER,
 
120
        )
104
121
 
105
122
 
106
123
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
 
# TODO: Modifying the conflict objects or their type is currently nearly
108
 
# impossible as there is no clear relationship between the working tree format
109
 
# and the conflict list file format.
110
124
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
125
 
112
126
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
181
        return ''
168
182
 
169
183
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
184
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
185
    """Working copy tree.
173
186
 
174
187
    The inventory is held in the `Branch` working-inventory, and the
176
189
 
177
190
    It is possible for a `WorkingTree` to have a filename which is
178
191
    not listed in the Inventory and vice versa.
179
 
 
180
 
    :ivar basedir: The root of the tree on disk. This is a unicode path object
181
 
        (as opposed to a URL).
182
192
    """
183
193
 
184
194
    # override this to set the strategy for storing views
250
260
        self._rules_searcher = None
251
261
        self.views = self._make_views()
252
262
 
253
 
    @property
254
 
    def user_transport(self):
255
 
        return self.bzrdir.user_transport
256
 
 
257
 
    @property
258
 
    def control_transport(self):
259
 
        return self._transport
260
 
 
261
263
    def _detect_case_handling(self):
262
264
        wt_trans = self.bzrdir.get_workingtree_transport(None)
263
265
        try:
288
290
        self._control_files.break_lock()
289
291
        self.branch.break_lock()
290
292
 
291
 
    def _get_check_refs(self):
292
 
        """Return the references needed to perform a check of this tree.
293
 
        
294
 
        The default implementation returns no refs, and is only suitable for
295
 
        trees that have no local caching and can commit on ghosts at any time.
296
 
 
297
 
        :seealso: bzrlib.check for details about check_refs.
298
 
        """
299
 
        return []
300
 
 
301
293
    def requires_rich_root(self):
302
294
        return self._format.requires_rich_root
303
295
 
371
363
                return True, None
372
364
            else:
373
365
                return True, tree
374
 
        t = transport.get_transport(location)
375
 
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
 
366
        transport = get_transport(location)
 
367
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
376
368
                                              list_current=list_current)
377
 
        return [tr for tr in iterator if tr is not None]
 
369
        return [t for t in iterator if t is not None]
378
370
 
379
371
    # should be deprecated - this is slow and in any case treating them as a
380
372
    # container is (we now know) bad style -- mbp 20070302
454
446
 
455
447
    def get_file_with_stat(self, file_id, path=None, filtered=True,
456
448
        _fstat=os.fstat):
457
 
        """See Tree.get_file_with_stat."""
 
449
        """See MutableTree.get_file_with_stat."""
458
450
        if path is None:
459
451
            path = self.id2path(file_id)
460
452
        file_obj = self.get_file_byname(path, filtered=False)
461
453
        stat_value = _fstat(file_obj.fileno())
462
 
        if filtered and self.supports_content_filtering():
 
454
        if self.supports_content_filtering() and filtered:
463
455
            filters = self._content_filter_stack(path)
464
456
            file_obj = filtered_input_file(file_obj, filters)
465
457
        return (file_obj, stat_value)
466
458
 
467
459
    def get_file_text(self, file_id, path=None, filtered=True):
468
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
469
 
        try:
470
 
            return my_file.read()
471
 
        finally:
472
 
            my_file.close()
 
460
        return self.get_file(file_id, path=path, filtered=filtered).read()
473
461
 
474
462
    def get_file_byname(self, filename, filtered=True):
475
463
        path = self.abspath(filename)
476
464
        f = file(path, 'rb')
477
 
        if filtered and self.supports_content_filtering():
 
465
        if self.supports_content_filtering() and filtered:
478
466
            filters = self._content_filter_stack(filename)
479
467
            return filtered_input_file(f, filters)
480
468
        else:
499
487
        incorrectly attributed to CURRENT_REVISION (but after committing, the
500
488
        attribution will be correct).
501
489
        """
502
 
        maybe_file_parent_keys = []
503
 
        for parent_id in self.get_parent_ids():
504
 
            try:
505
 
                parent_tree = self.revision_tree(parent_id)
506
 
            except errors.NoSuchRevisionInTree:
507
 
                parent_tree = self.branch.repository.revision_tree(parent_id)
508
 
            parent_tree.lock_read()
509
 
            try:
510
 
                if file_id not in parent_tree:
511
 
                    continue
512
 
                ie = parent_tree.inventory[file_id]
513
 
                if ie.kind != 'file':
514
 
                    # Note: this is slightly unnecessary, because symlinks and
515
 
                    # directories have a "text" which is the empty text, and we
516
 
                    # know that won't mess up annotations. But it seems cleaner
517
 
                    continue
518
 
                parent_text_key = (file_id, ie.revision)
519
 
                if parent_text_key not in maybe_file_parent_keys:
520
 
                    maybe_file_parent_keys.append(parent_text_key)
521
 
            finally:
522
 
                parent_tree.unlock()
523
 
        graph = _mod_graph.Graph(self.branch.repository.texts)
524
 
        heads = graph.heads(maybe_file_parent_keys)
525
 
        file_parent_keys = []
526
 
        for key in maybe_file_parent_keys:
527
 
            if key in heads:
528
 
                file_parent_keys.append(key)
529
 
 
530
 
        # Now we have the parents of this content
531
 
        annotator = self.branch.repository.texts.get_annotator()
532
 
        text = self.get_file_text(file_id)
533
 
        this_key =(file_id, default_revision)
534
 
        annotator.add_special_text(this_key, file_parent_keys, text)
535
 
        annotations = [(key[-1], line)
536
 
                       for key, line in annotator.annotate_flat(this_key)]
537
 
        return annotations
 
490
        basis = self.basis_tree()
 
491
        basis.lock_read()
 
492
        try:
 
493
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
494
                require_versioned=True).next()
 
495
            changed_content, kind = changes[2], changes[6]
 
496
            if not changed_content:
 
497
                return basis.annotate_iter(file_id)
 
498
            if kind[1] is None:
 
499
                return None
 
500
            import annotate
 
501
            if kind[0] != 'file':
 
502
                old_lines = []
 
503
            else:
 
504
                old_lines = list(basis.annotate_iter(file_id))
 
505
            old = [old_lines]
 
506
            for tree in self.branch.repository.revision_trees(
 
507
                self.get_parent_ids()[1:]):
 
508
                if file_id not in tree:
 
509
                    continue
 
510
                old.append(list(tree.annotate_iter(file_id)))
 
511
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
512
                                       default_revision)
 
513
        finally:
 
514
            basis.unlock()
538
515
 
539
516
    def _get_ancestors(self, default_revision):
540
517
        ancestors = set([default_revision])
555
532
        else:
556
533
            parents = [last_rev]
557
534
        try:
558
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
535
            merges_file = self._transport.get('pending-merges')
559
536
        except errors.NoSuchFile:
560
537
            pass
561
538
        else:
562
 
            for l in osutils.split_lines(merges_bytes):
 
539
            for l in merges_file.readlines():
563
540
                revision_id = l.rstrip('\n')
564
541
                parents.append(revision_id)
565
542
        return parents
624
601
 
625
602
    def get_file_size(self, file_id):
626
603
        """See Tree.get_file_size"""
627
 
        # XXX: this returns the on-disk size; it should probably return the
628
 
        # canonical size
629
604
        try:
630
605
            return os.path.getsize(self.id2abspath(file_id))
631
606
        except OSError, e:
647
622
 
648
623
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
649
624
        file_id = self.path2id(path)
650
 
        if file_id is None:
651
 
            # For unversioned files on win32, we just assume they are not
652
 
            # executable
653
 
            return False
654
625
        return self._inventory[file_id].executable
655
626
 
656
627
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
766
737
            raise
767
738
        kind = _mapper(stat_result.st_mode)
768
739
        if kind == 'file':
769
 
            return self._file_content_summary(path, stat_result)
 
740
            size = stat_result.st_size
 
741
            # try for a stat cache lookup
 
742
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
743
            return (kind, size, executable, self._sha_from_stat(
 
744
                path, stat_result))
770
745
        elif kind == 'directory':
771
746
            # perhaps it looks like a plain directory, but it's really a
772
747
            # reference.
774
749
                kind = 'tree-reference'
775
750
            return kind, None, None, None
776
751
        elif kind == 'symlink':
777
 
            target = osutils.readlink(abspath)
778
 
            return ('symlink', None, None, target)
 
752
            return ('symlink', None, None,
 
753
                    os.readlink(abspath.encode(osutils._fs_enc)
 
754
                                ).decode(osutils._fs_enc))
779
755
        else:
780
756
            return (kind, None, None, None)
781
757
 
782
 
    def _file_content_summary(self, path, stat_result):
783
 
        size = stat_result.st_size
784
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
785
 
        # try for a stat cache lookup
786
 
        return ('file', size, executable, self._sha_from_stat(
787
 
            path, stat_result))
788
 
 
789
758
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
790
759
        """Common ghost checking functionality from set_parent_*.
791
760
 
911
880
 
912
881
    @needs_write_lock # because merge pulls data into the branch.
913
882
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
914
 
                          merge_type=None, force=False):
 
883
        merge_type=None):
915
884
        """Merge from a branch into this working tree.
916
885
 
917
886
        :param branch: The branch to merge from.
921
890
            branch.last_revision().
922
891
        """
923
892
        from bzrlib.merge import Merger, Merge3Merger
924
 
        merger = Merger(self.branch, this_tree=self)
925
 
        # check that there are no local alterations
926
 
        if not force and self.has_changes():
927
 
            raise errors.UncommittedChanges(self)
928
 
        if to_revision is None:
929
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
930
 
        merger.other_rev_id = to_revision
931
 
        if _mod_revision.is_null(merger.other_rev_id):
932
 
            raise errors.NoCommits(branch)
933
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
934
 
        merger.other_basis = merger.other_rev_id
935
 
        merger.other_tree = self.branch.repository.revision_tree(
936
 
            merger.other_rev_id)
937
 
        merger.other_branch = branch
938
 
        if from_revision is None:
939
 
            merger.find_base()
940
 
        else:
941
 
            merger.set_base_revision(from_revision, branch)
942
 
        if merger.base_rev_id == merger.other_rev_id:
943
 
            raise errors.PointlessMerge
944
 
        merger.backup_files = False
945
 
        if merge_type is None:
946
 
            merger.merge_type = Merge3Merger
947
 
        else:
948
 
            merger.merge_type = merge_type
949
 
        merger.set_interesting_files(None)
950
 
        merger.show_base = False
951
 
        merger.reprocess = False
952
 
        conflicts = merger.do_merge()
953
 
        merger.set_pending()
 
893
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
894
        try:
 
895
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
896
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
897
            merger.pp.next_phase()
 
898
            # check that there are no
 
899
            # local alterations
 
900
            merger.check_basis(check_clean=True, require_commits=False)
 
901
            if to_revision is None:
 
902
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
903
            merger.other_rev_id = to_revision
 
904
            if _mod_revision.is_null(merger.other_rev_id):
 
905
                raise errors.NoCommits(branch)
 
906
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
907
            merger.other_basis = merger.other_rev_id
 
908
            merger.other_tree = self.branch.repository.revision_tree(
 
909
                merger.other_rev_id)
 
910
            merger.other_branch = branch
 
911
            merger.pp.next_phase()
 
912
            if from_revision is None:
 
913
                merger.find_base()
 
914
            else:
 
915
                merger.set_base_revision(from_revision, branch)
 
916
            if merger.base_rev_id == merger.other_rev_id:
 
917
                raise errors.PointlessMerge
 
918
            merger.backup_files = False
 
919
            if merge_type is None:
 
920
                merger.merge_type = Merge3Merger
 
921
            else:
 
922
                merger.merge_type = merge_type
 
923
            merger.set_interesting_files(None)
 
924
            merger.show_base = False
 
925
            merger.reprocess = False
 
926
            conflicts = merger.do_merge()
 
927
            merger.set_pending()
 
928
        finally:
 
929
            pb.finished()
954
930
        return conflicts
955
931
 
956
932
    @needs_read_lock
997
973
        return file_id
998
974
 
999
975
    def get_symlink_target(self, file_id):
1000
 
        abspath = self.id2abspath(file_id)
1001
 
        target = osutils.readlink(abspath)
1002
 
        return target
 
976
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc)
 
977
            ).decode(osutils._fs_enc)
1003
978
 
1004
979
    @needs_write_lock
1005
980
    def subsume(self, other_tree):
1103
1078
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1104
1079
        if tree_transport.base != branch_transport.base:
1105
1080
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1106
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1107
 
                target_branch=new_branch)
 
1081
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1108
1082
        else:
1109
1083
            tree_bzrdir = branch_bzrdir
1110
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1084
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1111
1085
        wt.set_parent_ids(self.get_parent_ids())
1112
1086
        my_inv = self.inventory
1113
 
        child_inv = inventory.Inventory(root_id=None)
 
1087
        child_inv = Inventory(root_id=None)
1114
1088
        new_root = my_inv[file_id]
1115
1089
        my_inv.remove_recursive_id(file_id)
1116
1090
        new_root.parent_id = None
1141
1115
    def _kind(self, relpath):
1142
1116
        return osutils.file_kind(self.abspath(relpath))
1143
1117
 
1144
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1145
 
        """List all files as (path, class, kind, id, entry).
 
1118
    def list_files(self, include_root=False):
 
1119
        """Recursively list all files as (path, class, kind, id, entry).
1146
1120
 
1147
1121
        Lists, but does not descend into unversioned directories.
 
1122
 
1148
1123
        This does not include files that have been deleted in this
1149
 
        tree. Skips the control directory.
 
1124
        tree.
1150
1125
 
1151
 
        :param include_root: if True, return an entry for the root
1152
 
        :param from_dir: start from this directory or None for the root
1153
 
        :param recursive: whether to recurse into subdirectories or not
 
1126
        Skips the control directory.
1154
1127
        """
1155
1128
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1156
1129
        # with it. So callers should be careful to always read_lock the tree.
1158
1131
            raise errors.ObjectNotLocked(self)
1159
1132
 
1160
1133
        inv = self.inventory
1161
 
        if from_dir is None and include_root is True:
 
1134
        if include_root is True:
1162
1135
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1163
1136
        # Convert these into local objects to save lookup times
1164
1137
        pathjoin = osutils.pathjoin
1171
1144
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1172
1145
 
1173
1146
        # directory file_id, relative path, absolute path, reverse sorted children
1174
 
        if from_dir is not None:
1175
 
            from_dir_id = inv.path2id(from_dir)
1176
 
            if from_dir_id is None:
1177
 
                # Directory not versioned
1178
 
                return
1179
 
            from_dir_abspath = pathjoin(self.basedir, from_dir)
1180
 
        else:
1181
 
            from_dir_id = inv.root.file_id
1182
 
            from_dir_abspath = self.basedir
1183
 
        children = os.listdir(from_dir_abspath)
 
1147
        children = os.listdir(self.basedir)
1184
1148
        children.sort()
1185
1149
        # jam 20060527 The kernel sized tree seems equivalent whether we
1186
1150
        # use a deque and popleft to keep them sorted, or if we use a plain
1187
1151
        # list and just reverse() them.
1188
1152
        children = collections.deque(children)
1189
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1153
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1190
1154
        while stack:
1191
1155
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1192
1156
 
1250
1214
                if fk != 'directory':
1251
1215
                    continue
1252
1216
 
1253
 
                # But do this child first if recursing down
1254
 
                if recursive:
1255
 
                    new_children = os.listdir(fap)
1256
 
                    new_children.sort()
1257
 
                    new_children = collections.deque(new_children)
1258
 
                    stack.append((f_ie.file_id, fp, fap, new_children))
1259
 
                    # Break out of inner loop,
1260
 
                    # so that we start outer loop with child
1261
 
                    break
 
1217
                # But do this child first
 
1218
                new_children = os.listdir(fap)
 
1219
                new_children.sort()
 
1220
                new_children = collections.deque(new_children)
 
1221
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1222
                # Break out of inner loop,
 
1223
                # so that we start outer loop with child
 
1224
                break
1262
1225
            else:
1263
1226
                # if we finished all children, pop it off the stack
1264
1227
                stack.pop()
1442
1405
        inv = self.inventory
1443
1406
        for entry in moved:
1444
1407
            try:
1445
 
                self._move_entry(WorkingTree._RenameEntry(
1446
 
                    entry.to_rel, entry.from_id,
 
1408
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1447
1409
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1448
1410
                    entry.from_tail, entry.from_parent_id,
1449
1411
                    entry.only_change_inv))
1500
1462
        from_tail = splitpath(from_rel)[-1]
1501
1463
        from_id = inv.path2id(from_rel)
1502
1464
        if from_id is None:
1503
 
            # if file is missing in the inventory maybe it's in the basis_tree
1504
 
            basis_tree = self.branch.basis_tree()
1505
 
            from_id = basis_tree.path2id(from_rel)
1506
 
            if from_id is None:
1507
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1508
 
                    errors.NotVersionedError(path=str(from_rel)))
1509
 
            # put entry back in the inventory so we can rename it
1510
 
            from_entry = basis_tree.inventory[from_id].copy()
1511
 
            inv.add(from_entry)
1512
 
        else:
1513
 
            from_entry = inv[from_id]
 
1465
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1466
                errors.NotVersionedError(path=str(from_rel)))
 
1467
        from_entry = inv[from_id]
1514
1468
        from_parent_id = from_entry.parent_id
1515
1469
        to_dir, to_tail = os.path.split(to_rel)
1516
1470
        to_dir_id = inv.path2id(to_dir)
1607
1561
 
1608
1562
    @needs_write_lock
1609
1563
    def pull(self, source, overwrite=False, stop_revision=None,
1610
 
             change_reporter=None, possible_transports=None, local=False):
 
1564
             change_reporter=None, possible_transports=None):
 
1565
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1611
1566
        source.lock_read()
1612
1567
        try:
 
1568
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1569
            pp.next_phase()
1613
1570
            old_revision_info = self.branch.last_revision_info()
1614
1571
            basis_tree = self.basis_tree()
1615
1572
            count = self.branch.pull(source, overwrite, stop_revision,
1616
 
                                     possible_transports=possible_transports,
1617
 
                                     local=local)
 
1573
                                     possible_transports=possible_transports)
1618
1574
            new_revision_info = self.branch.last_revision_info()
1619
1575
            if new_revision_info != old_revision_info:
 
1576
                pp.next_phase()
1620
1577
                repository = self.branch.repository
 
1578
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1621
1579
                basis_tree.lock_read()
1622
1580
                try:
1623
1581
                    new_basis_tree = self.branch.basis_tree()
1626
1584
                                new_basis_tree,
1627
1585
                                basis_tree,
1628
1586
                                this_tree=self,
1629
 
                                pb=None,
 
1587
                                pb=pb,
1630
1588
                                change_reporter=change_reporter)
1631
 
                    basis_root_id = basis_tree.get_root_id()
1632
 
                    new_root_id = new_basis_tree.get_root_id()
1633
 
                    if basis_root_id != new_root_id:
1634
 
                        self.set_root_id(new_root_id)
 
1589
                    if (basis_tree.inventory.root is None and
 
1590
                        new_basis_tree.inventory.root is not None):
 
1591
                        self.set_root_id(new_basis_tree.get_root_id())
1635
1592
                finally:
 
1593
                    pb.finished()
1636
1594
                    basis_tree.unlock()
1637
1595
                # TODO - dedup parents list with things merged by pull ?
1638
1596
                # reuse the revisiontree we merged against to set the new
1651
1609
            return count
1652
1610
        finally:
1653
1611
            source.unlock()
 
1612
            top_pb.finished()
1654
1613
 
1655
1614
    @needs_write_lock
1656
1615
    def put_file_bytes_non_atomic(self, file_id, bytes):
1682
1641
 
1683
1642
            fl = []
1684
1643
            for subf in os.listdir(dirabs):
1685
 
                if self.bzrdir.is_control_filename(subf):
 
1644
                if subf == '.bzr':
1686
1645
                    continue
1687
1646
                if subf not in dir_entry.children:
1688
1647
                    try:
1741
1700
        r"""Check whether the filename matches an ignore pattern.
1742
1701
 
1743
1702
        Patterns containing '/' or '\' need to match the whole path;
1744
 
        others match against only the last component.  Patterns starting
1745
 
        with '!' are ignore exceptions.  Exceptions take precedence
1746
 
        over regular patterns and cause the filename to not be ignored.
 
1703
        others match against only the last component.
1747
1704
 
1748
1705
        If the file is ignored, returns the pattern which caused it to
1749
1706
        be ignored, otherwise None.  So this can simply be used as a
1750
1707
        boolean if desired."""
1751
1708
        if getattr(self, '_ignoreglobster', None) is None:
1752
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1709
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1753
1710
        return self._ignoreglobster.match(filename)
1754
1711
 
1755
1712
    def kind(self, file_id):
1805
1762
            raise errors.ObjectNotLocked(self)
1806
1763
 
1807
1764
    def lock_read(self):
1808
 
        """Lock the tree for reading.
1809
 
 
1810
 
        This also locks the branch, and can be unlocked via self.unlock().
1811
 
 
1812
 
        :return: A bzrlib.lock.LogicalLockResult.
1813
 
        """
 
1765
        """See Branch.lock_read, and WorkingTree.unlock."""
1814
1766
        if not self.is_locked():
1815
1767
            self._reset_data()
1816
1768
        self.branch.lock_read()
1817
1769
        try:
1818
 
            self._control_files.lock_read()
1819
 
            return LogicalLockResult(self.unlock)
 
1770
            return self._control_files.lock_read()
1820
1771
        except:
1821
1772
            self.branch.unlock()
1822
1773
            raise
1823
1774
 
1824
1775
    def lock_tree_write(self):
1825
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1826
 
 
1827
 
        :return: A bzrlib.lock.LogicalLockResult.
1828
 
        """
 
1776
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1829
1777
        if not self.is_locked():
1830
1778
            self._reset_data()
1831
1779
        self.branch.lock_read()
1832
1780
        try:
1833
 
            self._control_files.lock_write()
1834
 
            return LogicalLockResult(self.unlock)
 
1781
            return self._control_files.lock_write()
1835
1782
        except:
1836
1783
            self.branch.unlock()
1837
1784
            raise
1838
1785
 
1839
1786
    def lock_write(self):
1840
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1841
 
 
1842
 
        :return: A bzrlib.lock.LogicalLockResult.
1843
 
        """
 
1787
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1844
1788
        if not self.is_locked():
1845
1789
            self._reset_data()
1846
1790
        self.branch.lock_write()
1847
1791
        try:
1848
 
            self._control_files.lock_write()
1849
 
            return LogicalLockResult(self.unlock)
 
1792
            return self._control_files.lock_write()
1850
1793
        except:
1851
1794
            self.branch.unlock()
1852
1795
            raise
1860
1803
    def _reset_data(self):
1861
1804
        """Reset transient data that cannot be revalidated."""
1862
1805
        self._inventory_is_modified = False
1863
 
        f = self._transport.get('inventory')
1864
 
        try:
1865
 
            result = self._deserialize(f)
1866
 
        finally:
1867
 
            f.close()
 
1806
        result = self._deserialize(self._transport.get('inventory'))
1868
1807
        self._set_inventory(result, dirty=False)
1869
1808
 
1870
1809
    @needs_tree_write_lock
1917
1856
            # revision_id is set. We must check for this full string, because a
1918
1857
            # root node id can legitimately look like 'revision_id' but cannot
1919
1858
            # contain a '"'.
1920
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1859
            xml = self.branch.repository.get_inventory_xml(new_revision)
1921
1860
            firstline = xml.split('\n', 1)[0]
1922
1861
            if (not 'revision_id="' in firstline or
1923
1862
                'format="7"' not in firstline):
1924
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1925
 
                    xml, new_revision)
 
1863
                inv = self.branch.repository.deserialise_inventory(
 
1864
                    new_revision, xml)
1926
1865
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1927
1866
            self._write_basis_inventory(xml)
1928
1867
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1946
1885
        # binary.
1947
1886
        if self._inventory_is_modified:
1948
1887
            raise errors.InventoryModified(self)
1949
 
        f = self._transport.get('inventory')
1950
 
        try:
1951
 
            result = self._deserialize(f)
1952
 
        finally:
1953
 
            f.close()
 
1888
        result = self._deserialize(self._transport.get('inventory'))
1954
1889
        self._set_inventory(result, dirty=False)
1955
1890
        return result
1956
1891
 
1971
1906
 
1972
1907
        new_files=set()
1973
1908
        unknown_nested_files=set()
1974
 
        if to_file is None:
1975
 
            to_file = sys.stdout
1976
1909
 
1977
1910
        def recurse_directory_to_add_files(directory):
1978
1911
            # Recurse directory and add all files
1979
1912
            # so we can check if they have changed.
1980
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1913
            for parent_info, file_infos in\
 
1914
                self.walkdirs(directory):
1981
1915
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1982
1916
                    # Is it versioned or ignored?
1983
1917
                    if self.path2id(relpath) or self.is_ignored(relpath):
2018
1952
                            # ... but not ignored
2019
1953
                            has_changed_files = True
2020
1954
                            break
2021
 
                    elif (content_change and (kind[1] is not None) and
2022
 
                            osutils.is_inside_any(files, path[1])):
2023
 
                        # Versioned and changed, but not deleted, and still
2024
 
                        # in one of the dirs to be deleted.
 
1955
                    elif content_change and (kind[1] is not None):
 
1956
                        # Versioned and changed, but not deleted
2025
1957
                        has_changed_files = True
2026
1958
                        break
2027
1959
 
2049
1981
                        new_status = 'I'
2050
1982
                    else:
2051
1983
                        new_status = '?'
2052
 
                    # XXX: Really should be a more abstract reporter interface
2053
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2054
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1984
                    textui.show_status(new_status, self.kind(fid), f,
 
1985
                                       to_file=to_file)
2055
1986
                # Unversion file
2056
1987
                inv_delta.append((f, None, fid, None))
2057
1988
                message = "removed %s" % (f,)
2080
2011
 
2081
2012
    @needs_tree_write_lock
2082
2013
    def revert(self, filenames=None, old_tree=None, backups=True,
2083
 
               pb=None, report_changes=False):
 
2014
               pb=DummyProgress(), report_changes=False):
2084
2015
        from bzrlib.conflicts import resolve
2085
2016
        if filenames == []:
2086
2017
            filenames = None
2099
2030
            if filenames is None and len(self.get_parent_ids()) > 1:
2100
2031
                parent_trees = []
2101
2032
                last_revision = self.last_revision()
2102
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2033
                if last_revision != NULL_REVISION:
2103
2034
                    if basis_tree is None:
2104
2035
                        basis_tree = self.basis_tree()
2105
2036
                        basis_tree.lock_read()
2143
2074
    def set_inventory(self, new_inventory_list):
2144
2075
        from bzrlib.inventory import (Inventory,
2145
2076
                                      InventoryDirectory,
 
2077
                                      InventoryEntry,
2146
2078
                                      InventoryFile,
2147
2079
                                      InventoryLink)
2148
2080
        inv = Inventory(self.get_root_id())
2208
2140
        """
2209
2141
        raise NotImplementedError(self.unlock)
2210
2142
 
2211
 
    _marker = object()
2212
 
 
2213
 
    def update(self, change_reporter=None, possible_transports=None,
2214
 
               revision=None, old_tip=_marker):
 
2143
    def update(self, change_reporter=None, possible_transports=None):
2215
2144
        """Update a working tree along its branch.
2216
2145
 
2217
2146
        This will update the branch if its bound too, which means we have
2235
2164
        - Merge current state -> basis tree of the master w.r.t. the old tree
2236
2165
          basis.
2237
2166
        - Do a 'normal' merge of the old branch basis if it is relevant.
2238
 
 
2239
 
        :param revision: The target revision to update to. Must be in the
2240
 
            revision history.
2241
 
        :param old_tip: If branch.update() has already been run, the value it
2242
 
            returned (old tip of the branch or None). _marker is used
2243
 
            otherwise.
2244
2167
        """
2245
2168
        if self.branch.get_bound_location() is not None:
2246
2169
            self.lock_write()
2247
 
            update_branch = (old_tip is self._marker)
 
2170
            update_branch = True
2248
2171
        else:
2249
2172
            self.lock_tree_write()
2250
2173
            update_branch = False
2252
2175
            if update_branch:
2253
2176
                old_tip = self.branch.update(possible_transports)
2254
2177
            else:
2255
 
                if old_tip is self._marker:
2256
 
                    old_tip = None
2257
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2178
                old_tip = None
 
2179
            return self._update_tree(old_tip, change_reporter)
2258
2180
        finally:
2259
2181
            self.unlock()
2260
2182
 
2261
2183
    @needs_tree_write_lock
2262
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2184
    def _update_tree(self, old_tip=None, change_reporter=None):
2263
2185
        """Update a tree to the master branch.
2264
2186
 
2265
2187
        :param old_tip: if supplied, the previous tip revision the branch,
2275
2197
        # We MUST save it even if an error occurs, because otherwise the users
2276
2198
        # local work is unreferenced and will appear to have been lost.
2277
2199
        #
2278
 
        nb_conflicts = 0
 
2200
        result = 0
2279
2201
        try:
2280
2202
            last_rev = self.get_parent_ids()[0]
2281
2203
        except IndexError:
2282
2204
            last_rev = _mod_revision.NULL_REVISION
2283
 
        if revision is None:
2284
 
            revision = self.branch.last_revision()
2285
 
 
2286
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2287
 
 
2288
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2289
 
            # the branch we are bound to was updated
2290
 
            # merge those changes in first
2291
 
            base_tree  = self.basis_tree()
2292
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2293
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2294
 
                                             base_tree, this_tree=self,
2295
 
                                             change_reporter=change_reporter)
2296
 
            if nb_conflicts:
2297
 
                self.add_parent_tree((old_tip, other_tree))
2298
 
                trace.note('Rerun update after fixing the conflicts.')
2299
 
                return nb_conflicts
2300
 
 
2301
 
        if last_rev != _mod_revision.ensure_null(revision):
2302
 
            # the working tree is up to date with the branch
2303
 
            # we can merge the specified revision from master
2304
 
            to_tree = self.branch.repository.revision_tree(revision)
2305
 
            to_root_id = to_tree.get_root_id()
2306
 
 
 
2205
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2206
            # merge tree state up to new branch tip.
2307
2207
            basis = self.basis_tree()
2308
2208
            basis.lock_read()
2309
2209
            try:
2310
 
                if (basis.inventory.root is None
2311
 
                    or basis.inventory.root.file_id != to_root_id):
2312
 
                    self.set_root_id(to_root_id)
 
2210
                to_tree = self.branch.basis_tree()
 
2211
                if basis.inventory.root is None:
 
2212
                    self.set_root_id(to_tree.get_root_id())
2313
2213
                    self.flush()
 
2214
                result += merge.merge_inner(
 
2215
                                      self.branch,
 
2216
                                      to_tree,
 
2217
                                      basis,
 
2218
                                      this_tree=self,
 
2219
                                      change_reporter=change_reporter)
2314
2220
            finally:
2315
2221
                basis.unlock()
2316
 
 
2317
 
            # determine the branch point
2318
 
            graph = self.branch.repository.get_graph()
2319
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2320
 
                                                last_rev)
2321
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2322
 
 
2323
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2324
 
                                             this_tree=self,
2325
 
                                             change_reporter=change_reporter)
2326
 
            self.set_last_revision(revision)
2327
2222
            # TODO - dedup parents list with things merged by pull ?
2328
2223
            # reuse the tree we've updated to to set the basis:
2329
 
            parent_trees = [(revision, to_tree)]
 
2224
            parent_trees = [(self.branch.last_revision(), to_tree)]
2330
2225
            merges = self.get_parent_ids()[1:]
2331
2226
            # Ideally we ask the tree for the trees here, that way the working
2332
2227
            # tree can decide whether to give us the entire tree or give us a
2336
2231
            for parent in merges:
2337
2232
                parent_trees.append(
2338
2233
                    (parent, self.branch.repository.revision_tree(parent)))
2339
 
            if not _mod_revision.is_null(old_tip):
 
2234
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2340
2235
                parent_trees.append(
2341
2236
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2342
2237
            self.set_parent_trees(parent_trees)
2343
2238
            last_rev = parent_trees[0][0]
2344
 
        return nb_conflicts
 
2239
        else:
 
2240
            # the working tree had the same last-revision as the master
 
2241
            # branch did. We may still have pivot local work from the local
 
2242
            # branch into old_tip:
 
2243
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2244
                self.add_parent_tree_id(old_tip)
 
2245
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2246
            and old_tip != last_rev):
 
2247
            # our last revision was not the prior branch last revision
 
2248
            # and we have converted that last revision to a pending merge.
 
2249
            # base is somewhere between the branch tip now
 
2250
            # and the now pending merge
 
2251
 
 
2252
            # Since we just modified the working tree and inventory, flush out
 
2253
            # the current state, before we modify it again.
 
2254
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2255
            #       requires it only because TreeTransform directly munges the
 
2256
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2257
            #       should be able to remove this extra flush.
 
2258
            self.flush()
 
2259
            graph = self.branch.repository.get_graph()
 
2260
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2261
                                                old_tip)
 
2262
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2263
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2264
            result += merge.merge_inner(
 
2265
                                  self.branch,
 
2266
                                  other_tree,
 
2267
                                  base_tree,
 
2268
                                  this_tree=self,
 
2269
                                  change_reporter=change_reporter)
 
2270
        return result
2345
2271
 
2346
2272
    def _write_hashcache_if_dirty(self):
2347
2273
        """Write out the hashcache if it is dirty."""
2447
2373
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2448
2374
                        ('.bzr', '.bzr'))
2449
2375
                    if (bzrdir_loc < len(cur_disk_dir_content)
2450
 
                        and self.bzrdir.is_control_filename(
2451
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2376
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2452
2377
                        # we dont yield the contents of, or, .bzr itself.
2453
2378
                        del cur_disk_dir_content[bzrdir_loc]
2454
2379
            if inv_finished:
2588
2513
        return un_resolved, resolved
2589
2514
 
2590
2515
    @needs_read_lock
2591
 
    def _check(self, references):
2592
 
        """Check the tree for consistency.
2593
 
 
2594
 
        :param references: A dict with keys matching the items returned by
2595
 
            self._get_check_refs(), and values from looking those keys up in
2596
 
            the repository.
2597
 
        """
 
2516
    def _check(self):
2598
2517
        tree_basis = self.basis_tree()
2599
2518
        tree_basis.lock_read()
2600
2519
        try:
2601
 
            repo_basis = references[('trees', self.last_revision())]
 
2520
            repo_basis = self.branch.repository.revision_tree(
 
2521
                self.last_revision())
2602
2522
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2603
2523
                raise errors.BzrCheckError(
2604
2524
                    "Mismatched basis inventory content.")
2617
2537
        """
2618
2538
        return
2619
2539
 
 
2540
    @needs_read_lock
2620
2541
    def _get_rules_searcher(self, default_searcher):
2621
2542
        """See Tree._get_rules_searcher."""
2622
2543
        if self._rules_searcher is None:
2649
2570
        if self._inventory is None:
2650
2571
            self.read_working_inventory()
2651
2572
 
2652
 
    def _get_check_refs(self):
2653
 
        """Return the references needed to perform a check of this tree."""
2654
 
        return [('trees', self.last_revision())]
2655
 
 
2656
2573
    def lock_tree_write(self):
2657
2574
        """See WorkingTree.lock_tree_write().
2658
2575
 
2659
2576
        In Format2 WorkingTrees we have a single lock for the branch and tree
2660
2577
        so lock_tree_write() degrades to lock_write().
2661
 
 
2662
 
        :return: An object with an unlock method which will release the lock
2663
 
            obtained.
2664
2578
        """
2665
2579
        self.branch.lock_write()
2666
2580
        try:
2667
 
            self._control_files.lock_write()
2668
 
            return self
 
2581
            return self._control_files.lock_write()
2669
2582
        except:
2670
2583
            self.branch.unlock()
2671
2584
            raise
2708
2621
 
2709
2622
    def _change_last_revision(self, revision_id):
2710
2623
        """See WorkingTree._change_last_revision."""
2711
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2624
        if revision_id is None or revision_id == NULL_REVISION:
2712
2625
            try:
2713
2626
                self._transport.delete('last-revision')
2714
2627
            except errors.NoSuchFile:
2719
2632
                mode=self.bzrdir._get_file_mode())
2720
2633
            return True
2721
2634
 
2722
 
    def _get_check_refs(self):
2723
 
        """Return the references needed to perform a check of this tree."""
2724
 
        return [('trees', self.last_revision())]
2725
 
 
2726
2635
    @needs_tree_write_lock
2727
2636
    def set_conflicts(self, conflicts):
2728
2637
        self._put_rio('conflicts', conflicts.to_stanzas(),
2805
2714
        """Return the format for the working tree object in a_bzrdir."""
2806
2715
        try:
2807
2716
            transport = a_bzrdir.get_workingtree_transport(None)
2808
 
            format_string = transport.get_bytes("format")
 
2717
            format_string = transport.get("format").read()
2809
2718
            return klass._formats[format_string]
2810
2719
        except errors.NoSuchFile:
2811
2720
            raise errors.NoWorkingTree(base=transport.base)
2882
2791
        no working tree.  (See bug #43064).
2883
2792
        """
2884
2793
        sio = StringIO()
2885
 
        inv = inventory.Inventory()
 
2794
        inv = Inventory()
2886
2795
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2887
2796
        sio.seek(0)
2888
2797
        transport.put_file('inventory', sio, file_mode)
2904
2813
            branch.generate_revision_history(revision_id)
2905
2814
        finally:
2906
2815
            branch.unlock()
2907
 
        inv = inventory.Inventory()
 
2816
        inv = Inventory()
2908
2817
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2909
2818
                         branch,
2910
2819
                         inv,
3027
2936
            # only set an explicit root id if there is one to set.
3028
2937
            if basis_tree.inventory.root is not None:
3029
2938
                wt.set_root_id(basis_tree.get_root_id())
3030
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2939
            if revision_id == NULL_REVISION:
3031
2940
                wt.set_parent_trees([])
3032
2941
            else:
3033
2942
                wt.set_parent_trees([(revision_id, basis_tree)])
3040
2949
        return wt
3041
2950
 
3042
2951
    def _initial_inventory(self):
3043
 
        return inventory.Inventory()
 
2952
        return Inventory()
3044
2953
 
3045
2954
    def __init__(self):
3046
2955
        super(WorkingTreeFormat3, self).__init__()
3075
2984
        return self.get_format_string()
3076
2985
 
3077
2986
 
3078
 
__default_format = WorkingTreeFormat6()
 
2987
__default_format = WorkingTreeFormat4()
3079
2988
WorkingTreeFormat.register_format(__default_format)
 
2989
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3080
2990
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3081
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3082
2991
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3083
2992
WorkingTreeFormat.set_default_format(__default_format)
3084
2993
# formats which have no format string are not discoverable