← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-25 23:12:24 UTC
  • mfrom: (4048.1.2 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090225231224-r2fv2iqcgezje0zt
Make ls aware of views (Eduardo O. Padoan)

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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""WorkingTree object and friends.
18
18
 
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
71
 
from bzrlib.workingtree_4 import (
72
 
    WorkingTreeFormat4,
73
 
    WorkingTreeFormat5,
74
 
    WorkingTreeFormat6,
75
 
    )
 
82
import bzrlib.ui
 
83
from bzrlib.workingtree_4 import WorkingTreeFormat4, WorkingTreeFormat5
76
84
""")
77
85
 
78
86
from bzrlib import symbol_versioning
79
87
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
88
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
80
89
from bzrlib.lockable_files import LockableFiles
81
90
from bzrlib.lockdir import LockDir
82
91
import bzrlib.mutabletree
83
92
from bzrlib.mutabletree import needs_tree_write_lock
84
93
from bzrlib import osutils
85
94
from bzrlib.osutils import (
 
95
    compact_date,
86
96
    file_kind,
87
97
    isdir,
88
98
    normpath,
89
99
    pathjoin,
 
100
    rand_chars,
90
101
    realpath,
91
102
    safe_unicode,
92
103
    splitpath,
93
104
    supports_executable,
94
105
    )
95
 
from bzrlib.filters import filtered_input_file
96
106
from bzrlib.trace import mutter, note
97
107
from bzrlib.transport.local import LocalTransport
98
 
from bzrlib.revision import CURRENT_REVISION
 
108
from bzrlib.progress import DummyProgress, ProgressPhase
 
109
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
110
from bzrlib.rio import RioReader, rio_file, Stanza
100
 
from bzrlib.symbol_versioning import (
101
 
    deprecated_passed,
102
 
    DEPRECATED_PARAMETER,
103
 
    )
 
111
from bzrlib.symbol_versioning import (deprecated_passed,
 
112
        deprecated_method,
 
113
        deprecated_function,
 
114
        DEPRECATED_PARAMETER,
 
115
        )
104
116
 
105
117
 
106
118
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
119
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
120
 
112
121
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
176
        return ''
168
177
 
169
178
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
179
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
180
    """Working copy tree.
173
181
 
174
182
    The inventory is held in the `Branch` working-inventory, and the
222
230
        wt_trans = self.bzrdir.get_workingtree_transport(None)
223
231
        cache_filename = wt_trans.local_abspath('stat-cache')
224
232
        self._hashcache = hashcache.HashCache(basedir, cache_filename,
225
 
            self.bzrdir._get_file_mode(),
226
 
            self._content_filter_stack_provider())
 
233
            self.bzrdir._get_file_mode())
227
234
        hc = self._hashcache
228
235
        hc.read()
229
236
        # is this scan needed ? it makes things kinda slow.
247
254
        self._rules_searcher = None
248
255
        self.views = self._make_views()
249
256
 
250
 
    @property
251
 
    def user_transport(self):
252
 
        return self.bzrdir.user_transport
253
 
 
254
 
    @property
255
 
    def control_transport(self):
256
 
        return self._transport
257
 
 
258
257
    def _detect_case_handling(self):
259
258
        wt_trans = self.bzrdir.get_workingtree_transport(None)
260
259
        try:
285
284
        self._control_files.break_lock()
286
285
        self.branch.break_lock()
287
286
 
288
 
    def _get_check_refs(self):
289
 
        """Return the references needed to perform a check of this tree.
290
 
        
291
 
        The default implementation returns no refs, and is only suitable for
292
 
        trees that have no local caching and can commit on ghosts at any time.
293
 
 
294
 
        :seealso: bzrlib.check for details about check_refs.
295
 
        """
296
 
        return []
297
 
 
298
287
    def requires_rich_root(self):
299
288
        return self._format.requires_rich_root
300
289
 
424
413
            return self.branch.repository.revision_tree(revision_id)
425
414
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
426
415
            # the basis tree *may* be a ghost or a low level error may have
427
 
            # occurred. If the revision is present, its a problem, if its not
 
416
            # occured. If the revision is present, its a problem, if its not
428
417
            # its a ghost.
429
418
            if self.branch.repository.has_revision(revision_id):
430
419
                raise
446
435
    def has_filename(self, filename):
447
436
        return osutils.lexists(self.abspath(filename))
448
437
 
449
 
    def get_file(self, file_id, path=None, filtered=True):
450
 
        return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
 
438
    def get_file(self, file_id, path=None):
 
439
        return self.get_file_with_stat(file_id, path)[0]
451
440
 
452
 
    def get_file_with_stat(self, file_id, path=None, filtered=True,
453
 
        _fstat=os.fstat):
454
 
        """See Tree.get_file_with_stat."""
 
441
    def get_file_with_stat(self, file_id, path=None, _fstat=os.fstat):
 
442
        """See MutableTree.get_file_with_stat."""
455
443
        if path is None:
456
444
            path = self.id2path(file_id)
457
 
        file_obj = self.get_file_byname(path, filtered=False)
458
 
        stat_value = _fstat(file_obj.fileno())
459
 
        if filtered and self.supports_content_filtering():
460
 
            filters = self._content_filter_stack(path)
461
 
            file_obj = filtered_input_file(file_obj, filters)
