/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: Vincent Ladeuil
  • Date: 2009-04-27 16:10:10 UTC
  • mto: (4310.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4311.
  • Revision ID: v.ladeuil+lp@free.fr-20090427161010-7swfzeagf63cpixd
Fix bug #367726 by reverting some default user handling introduced
while fixing bug #256612.

* bzrlib/transport/ssh.py:
(_paramiko_auth): Explicitly use getpass.getuser() as default
user.

* bzrlib/transport/ftp/_gssapi.py:
(GSSAPIFtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/transport/ftp/__init__.py:
(FtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/tests/test_sftp_transport.py:
(TestUsesAuthConfig.test_sftp_is_none_if_no_config)
(TestUsesAuthConfig.test_sftp_doesnt_prompt_username): Revert to
None as the default user.

* bzrlib/tests/test_remote.py:
(TestRemoteSSHTransportAuthentication): The really offending one:
revert to None as the default user.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig.test_username_default_no_prompt): Update
test (and some PEP8).

* bzrlib/smtp_connection.py:
(SMTPConnection._authenticate): Revert to None as the default
user.

* bzrlib/plugins/launchpad/account.py:
(_get_auth_user): Revert default value handling.

* bzrlib/config.py:
(AuthenticationConfig.get_user): Fix doc-string. Leave default
value handling to callers.

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