462
 
        return (file_obj, stat_value)
463
 
 
464
 
    def get_file_text(self, file_id, path=None, filtered=True):
465
 
        return self.get_file(file_id, path=path, filtered=filtered).read()
466
 
 
467
 
    def get_file_byname(self, filename, filtered=True):
468
 
        path = self.abspath(filename)
469
 
        f = file(path, 'rb')
470
 
        if filtered and self.supports_content_filtering():
471
 
            filters = self._content_filter_stack(filename)
472
 
            return filtered_input_file(f, filters)
473
 
        else:
474
 
            return f
475
 
 
476
 
    def get_file_lines(self, file_id, path=None, filtered=True):
 
445
        file_obj = self.get_file_byname(path)
 
446
        return (file_obj, _fstat(file_obj.fileno()))
 
447
 
 
448
    def get_file_byname(self, filename):
 
449
        return file(self.abspath(filename), 'rb')
 
450
 
 
451
    def get_file_lines(self, file_id, path=None):
477
452
        """See Tree.get_file_lines()"""
478
 
        file = self.get_file(file_id, path, filtered=filtered)
 
453
        file = self.get_file(file_id, path)
479
454
        try:
480
455
            return file.readlines()
481
456
        finally:
492
467
        incorrectly attributed to CURRENT_REVISION (but after committing, the
493
468
        attribution will be correct).
494
469
        """
495
 
        maybe_file_parent_keys = []
496
 
        for parent_id in self.get_parent_ids():
497
 
            try:
498
 
                parent_tree = self.revision_tree(parent_id)
499
 
            except errors.NoSuchRevisionInTree:
500
 
                parent_tree = self.branch.repository.revision_tree(parent_id)
501
 
            parent_tree.lock_read()
502
 
            try:
503
 
                if file_id not in parent_tree:
504
 
                    continue
505
 
                ie = parent_tree.inventory[file_id]
506
 
                if ie.kind != 'file':
507
 
                    # Note: this is slightly unnecessary, because symlinks and
508
 
                    # directories have a "text" which is the empty text, and we
509
 
                    # know that won't mess up annotations. But it seems cleaner
510
 
                    continue
511
 
                parent_text_key = (file_id, ie.revision)
512
 
                if parent_text_key not in maybe_file_parent_keys:
513
 
                    maybe_file_parent_keys.append(parent_text_key)
514
 
            finally:
515
 
                parent_tree.unlock()
516
 
        graph = _mod_graph.Graph(self.branch.repository.texts)
517
 
        heads = graph.heads(maybe_file_parent_keys)
518
 
        file_parent_keys = []
519
 
        for key in maybe_file_parent_keys:
520
 
            if key in heads:
521
 
                file_parent_keys.append(key)
522
 
 
523
 
        # Now we have the parents of this content
524
 
        annotator = self.branch.repository.texts.get_annotator()
525
 
        text = self.get_file(file_id).read()
526
 
        this_key =(file_id, default_revision)
527
 
        annotator.add_special_text(this_key, file_parent_keys, text)
528
 
        annotations = [(key[-1], line)
529
 
                       for key, line in annotator.annotate_flat(this_key)]
530
 
        return annotations
 
470
        basis = self.basis_tree()
 
471
        basis.lock_read()
 
472
        try:
 
473
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
474
                require_versioned=True).next()
 
475
            changed_content, kind = changes[2], changes[6]
 
476
            if not changed_content:
 
477
                return basis.annotate_iter(file_id)
 
478
            if kind[1] is None:
 
479
                return None
 
480
            import annotate
 
481
            if kind[0] != 'file':
 
482
                old_lines = []
 
483
            else:
 
484
                old_lines = list(basis.annotate_iter(file_id))
 
485
            old = [old_lines]
 
486
            for tree in self.branch.repository.revision_trees(
 
487
                self.get_parent_ids()[1:]):
 
488
                if file_id not in tree:
 
489
                    continue
 
490
                old.append(list(tree.annotate_iter(file_id)))
 
491
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
492
                                       default_revision)
 
493
        finally:
 
494
            basis.unlock()
531
495
 
532
496
    def _get_ancestors(self, default_revision):
533
497
        ancestors = set([default_revision])
548
512
        else:
549
513
            parents = [last_rev]
550
514
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
515
            merges_file = self._transport.get('pending-merges')
552
516
        except errors.NoSuchFile:
553
517
            pass
554
518
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
519
            for l in merges_file.readlines():
556
520
                revision_id = l.rstrip('\n')
557
521
                parents.append(revision_id)
558
522
        return parents
577
541
 
578
542
        revision
579
543
            If not None, the cloned tree will have its last revision set to
580
 
            revision, and difference between the source trees last revision
 
544
            revision, and and difference between the source trees last revision
581
545
            and this one merged in.
582
546
        """
583
547
        # assumes the target bzr dir format is compatible.
617
581
 
618
582
    def get_file_size(self, file_id):
619
583
        """See Tree.get_file_size"""
620
 
        # XXX: this returns the on-disk size; it should probably return the
621
 
        # canonical size
622
584
        try:
623
585
            return os.path.getsize(self.id2abspath(file_id))
624
586
        except OSError, e:
640
602
 
641
603
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
604
        file_id = self.path2id(path)
643
 
        if file_id is None:
644
 
            # For unversioned files on win32, we just assume they are not
645
 
            # executable
646
 
            return False
647
605
        return self._inventory[file_id].executable
648
606
 
649
607
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
759
717
            raise
760
718
        kind = _mapper(stat_result.st_mode)
761
719
        if kind == 'file':
762
 
            return self._file_content_summary(path, stat_result)
 
720
            size = stat_result.st_size
 
721
            # try for a stat cache lookup
 
722
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
723
            return (kind, size, executable, self._sha_from_stat(
 
724
                path, stat_result))
763
725
        elif kind == 'directory':
764
726
            # perhaps it looks like a plain directory, but it's really a
765
727
            # reference.
767
729
                kind = 'tree-reference'
768
730
            return kind, None, None, None
769
731
        elif kind == 'symlink':
770
 
            target = osutils.readlink(abspath)
771
 
            return ('symlink', None, None, target)
 
732
            return ('symlink', None, None, os.readlink(abspath.encode(osutils._fs_enc)))
772
733
        else:
773
734
            return (kind, None, None, None)
774
735
 
775
 
    def _file_content_summary(self, path, stat_result):
776
 
        size = stat_result.st_size
777
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
778
 
        # try for a stat cache lookup
779
 
        return ('file', size, executable, self._sha_from_stat(
780
 
            path, stat_result))
781
 
 
782
736
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
737
        """Common ghost checking functionality from set_parent_*.
784
738
 
794
748
    def _set_merges_from_parent_ids(self, parent_ids):
795
749
        merges = parent_ids[1:]
796
750
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
797
 
            mode=self.bzrdir._get_file_mode())
 
751
            mode=self._control_files._file_mode)
798
752
 
799
753
    def _filter_parent_ids_by_ancestry(self, revision_ids):
800
754
        """Check that all merged revisions are proper 'heads'.
900
854
        self._must_be_locked()
901
855
        my_file = rio_file(stanzas, header)
902
856
        self._transport.put_file(filename, my_file,
903
 
            mode=self.bzrdir._get_file_mode())
 
857
            mode=self._control_files._file_mode)
904
858
 
905
859
    @needs_write_lock # because merge pulls data into the branch.
906
860
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
861
        merge_type=None):
908
862
        """Merge from a branch into this working tree.
909
863
 
910
864
        :param branch: The branch to merge from.
914
868
            branch.last_revision().
915
869
        """
916
870
        from bzrlib.merge import Merger, Merge3Merger
917
 
        merger = Merger(self.branch, this_tree=self)
918
 
        # check that there are no local alterations
919
 
        if not force and self.has_changes():
920
 
            raise errors.UncommittedChanges(self)
921
 
        if to_revision is None:
922
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
923
 
        merger.other_rev_id = to_revision
924
 
        if _mod_revision.is_null(merger.other_rev_id):
925
 
            raise errors.NoCommits(branch)
926
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
 
        merger.other_basis = merger.other_rev_id
928
 
        merger.other_tree = self.branch.repository.revision_tree(
929
 
            merger.other_rev_id)
930
 
        merger.other_branch = branch
931
 
        if from_revision is None:
932
 
            merger.find_base()
933
 
        else:
934
 
            merger.set_base_revision(from_revision, branch)
935
 
        if merger.base_rev_id == merger.other_rev_id:
936
 
            raise errors.PointlessMerge
937
 
        merger.backup_files = False
938
 
        if merge_type is None:
939
 
            merger.merge_type = Merge3Merger
940
 
        else:
941
 
            merger.merge_type = merge_type
942
 
        merger.set_interesting_files(None)
943
 
        merger.show_base = False
944
 
        merger.reprocess = False
945
 
        conflicts = merger.do_merge()
946
 
        merger.set_pending()
 
871
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
872
        try:
 
873
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
874
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
875
            merger.pp.next_phase()
 
876
            # check that there are no
 
877
            # local alterations
 
878
            merger.check_basis(check_clean=True, require_commits=False)
 
879
            if to_revision is None:
 
880
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
881
            merger.other_rev_id = to_revision
 
882
            if _mod_revision.is_null(merger.other_rev_id):
 
883
                raise errors.NoCommits(branch)
 
884
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
885
            merger.other_basis = merger.other_rev_id
 
886
            merger.other_tree = self.branch.repository.revision_tree(
 
887
                merger.other_rev_id)
 
888
            merger.other_branch = branch
 
889
            merger.pp.next_phase()
 
890
            if from_revision is None:
 
891
                merger.find_base()
 
892
            else:
 
893
                merger.set_base_revision(from_revision, branch)
 
894
            if merger.base_rev_id == merger.other_rev_id:
 
895
                raise errors.PointlessMerge
 
896
            merger.backup_files = False
 
897
            if merge_type is None:
 
898
                merger.merge_type = Merge3Merger
 
899
            else:
 
900
                merger.merge_type = merge_type
 
901
            merger.set_interesting_files(None)
 
902
            merger.show_base = False
 
903
            merger.reprocess = False
 
904
            conflicts = merger.do_merge()
 
905
            merger.set_pending()
 
906
        finally:
 
907
            pb.finished()
947
908
        return conflicts
948
909
 
949
910
    @needs_read_lock
990
951
        return file_id
991
952
 
992
953
    def get_symlink_target(self, file_id):
993
 
        abspath = self.id2abspath(file_id)
994
 
        target = osutils.readlink(abspath)
995
 
        return target
 
954
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc))
996
955
 
997
956
    @needs_write_lock
998
957
    def subsume(self, other_tree):
1096
1055
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1056
        if tree_transport.base != branch_transport.base:
1098
1057
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1058
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1059
        else:
1102
1060
            tree_bzrdir = branch_bzrdir
1103
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1061
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1104
1062
        wt.set_parent_ids(self.get_parent_ids())
1105
1063
        my_inv = self.inventory
1106
 
        child_inv = inventory.Inventory(root_id=None)
 
1064
        child_inv = Inventory(root_id=None)
1107
1065
        new_root = my_inv[file_id]
1108
1066
        my_inv.remove_recursive_id(file_id)
1109
1067
        new_root.parent_id = None
1128
1086
        self._serialize(self._inventory, sio)
1129
1087
        sio.seek(0)
1130
1088
        self._transport.put_file('inventory', sio,
1131
 
            mode=self.bzrdir._get_file_mode())
 
1089
            mode=self._control_files._file_mode)
1132
1090
        self._inventory_is_modified = False
1133
1091
 
1134
1092
    def _kind(self, relpath):
1135
1093
        return osutils.file_kind(self.abspath(relpath))
1136
1094
 
1137
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
 
        """List all files as (path, class, kind, id, entry).
 
1095
    def list_files(self, include_root=False):
 
1096
        """Recursively list all files as (path, class, kind, id, entry).
1139
1097
 
1140
1098
        Lists, but does not descend into unversioned directories.
 
1099
 
1141
1100
        This does not include files that have been deleted in this
1142
 
        tree. Skips the control directory.
 
1101
        tree.
1143
1102
 
1144
 
        :param include_root: if True, return an entry for the root
1145
 
        :param from_dir: start from this directory or None for the root
1146
 
        :param recursive: whether to recurse into subdirectories or not
 
1103
        Skips the control directory.
1147
1104
        """
1148
1105
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1106
        # with it. So callers should be careful to always read_lock the tree.
1151
1108
            raise errors.ObjectNotLocked(self)
1152
1109
 
1153
1110
        inv = self.inventory
1154
 
        if from_dir is None and include_root is True:
 
1111
        if include_root is True:
1155
1112
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1156
1113
        # Convert these into local objects to save lookup times
1157
1114
        pathjoin = osutils.pathjoin
1164
1121
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1165
1122
 
1166
1123
        # directory file_id, relative path, absolute path, reverse sorted children
1167
 
        if from_dir is not None:
1168
 
            from_dir_id = inv.path2id(from_dir)
1169
 
            if from_dir_id is None:
1170
 
                # Directory not versioned
1171
 
                return
1172
 
            from_dir_abspath = pathjoin(self.basedir, from_dir)
1173
 
        else:
1174
 
            from_dir_id = inv.root.file_id
1175
 
            from_dir_abspath = self.basedir
1176
 
        children = os.listdir(from_dir_abspath)
 
1124
        children = os.listdir(self.basedir)
1177
1125
        children.sort()
1178
1126
        # jam 20060527 The kernel sized tree seems equivalent whether we
1179
1127
        # use a deque and popleft to keep them sorted, or if we use a plain
1180
1128
        # list and just reverse() them.
1181
1129
        children = collections.deque(children)
1182
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1130
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1183
1131
        while stack:
1184
1132
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1185
1133
 
1243
1191
                if fk != 'directory':
1244
1192
                    continue
1245
1193
 
1246
 
                # But do this child first if recursing down
1247
 
                if recursive:
1248
 
                    new_children = os.listdir(fap)
1249
 
                    new_children.sort()
1250
 
                    new_children = collections.deque(new_children)
1251
 
                    stack.append((f_ie.file_id, fp, fap, new_children))
1252
 
                    # Break out of inner loop,
1253
 
                    # so that we start outer loop with child
1254
 
                    break
 
1194
                # But do this child first
 
1195
                new_children = os.listdir(fap)
 
1196
                new_children.sort()
 
1197
                new_children = collections.deque(new_children)
 
1198
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1199
                # Break out of inner loop,
 
1200
                # so that we start outer loop with child
 
1201
                break
1255
1202
            else:
1256
1203
                # if we finished all children, pop it off the stack
1257
1204
                stack.pop()
1435
1382
        inv = self.inventory
1436
1383
        for entry in moved:
1437
1384
            try:
1438
 
                self._move_entry(WorkingTree._RenameEntry(
1439
 
                    entry.to_rel, entry.from_id,
 
1385
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1440
1386
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
1387
                    entry.from_tail, entry.from_parent_id,
1442
1388
                    entry.only_change_inv))
1493
1439
        from_tail = splitpath(from_rel)[-1]
1494
1440
        from_id = inv.path2id(from_rel)
1495
1441
        if from_id is None:
1496
 
            # if file is missing in the inventory maybe it's in the basis_tree
1497
 
            basis_tree = self.branch.basis_tree()
1498
 
            from_id = basis_tree.path2id(from_rel)
1499
 
            if from_id is None:
1500
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1501
 
                    errors.NotVersionedError(path=str(from_rel)))
1502
 
            # put entry back in the inventory so we can rename it
1503
 
            from_entry = basis_tree.inventory[from_id].copy()
1504
 
            inv.add(from_entry)
1505
 
        else:
1506
 
            from_entry = inv[from_id]
 
1442
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1443
                errors.NotVersionedError(path=str(from_rel)))
 
1444
        from_entry = inv[from_id]
1507
1445
        from_parent_id = from_entry.parent_id
1508
1446
        to_dir, to_tail = os.path.split(to_rel)
1509
1447
        to_dir_id = inv.path2id(to_dir)
1571
1509
        :raises: NoSuchId if any fileid is not currently versioned.
1572
1510
        """
1573
1511
        for file_id in file_ids:
1574
 
            if file_id not in self._inventory:
1575
 
                raise errors.NoSuchId(self, file_id)
1576
 
        for file_id in file_ids:
1577
1512
            if self._inventory.has_id(file_id):
1578
1513
                self._inventory.remove_recursive_id(file_id)
 
1514
            else:
 
1515
                raise errors.NoSuchId(self, file_id)
1579
1516
        if len(file_ids):
1580
1517
            # in the future this should just set a dirty bit to wait for the
1581
1518
            # final unlock. However, until all methods of workingtree start
1600
1537
 
1601
1538
    @needs_write_lock
1602
1539
    def pull(self, source, overwrite=False, stop_revision=None,
1603
 
             change_reporter=None, possible_transports=None, local=False):
 
1540
             change_reporter=None, possible_transports=None):
 
1541
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1604
1542
        source.lock_read()
1605
1543
        try:
 
1544
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1545
            pp.next_phase()
1606
1546
            old_revision_info = self.branch.last_revision_info()
1607
1547
            basis_tree = self.basis_tree()
1608
1548
            count = self.branch.pull(source, overwrite, stop_revision,
1609
 
                                     possible_transports=possible_transports,
1610
 
                                     local=local)
 
1549
                                     possible_transports=possible_transports)
1611
1550
            new_revision_info = self.branch.last_revision_info()
1612
1551
            if new_revision_info != old_revision_info:
 
1552
                pp.next_phase()
1613
1553
                repository = self.branch.repository
 
1554
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1614
1555
                basis_tree.lock_read()
1615
1556
                try:
1616
1557
                    new_basis_tree = self.branch.basis_tree()
1619
1560
                                new_basis_tree,
1620
1561
                                basis_tree,
1621
1562
                                this_tree=self,
1622
 
                                pb=None,
 
1563
                                pb=pb,
1623
1564
                                change_reporter=change_reporter)
1624
 
                    basis_root_id = basis_tree.get_root_id()
1625
 
                    new_root_id = new_basis_tree.get_root_id()
1626
 
                    if basis_root_id != new_root_id:
1627
 
                        self.set_root_id(new_root_id)
 
1565
                    if (basis_tree.inventory.root is None and
 
1566
                        new_basis_tree.inventory.root is not None):
 
1567
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1568
                finally:
 
1569
                    pb.finished()
1629
1570
                    basis_tree.unlock()
1630
1571
                # TODO - dedup parents list with things merged by pull ?
1631
1572
                # reuse the revisiontree we merged against to set the new
1644
1585
            return count
1645
1586
        finally:
1646
1587
            source.unlock()
 
1588
            top_pb.finished()
1647
1589
 
1648
1590
    @needs_write_lock
1649
1591
    def put_file_bytes_non_atomic(self, file_id, bytes):
1675
1617
 
1676
1618
            fl = []
1677
1619
            for subf in os.listdir(dirabs):
1678
 
                if self.bzrdir.is_control_filename(subf):
 
1620
                if subf == '.bzr':
1679
1621
                    continue
1680
1622
                if subf not in dir_entry.children:
1681
1623
                    try:
1734
1676
        r"""Check whether the filename matches an ignore pattern.
1735
1677
 
1736
1678
        Patterns containing '/' or '\' need to match the whole path;
1737
 
        others match against only the last component.  Patterns starting
1738
 
        with '!' are ignore exceptions.  Exceptions take precedence
1739
 
        over regular patterns and cause the filename to not be ignored.
 
1679
        others match against only the last component.
1740
1680
 
1741
1681
        If the file is ignored, returns the pattern which caused it to
1742
1682
        be ignored, otherwise None.  So this can simply be used as a
1743
1683
        boolean if desired."""
1744
1684
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1685
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1686
        return self._ignoreglobster.match(filename)
1747
1687
 
1748
1688
    def kind(self, file_id):
1839
1779
    def _reset_data(self):
1840
1780
        """Reset transient data that cannot be revalidated."""
1841
1781
        self._inventory_is_modified = False
1842
 
        f = self._transport.get('inventory')
1843
 
        try:
1844
 
            result = self._deserialize(f)
1845
 
        finally:
1846
 
            f.close()
 
1782
        result = self._deserialize(self._transport.get('inventory'))
1847
1783
        self._set_inventory(result, dirty=False)
1848
1784
 
1849
1785
    @needs_tree_write_lock
1873
1809
        path = self._basis_inventory_name()
1874
1810
        sio = StringIO(xml)
1875
1811
        self._transport.put_file(path, sio,
1876
 
            mode=self.bzrdir._get_file_mode())
 
1812
            mode=self._control_files._file_mode)
1877
1813
 
1878
1814
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1879
1815
        """Create the text that will be saved in basis-inventory"""
1896
1832
            # revision_id is set. We must check for this full string, because a
1897
1833
            # root node id can legitimately look like 'revision_id' but cannot
1898
1834
            # contain a '"'.
1899
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1835
            xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1836
            firstline = xml.split('\n', 1)[0]
1901
1837
            if (not 'revision_id="' in firstline or
1902
1838
                'format="7"' not in firstline):
1903
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1904
 
                    xml, new_revision)
 
1839
                inv = self.branch.repository.deserialise_inventory(
 
1840
                    new_revision, xml)
1905
1841
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1906
1842
            self._write_basis_inventory(xml)
1907
1843
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
1861
        # binary.
1926
1862
        if self._inventory_is_modified:
1927
1863
            raise errors.InventoryModified(self)
1928
 
        f = self._transport.get('inventory')
1929
 
        try:
1930
 
            result = self._deserialize(f)
1931
 
        finally:
1932
 
            f.close()
 
1864
        result = self._deserialize(self._transport.get('inventory'))
1933
1865
        self._set_inventory(result, dirty=False)
1934
1866
        return result
1935
1867
 
1950
1882
 
1951
1883
        new_files=set()
1952
1884
        unknown_nested_files=set()
1953
 
        if to_file is None:
1954
 
            to_file = sys.stdout
1955
1885
 
1956
1886
        def recurse_directory_to_add_files(directory):
1957
1887
            # Recurse directory and add all files
2013
1943
                        tree_delta.unversioned.extend((unknown_file,))
2014
1944
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2015
1945
 
2016
 
        # Build inv_delta and delete files where applicable,
 
1946
        # Build inv_delta and delete files where applicaple,
2017
1947
        # do this before any modifications to inventory.
2018
1948
        for f in files:
2019
1949
            fid = self.path2id(f)
2027
1957
                        new_status = 'I'
2028
1958
                    else:
2029
1959
                        new_status = '?'
2030
 
                    # XXX: Really should be a more abstract reporter interface
2031
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2032
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1960
                    textui.show_status(new_status, self.kind(fid), f,
 
1961
                                       to_file=to_file)
2033
1962
                # Unversion file
2034
1963
                inv_delta.append((f, None, fid, None))
2035
1964
                message = "removed %s" % (f,)
2058
1987
 
2059
1988
    @needs_tree_write_lock
2060
1989
    def revert(self, filenames=None, old_tree=None, backups=True,
2061
 
               pb=None, report_changes=False):
 
1990
               pb=DummyProgress(), report_changes=False):
2062
1991
        from bzrlib.conflicts import resolve
2063
1992
        if filenames == []:
2064
1993
            filenames = None
2077
2006
            if filenames is None and len(self.get_parent_ids()) > 1:
2078
2007
                parent_trees = []
2079
2008
                last_revision = self.last_revision()
2080
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2009
                if last_revision != NULL_REVISION:
2081
2010
                    if basis_tree is None:
2082
2011
                        basis_tree = self.basis_tree()
2083
2012
                        basis_tree.lock_read()
2121
2050
    def set_inventory(self, new_inventory_list):
2122
2051
        from bzrlib.inventory import (Inventory,
2123
2052
                                      InventoryDirectory,
 
2053
                                      InventoryEntry,
2124
2054
                                      InventoryFile,
2125
2055
                                      InventoryLink)
2126
2056
        inv = Inventory(self.get_root_id())
2186
2116
        """
2187
2117
        raise NotImplementedError(self.unlock)
2188
2118
 
2189
 
    _marker = object()
2190
 
 
2191
 
    def update(self, change_reporter=None, possible_transports=None,
2192
 
               revision=None, old_tip=_marker):
 
2119
    def update(self, change_reporter=None, possible_transports=None):
2193
2120
        """Update a working tree along its branch.
2194
2121
 
2195
2122
        This will update the branch if its bound too, which means we have
2213
2140
        - Merge current state -> basis tree of the master w.r.t. the old tree
2214
2141
          basis.
2215
2142
        - Do a 'normal' merge of the old branch basis if it is relevant.
2216
 
 
2217
 
        :param revision: The target revision to update to. Must be in the
2218
 
            revision history.
2219
 
        :param old_tip: If branch.update() has already been run, the value it
2220
 
            returned (old tip of the branch or None). _marker is used
2221
 
            otherwise.
2222
2143
        """
2223
2144
        if self.branch.get_bound_location() is not None:
2224
2145
            self.lock_write()
2225
 
            update_branch = (old_tip is self._marker)
 
2146
            update_branch = True
2226
2147
        else:
2227
2148
            self.lock_tree_write()
2228
2149
            update_branch = False
2230
2151
            if update_branch:
2231
2152
                old_tip = self.branch.update(possible_transports)
2232
2153
            else:
2233
 
                if old_tip is self._marker:
2234
 
                    old_tip = None
2235
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2154
                old_tip = None
 
2155
            return self._update_tree(old_tip, change_reporter)
2236
2156
        finally:
2237
2157
            self.unlock()
2238
2158
 
2239
2159
    @needs_tree_write_lock
2240
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2160
    def _update_tree(self, old_tip=None, change_reporter=None):
2241
2161
        """Update a tree to the master branch.
2242
2162
 
2243
2163
        :param old_tip: if supplied, the previous tip revision the branch,
2253
2173
        # We MUST save it even if an error occurs, because otherwise the users
2254
2174
        # local work is unreferenced and will appear to have been lost.
2255
2175
        #
2256
 
        nb_conflicts = 0
 
2176
        result = 0
2257
2177
        try:
2258
2178
            last_rev = self.get_parent_ids()[0]
2259
2179
        except IndexError:
2260
2180
            last_rev = _mod_revision.NULL_REVISION
2261
 
        if revision is None:
2262
 
            revision = self.branch.last_revision()
2263
 
 
2264
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2265
 
 
2266
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
 
            # the branch we are bound to was updated
2268
 
            # merge those changes in first
2269
 
            base_tree  = self.basis_tree()
2270
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2271
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
 
                                             base_tree, this_tree=self,
2273
 
                                             change_reporter=change_reporter)
2274
 
            if nb_conflicts:
2275
 
                self.add_parent_tree((old_tip, other_tree))
2276
 
                trace.note('Rerun update after fixing the conflicts.')
2277
 
                return nb_conflicts
2278
 
 
2279
 
        if last_rev != _mod_revision.ensure_null(revision):
2280
 
            # the working tree is up to date with the branch
2281
 
            # we can merge the specified revision from master
2282
 
            to_tree = self.branch.repository.revision_tree(revision)
2283
 
            to_root_id = to_tree.get_root_id()
2284
 
 
 
2181
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2182
            # merge tree state up to new branch tip.
2285
2183
            basis = self.basis_tree()
2286
2184
            basis.lock_read()
2287
2185
            try:
2288
 
                if (basis.inventory.root is None
2289
 
                    or basis.inventory.root.file_id != to_root_id):
2290
 
                    self.set_root_id(to_root_id)
 
2186
                to_tree = self.branch.basis_tree()
 
2187
                if basis.inventory.root is None:
 
2188
                    self.set_root_id(to_tree.get_root_id())
2291
2189
                    self.flush()
 
2190
                result += merge.merge_inner(
 
2191
                                      self.branch,
 
2192
                                      to_tree,
 
2193
                                      basis,
 
2194
                                      this_tree=self,
 
2195
                                      change_reporter=change_reporter)
2292
2196
            finally:
2293
2197
                basis.unlock()
2294
 
 
2295
 
            # determine the branch point
2296
 
            graph = self.branch.repository.get_graph()
2297
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2298
 
                                                last_rev)
2299
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2300
 
 
2301
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2302
 
                                             this_tree=self,
2303
 
                                             change_reporter=change_reporter)
2304
 
            self.set_last_revision(revision)
2305
2198
            # TODO - dedup parents list with things merged by pull ?
2306
2199
            # reuse the tree we've updated to to set the basis:
2307
 
            parent_trees = [(revision, to_tree)]
 
2200
            parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2201
            merges = self.get_parent_ids()[1:]
2309
2202
            # Ideally we ask the tree for the trees here, that way the working
2310
 
            # tree can decide whether to give us the entire tree or give us a
 
2203
            # tree can decide whether to give us teh entire tree or give us a
2311
2204
            # lazy initialised tree. dirstate for instance will have the trees
2312
2205
            # in ram already, whereas a last-revision + basis-inventory tree
2313
2206
            # will not, but also does not need them when setting parents.
2314
2207
            for parent in merges:
2315
2208
                parent_trees.append(
2316
2209
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2210
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2211
                parent_trees.append(
2319
2212
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2213
            self.set_parent_trees(parent_trees)
2321
2214
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2215
        else:
 
2216
            # the working tree had the same last-revision as the master
 
2217
            # branch did. We may still have pivot local work from the local
 
2218
            # branch into old_tip:
 
2219
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2220
                self.add_parent_tree_id(old_tip)
 
2221
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2222
            and old_tip != last_rev):
 
2223
            # our last revision was not the prior branch last revision
 
2224
            # and we have converted that last revision to a pending merge.
 
2225
            # base is somewhere between the branch tip now
 
2226
            # and the now pending merge
 
2227
 
 
2228
            # Since we just modified the working tree and inventory, flush out
 
2229
            # the current state, before we modify it again.
 
2230
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2231
            #       requires it only because TreeTransform directly munges the
 
2232
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2233
            #       should be able to remove this extra flush.
 
2234
            self.flush()
 
2235
            graph = self.branch.repository.get_graph()
 
2236
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2237
                                                old_tip)
 
2238
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2239
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2240
            result += merge.merge_inner(
 
2241
                                  self.branch,
 
2242
                                  other_tree,
 
2243
                                  base_tree,
 
2244
                                  this_tree=self,
 
2245
                                  change_reporter=change_reporter)
 
2246
        return result
2323
2247
 
2324
2248
    def _write_hashcache_if_dirty(self):
2325
2249
        """Write out the hashcache if it is dirty."""
2425
2349
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2426
2350
                        ('.bzr', '.bzr'))
2427
2351
                    if (bzrdir_loc < len(cur_disk_dir_content)
2428
 
                        and self.bzrdir.is_control_filename(
2429
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2352
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2430
2353
                        # we dont yield the contents of, or, .bzr itself.
2431
2354
                        del cur_disk_dir_content[bzrdir_loc]
2432
2355
            if inv_finished:
2566
2489
        return un_resolved, resolved
2567
2490
 
2568
2491
    @needs_read_lock
2569
 
    def _check(self, references):
2570
 
        """Check the tree for consistency.
2571
 
 
2572
 
        :param references: A dict with keys matching the items returned by
2573
 
            self._get_check_refs(), and values from looking those keys up in
2574
 
            the repository.
2575
 
        """
 
2492
    def _check(self):
2576
2493
        tree_basis = self.basis_tree()
2577
2494
        tree_basis.lock_read()
2578
2495
        try:
2579
 
            repo_basis = references[('trees', self.last_revision())]
 
2496
            repo_basis = self.branch.repository.revision_tree(
 
2497
                self.last_revision())
2580
2498
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
2499
                raise errors.BzrCheckError(
2582
2500
                    "Mismatched basis inventory content.")
2595
2513
        """
2596
2514
        return
2597
2515
 
 
2516
    @needs_read_lock
2598
2517
    def _get_rules_searcher(self, default_searcher):
2599
2518
        """See Tree._get_rules_searcher."""
2600
2519
        if self._rules_searcher is None:
2627
2546
        if self._inventory is None:
2628
2547
            self.read_working_inventory()
2629
2548
 
2630
 
    def _get_check_refs(self):
2631
 
        """Return the references needed to perform a check of this tree."""
2632
 
        return [('trees', self.last_revision())]
2633
 
 
2634
2549
    def lock_tree_write(self):
2635
2550
        """See WorkingTree.lock_tree_write().
2636
2551
 
2682
2597
 
2683
2598
    def _change_last_revision(self, revision_id):
2684
2599
        """See WorkingTree._change_last_revision."""
2685
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2600
        if revision_id is None or revision_id == NULL_REVISION:
2686
2601
            try:
2687
2602
                self._transport.delete('last-revision')
2688
2603
            except errors.NoSuchFile:
2690
2605
            return False
2691
2606
        else:
2692
2607
            self._transport.put_bytes('last-revision', revision_id,
2693
 
                mode=self.bzrdir._get_file_mode())
 
2608
                mode=self._control_files._file_mode)
2694
2609
            return True
2695
2610
 
2696
 
    def _get_check_refs(self):
2697
 
        """Return the references needed to perform a check of this tree."""
2698
 
        return [('trees', self.last_revision())]
2699
 
 
2700
2611
    @needs_tree_write_lock
2701
2612
    def set_conflicts(self, conflicts):
2702
2613
        self._put_rio('conflicts', conflicts.to_stanzas(),
2779
2690
        """Return the format for the working tree object in a_bzrdir."""
2780
2691
        try:
2781
2692
            transport = a_bzrdir.get_workingtree_transport(None)
2782
 
            format_string = transport.get_bytes("format")
 
2693
            format_string = transport.get("format").read()
2783
2694
            return klass._formats[format_string]
2784
2695
        except errors.NoSuchFile:
2785
2696
            raise errors.NoWorkingTree(base=transport.base)
2856
2767
        no working tree.  (See bug #43064).
2857
2768
        """
2858
2769
        sio = StringIO()
2859
 
        inv = inventory.Inventory()
 
2770
        inv = Inventory()
2860
2771
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2861
2772
        sio.seek(0)
2862
2773
        transport.put_file('inventory', sio, file_mode)
2878
2789
            branch.generate_revision_history(revision_id)
2879
2790
        finally:
2880
2791
            branch.unlock()
2881
 
        inv = inventory.Inventory()
 
2792
        inv = Inventory()
2882
2793
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2883
2794
                         branch,
2884
2795
                         inv,
2975
2886
        control_files.create_lock()
2976
2887
        control_files.lock_write()
2977
2888
        transport.put_bytes('format', self.get_format_string(),
2978
 
            mode=a_bzrdir._get_file_mode())
 
2889
            mode=control_files._file_mode)
2979
2890
        if from_branch is not None:
2980
2891
            branch = from_branch
2981
2892
        else:
3001
2912
            # only set an explicit root id if there is one to set.
3002
2913
            if basis_tree.inventory.root is not None:
3003
2914
                wt.set_root_id(basis_tree.get_root_id())
3004
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2915
            if revision_id == NULL_REVISION:
3005
2916
                wt.set_parent_trees([])
3006
2917
            else:
3007
2918
                wt.set_parent_trees([(revision_id, basis_tree)])
3014
2925
        return wt
3015
2926
 
3016
2927
    def _initial_inventory(self):
3017
 
        return inventory.Inventory()
 
2928
        return Inventory()
3018
2929
 
3019
2930
    def __init__(self):
3020
2931
        super(WorkingTreeFormat3, self).__init__()
3049
2960
        return self.get_format_string()
3050
2961
 
3051
2962
 
3052
 
__default_format = WorkingTreeFormat6()
 
2963
__default_format = WorkingTreeFormat4()
3053
2964
WorkingTreeFormat.register_format(__default_format)
3054
2965
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
2966
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2967
WorkingTreeFormat.set_default_format(__default_format)
3058
2968
# formats which have no format string are not discoverable