/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: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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)
38
32
 
39
33
from cStringIO import StringIO
40
34
import os
48
42
import itertools
49
43
import operator
50
44
import stat
51
 
from time import time
52
 
import warnings
53
45
import re
54
46
 
55
47
import bzrlib
57
49
    branch,
58
50
    bzrdir,
59
51
    conflicts as _mod_conflicts,
60
 
    dirstate,
61
52
    errors,
62
53
    generate_ids,
63
54
    globbing,
 
55
    graph as _mod_graph,
64
56
    hashcache,
65
57
    ignores,
 
58
    inventory,
66
59
    merge,
67
60
    revision as _mod_revision,
68
61
    revisiontree,
69
 
    repository,
70
 
    textui,
71
62
    trace,
72
63
    transform,
73
64
    ui,
74
 
    urlutils,
75
65
    views,
76
66
    xml5,
77
 
    xml6,
78
67
    xml7,
79
68
    )
80
69
import bzrlib.branch
81
70
from bzrlib.transport import get_transport
82
 
import bzrlib.ui
83
 
from bzrlib.workingtree_4 import WorkingTreeFormat4, WorkingTreeFormat5
 
71
from bzrlib.workingtree_4 import (
 
72
    WorkingTreeFormat4,
 
73
    WorkingTreeFormat5,
 
74
    WorkingTreeFormat6,
 
75
    )
84
76
""")
85
77
 
86
78
from bzrlib import symbol_versioning
87
79
from bzrlib.decorators import needs_read_lock, needs_write_lock
88
 
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
89
80
from bzrlib.lockable_files import LockableFiles
90
81
from bzrlib.lockdir import LockDir
91
82
import bzrlib.mutabletree
92
83
from bzrlib.mutabletree import needs_tree_write_lock
93
84
from bzrlib import osutils
94
85
from bzrlib.osutils import (
95
 
    compact_date,
96
86
    file_kind,
97
87
    isdir,
98
88
    normpath,
99
89
    pathjoin,
100
 
    rand_chars,
101
90
    realpath,
102
91
    safe_unicode,
103
92
    splitpath,
104
93
    supports_executable,
105
94
    )
 
95
from bzrlib.filters import filtered_input_file
106
96
from bzrlib.trace import mutter, note
107
97
from bzrlib.transport.local import LocalTransport
108
 
from bzrlib.progress import DummyProgress, ProgressPhase
109
 
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
 
98
from bzrlib.revision import CURRENT_REVISION
110
99
from bzrlib.rio import RioReader, rio_file, Stanza
111
 
from bzrlib.symbol_versioning import (deprecated_passed,
112
 
        deprecated_method,
113
 
        deprecated_function,
114
 
        DEPRECATED_PARAMETER,
115
 
        )
 
100
from bzrlib.symbol_versioning import (
 
101
    deprecated_passed,
 
102
    DEPRECATED_PARAMETER,
 
103
    )
116
104
 
117
105
 
118
106
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.
119
110
CONFLICT_HEADER_1 = "BZR conflict list format 1"
120
111
 
121
112
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
176
167
        return ''
177
168
 
178
169
 
179
 
class WorkingTree(bzrlib.mutabletree.MutableTree):
 
170
class WorkingTree(bzrlib.mutabletree.MutableTree,
 
171
    bzrdir.ControlComponent):
180
172
    """Working copy tree.
181
173
 
182
174
    The inventory is held in the `Branch` working-inventory, and the
230
222
        wt_trans = self.bzrdir.get_workingtree_transport(None)
231
223
        cache_filename = wt_trans.local_abspath('stat-cache')
232
224
        self._hashcache = hashcache.HashCache(basedir, cache_filename,
233
 
            self.bzrdir._get_file_mode())
 
225
            self.bzrdir._get_file_mode(),
 
226
            self._content_filter_stack_provider())
234
227
        hc = self._hashcache
235
228
        hc.read()
236
229
        # is this scan needed ? it makes things kinda slow.
254
247
        self._rules_searcher = None
255
248
        self.views = self._make_views()
256
249
 
 
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
 
257
258
    def _detect_case_handling(self):
258
259
        wt_trans = self.bzrdir.get_workingtree_transport(None)
259
260
        try:
284
285
        self._control_files.break_lock()
285
286
        self.branch.break_lock()
286
287
 
 
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
 
287
298
    def requires_rich_root(self):
288
299
        return self._format.requires_rich_root
289
300
 
413
424
            return self.branch.repository.revision_tree(revision_id)
414
425
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
415
426
            # the basis tree *may* be a ghost or a low level error may have
416
 
            # occured. If the revision is present, its a problem, if its not
 
427
            # occurred. If the revision is present, its a problem, if its not
417
428
            # its a ghost.
418
429
            if self.branch.repository.has_revision(revision_id):
419
430
                raise
435
446
    def has_filename(self, filename):
436
447
        return osutils.lexists(self.abspath(filename))
437
448
 
438
 
    def get_file(self, file_id, path=None):
439
 
        return self.get_file_with_stat(file_id, path)[0]
 
449
    def get_file(self, file_id, path=None, filtered=True):
 
450
        return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
440
451
 
441
 
    def get_file_with_stat(self, file_id, path=None, _fstat=os.fstat):
442
 
        """See MutableTree.get_file_with_stat."""
 
452
    def get_file_with_stat(self, file_id, path=None, filtered=True,
 
453
        _fstat=os.fstat):
 
454
        """See Tree.get_file_with_stat."""
443
455
        if path is None:
444
456
            path = self.id2path(file_id)
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):
 
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):
452
477
        """See Tree.get_file_lines()"""
453
 
        file = self.get_file(file_id, path)
 
478
        file = self.get_file(file_id, path, filtered=filtered)
454
479
        try:
455
480
            return file.readlines()
456
481
        finally:
467
492
        incorrectly attributed to CURRENT_REVISION (but after committing, the
468
493
        attribution will be correct).
469
494
        """
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()
 
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
495
531
 
496
532
    def _get_ancestors(self, default_revision):
497
533
        ancestors = set([default_revision])
512
548
        else:
513
549
            parents = [last_rev]
514
550
        try:
515
 
            merges_file = self._transport.get('pending-merges')
 
551
            merges_bytes = self._transport.get_bytes('pending-merges')
516
552
        except errors.NoSuchFile:
517
553
            pass
518
554
        else:
519
 
            for l in merges_file.readlines():
 
555
            for l in osutils.split_lines(merges_bytes):
520
556
                revision_id = l.rstrip('\n')
521
557
                parents.append(revision_id)
522
558
        return parents
541
577
 
542
578
        revision
543
579
            If not None, the cloned tree will have its last revision set to
544
 
            revision, and and difference between the source trees last revision
 
580
            revision, and difference between the source trees last revision
545
581
            and this one merged in.
546
582
        """
547
583
        # assumes the target bzr dir format is compatible.
581
617
 
582
618
    def get_file_size(self, file_id):
583
619
        """See Tree.get_file_size"""
 
620
        # XXX: this returns the on-disk size; it should probably return the
 
621
        # canonical size
584
622
        try:
585
623
            return os.path.getsize(self.id2abspath(file_id))
586
624
        except OSError, e:
602
640
 
603
641
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
604
642
        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
605
647
        return self._inventory[file_id].executable
606
648
 
607
649
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
717
759
            raise
718
760
        kind = _mapper(stat_result.st_mode)
719
761
        if kind == 'file':
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))
 
762
            return self._file_content_summary(path, stat_result)
725
763
        elif kind == 'directory':
726
764
            # perhaps it looks like a plain directory, but it's really a
727
765
            # reference.
729
767
                kind = 'tree-reference'
730
768
            return kind, None, None, None
731
769
        elif kind == 'symlink':
732
 
            return ('symlink', None, None,
733
 
                    os.readlink(abspath.encode(osutils._fs_enc)
734
 
                                ).decode(osutils._fs_enc))
 
770
            target = osutils.readlink(abspath)
 
771
            return ('symlink', None, None, target)
735
772
        else:
736
773
            return (kind, None, None, None)
737
774
 
 
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
 
738
782
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
739
783
        """Common ghost checking functionality from set_parent_*.
740
784
 
750
794
    def _set_merges_from_parent_ids(self, parent_ids):
751
795
        merges = parent_ids[1:]
752
796
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
753
 
            mode=self._control_files._file_mode)
 
797
            mode=self.bzrdir._get_file_mode())
754
798
 
755
799
    def _filter_parent_ids_by_ancestry(self, revision_ids):
756
800
        """Check that all merged revisions are proper 'heads'.
856
900
        self._must_be_locked()
857
901
        my_file = rio_file(stanzas, header)
858
902
        self._transport.put_file(filename, my_file,
859
 
            mode=self._control_files._file_mode)
 
903
            mode=self.bzrdir._get_file_mode())
860
904
 
861
905
    @needs_write_lock # because merge pulls data into the branch.
862
906
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
863
 
        merge_type=None):
 
907
                          merge_type=None, force=False):
864
908
        """Merge from a branch into this working tree.
865
909
 
866
910
        :param branch: The branch to merge from.
870
914
            branch.last_revision().
871
915
        """
872
916
        from bzrlib.merge import Merger, Merge3Merger
873
 
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
874
 
        try:
875
 
            merger = Merger(self.branch, this_tree=self, pb=pb)
876
 
            merger.pp = ProgressPhase("Merge phase", 5, pb)
877
 
            merger.pp.next_phase()
878
 
            # check that there are no
879
 
            # local alterations
880
 
            merger.check_basis(check_clean=True, require_commits=False)
881
 
            if to_revision is None:
882
 
                to_revision = _mod_revision.ensure_null(branch.last_revision())
883
 
            merger.other_rev_id = to_revision
884
 
            if _mod_revision.is_null(merger.other_rev_id):
885
 
                raise errors.NoCommits(branch)
886
 
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
887
 
            merger.other_basis = merger.other_rev_id
888
 
            merger.other_tree = self.branch.repository.revision_tree(
889
 
                merger.other_rev_id)
890
 
            merger.other_branch = branch
891
 
            merger.pp.next_phase()
892
 
            if from_revision is None:
893
 
                merger.find_base()
894
 
            else:
895
 
                merger.set_base_revision(from_revision, branch)
896
 
            if merger.base_rev_id == merger.other_rev_id:
897
 
                raise errors.PointlessMerge
898
 
            merger.backup_files = False
899
 
            if merge_type is None:
900
 
                merger.merge_type = Merge3Merger
901
 
            else:
902
 
                merger.merge_type = merge_type
903
 
            merger.set_interesting_files(None)
904
 
            merger.show_base = False
905
 
            merger.reprocess = False
906
 
            conflicts = merger.do_merge()
907
 
            merger.set_pending()
908
 
        finally:
909
 
            pb.finished()
 
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()
910
947
        return conflicts
911
948
 
912
949
    @needs_read_lock
953
990
        return file_id
954
991
 
955
992
    def get_symlink_target(self, file_id):
956
 
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc))
 
993
        abspath = self.id2abspath(file_id)
 
994
        target = osutils.readlink(abspath)
 
995
        return target
957
996
 
958
997
    @needs_write_lock
959
998
    def subsume(self, other_tree):
1057
1096
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1058
1097
        if tree_transport.base != branch_transport.base:
1059
1098
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1060
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
 
1099
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
 
1100
                target_branch=new_branch)
1061
1101
        else:
1062
1102
            tree_bzrdir = branch_bzrdir
1063
 
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
 
1103
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1064
1104
        wt.set_parent_ids(self.get_parent_ids())
1065
1105
        my_inv = self.inventory
1066
 
        child_inv = Inventory(root_id=None)
 
1106
        child_inv = inventory.Inventory(root_id=None)
1067
1107
        new_root = my_inv[file_id]
1068
1108
        my_inv.remove_recursive_id(file_id)
1069
1109
        new_root.parent_id = None
1088
1128
        self._serialize(self._inventory, sio)
1089
1129
        sio.seek(0)
1090
1130
        self._transport.put_file('inventory', sio,
1091
 
            mode=self._control_files._file_mode)
 
1131
            mode=self.bzrdir._get_file_mode())
1092
1132
        self._inventory_is_modified = False
1093
1133
 
1094
1134
    def _kind(self, relpath):
1095
1135
        return osutils.file_kind(self.abspath(relpath))
1096
1136
 
1097
 
    def list_files(self, include_root=False):
1098
 
        """Recursively list all files as (path, class, kind, id, entry).
 
1137
    def list_files(self, include_root=False, from_dir=None, recursive=True):
 
1138
        """List all files as (path, class, kind, id, entry).
1099
1139
 
1100
1140
        Lists, but does not descend into unversioned directories.
1101
 
 
1102
1141
        This does not include files that have been deleted in this
1103
 
        tree.
 
1142
        tree. Skips the control directory.
1104
1143
 
1105
 
        Skips the control directory.
 
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
1106
1147
        """
1107
1148
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1108
1149
        # with it. So callers should be careful to always read_lock the tree.
1110
1151
            raise errors.ObjectNotLocked(self)
1111
1152
 
1112
1153
        inv = self.inventory
1113
 
        if include_root is True:
 
1154
        if from_dir is None and include_root is True:
1114
1155
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1115
1156
        # Convert these into local objects to save lookup times
1116
1157
        pathjoin = osutils.pathjoin
1123
1164
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1124
1165
 
1125
1166
        # directory file_id, relative path, absolute path, reverse sorted children
1126
 
        children = os.listdir(self.basedir)
 
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)
1127
1177
        children.sort()
1128
1178
        # jam 20060527 The kernel sized tree seems equivalent whether we
1129
1179
        # use a deque and popleft to keep them sorted, or if we use a plain
1130
1180
        # list and just reverse() them.
1131
1181
        children = collections.deque(children)
1132
 
        stack = [(inv.root.file_id, u'', self.basedir, children)]
 
1182
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
1133
1183
        while stack:
1134
1184
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1135
1185
 
1193
1243
                if fk != 'directory':
1194
1244
                    continue
1195
1245
 
1196
 
                # But do this child first
1197
 
                new_children = os.listdir(fap)
1198
 
                new_children.sort()
1199
 
                new_children = collections.deque(new_children)
1200
 
                stack.append((f_ie.file_id, fp, fap, new_children))
1201
 
                # Break out of inner loop,
1202
 
                # so that we start outer loop with child
1203
 
                break
 
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
1204
1255
            else:
1205
1256
                # if we finished all children, pop it off the stack
1206
1257
                stack.pop()
1384
1435
        inv = self.inventory
1385
1436
        for entry in moved:
1386
1437
            try:
1387
 
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
 
1438
                self._move_entry(WorkingTree._RenameEntry(
 
1439
                    entry.to_rel, entry.from_id,
1388
1440
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1389
1441
                    entry.from_tail, entry.from_parent_id,
1390
1442
                    entry.only_change_inv))
1441
1493
        from_tail = splitpath(from_rel)[-1]
1442
1494
        from_id = inv.path2id(from_rel)
1443
1495
        if from_id is None:
1444
 
            raise errors.BzrRenameFailedError(from_rel,to_rel,
1445
 
                errors.NotVersionedError(path=str(from_rel)))
1446
 
        from_entry = inv[from_id]
 
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]
1447
1507
        from_parent_id = from_entry.parent_id
1448
1508
        to_dir, to_tail = os.path.split(to_rel)
1449
1509
        to_dir_id = inv.path2id(to_dir)
1511
1571
        :raises: NoSuchId if any fileid is not currently versioned.
1512
1572
        """
1513
1573
        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:
1514
1577
            if self._inventory.has_id(file_id):
1515
1578
                self._inventory.remove_recursive_id(file_id)
1516
 
            else:
1517
 
                raise errors.NoSuchId(self, file_id)
1518
1579
        if len(file_ids):
1519
1580
            # in the future this should just set a dirty bit to wait for the
1520
1581
            # final unlock. However, until all methods of workingtree start
1539
1600
 
1540
1601
    @needs_write_lock
1541
1602
    def pull(self, source, overwrite=False, stop_revision=None,
1542
 
             change_reporter=None, possible_transports=None):
1543
 
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1603
             change_reporter=None, possible_transports=None, local=False):
1544
1604
        source.lock_read()
1545
1605
        try:
1546
 
            pp = ProgressPhase("Pull phase", 2, top_pb)
1547
 
            pp.next_phase()
1548
1606
            old_revision_info = self.branch.last_revision_info()
1549
1607
            basis_tree = self.basis_tree()
1550
1608
            count = self.branch.pull(source, overwrite, stop_revision,
1551
 
                                     possible_transports=possible_transports)
 
1609
                                     possible_transports=possible_transports,
 
1610
                                     local=local)
1552
1611
            new_revision_info = self.branch.last_revision_info()
1553
1612
            if new_revision_info != old_revision_info:
1554
 
                pp.next_phase()
1555
1613
                repository = self.branch.repository
1556
 
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1557
1614
                basis_tree.lock_read()
1558
1615
                try:
1559
1616
                    new_basis_tree = self.branch.basis_tree()
1562
1619
                                new_basis_tree,
1563
1620
                                basis_tree,
1564
1621
                                this_tree=self,
1565
 
                                pb=pb,
 
1622
                                pb=None,
1566
1623
                                change_reporter=change_reporter)
1567
 
                    if (basis_tree.inventory.root is None and
1568
 
                        new_basis_tree.inventory.root is not None):
1569
 
                        self.set_root_id(new_basis_tree.get_root_id())
 
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)
1570
1628
                finally:
1571
 
                    pb.finished()
1572
1629
                    basis_tree.unlock()
1573
1630
                # TODO - dedup parents list with things merged by pull ?
1574
1631
                # reuse the revisiontree we merged against to set the new
1587
1644
            return count
1588
1645
        finally:
1589
1646
            source.unlock()
1590
 
            top_pb.finished()
1591
1647
 
1592
1648
    @needs_write_lock
1593
1649
    def put_file_bytes_non_atomic(self, file_id, bytes):
1619
1675
 
1620
1676
            fl = []
1621
1677
            for subf in os.listdir(dirabs):
1622
 
                if subf == '.bzr':
 
1678
                if self.bzrdir.is_control_filename(subf):
1623
1679
                    continue
1624
1680
                if subf not in dir_entry.children:
1625
1681
                    try:
1678
1734
        r"""Check whether the filename matches an ignore pattern.
1679
1735
 
1680
1736
        Patterns containing '/' or '\' need to match the whole path;
1681
 
        others match against only the last component.
 
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.
1682
1740
 
1683
1741
        If the file is ignored, returns the pattern which caused it to
1684
1742
        be ignored, otherwise None.  So this can simply be used as a
1685
1743
        boolean if desired."""
1686
1744
        if getattr(self, '_ignoreglobster', None) is None:
1687
 
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
 
1745
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1688
1746
        return self._ignoreglobster.match(filename)
1689
1747
 
1690
1748
    def kind(self, file_id):
1781
1839
    def _reset_data(self):
1782
1840
        """Reset transient data that cannot be revalidated."""
1783
1841
        self._inventory_is_modified = False
1784
 
        result = self._deserialize(self._transport.get('inventory'))
 
1842
        f = self._transport.get('inventory')
 
1843
        try:
 
1844
            result = self._deserialize(f)
 
1845
        finally:
 
1846
            f.close()
1785
1847
        self._set_inventory(result, dirty=False)
1786
1848
 
1787
1849
    @needs_tree_write_lock
1811
1873
        path = self._basis_inventory_name()
1812
1874
        sio = StringIO(xml)
1813
1875
        self._transport.put_file(path, sio,
1814
 
            mode=self._control_files._file_mode)
 
1876
            mode=self.bzrdir._get_file_mode())
1815
1877
 
1816
1878
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1817
1879
        """Create the text that will be saved in basis-inventory"""
1834
1896
            # revision_id is set. We must check for this full string, because a
1835
1897
            # root node id can legitimately look like 'revision_id' but cannot
1836
1898
            # contain a '"'.
1837
 
            xml = self.branch.repository.get_inventory_xml(new_revision)
 
1899
            xml = self.branch.repository._get_inventory_xml(new_revision)
1838
1900
            firstline = xml.split('\n', 1)[0]
1839
1901
            if (not 'revision_id="' in firstline or
1840
1902
                'format="7"' not in firstline):
1841
 
                inv = self.branch.repository.deserialise_inventory(
1842
 
                    new_revision, xml)
 
1903
                inv = self.branch.repository._serializer.read_inventory_from_string(
 
1904
                    xml, new_revision)
1843
1905
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1844
1906
            self._write_basis_inventory(xml)
1845
1907
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1863
1925
        # binary.
1864
1926
        if self._inventory_is_modified:
1865
1927
            raise errors.InventoryModified(self)
1866
 
        result = self._deserialize(self._transport.get('inventory'))
 
1928
        f = self._transport.get('inventory')
 
1929
        try:
 
1930
            result = self._deserialize(f)
 
1931
        finally:
 
1932
            f.close()
1867
1933
        self._set_inventory(result, dirty=False)
1868
1934
        return result
1869
1935
 
1884
1950
 
1885
1951
        new_files=set()
1886
1952
        unknown_nested_files=set()
 
1953
        if to_file is None:
 
1954
            to_file = sys.stdout
1887
1955
 
1888
1956
        def recurse_directory_to_add_files(directory):
1889
1957
            # Recurse directory and add all files
1945
2013
                        tree_delta.unversioned.extend((unknown_file,))
1946
2014
                raise errors.BzrRemoveChangedFilesError(tree_delta)
1947
2015
 
1948
 
        # Build inv_delta and delete files where applicaple,
 
2016
        # Build inv_delta and delete files where applicable,
1949
2017
        # do this before any modifications to inventory.
1950
2018
        for f in files:
1951
2019
            fid = self.path2id(f)
1959
2027
                        new_status = 'I'
1960
2028
                    else:
1961
2029
                        new_status = '?'
1962
 
                    textui.show_status(new_status, self.kind(fid), f,
1963
 
                                       to_file=to_file)
 
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')
1964
2033
                # Unversion file
1965
2034
                inv_delta.append((f, None, fid, None))
1966
2035
                message = "removed %s" % (f,)
1989
2058
 
1990
2059
    @needs_tree_write_lock
1991
2060
    def revert(self, filenames=None, old_tree=None, backups=True,
1992
 
               pb=DummyProgress(), report_changes=False):
 
2061
               pb=None, report_changes=False):
1993
2062
        from bzrlib.conflicts import resolve
1994
2063
        if filenames == []:
1995
2064
            filenames = None
2008
2077
            if filenames is None and len(self.get_parent_ids()) > 1:
2009
2078
                parent_trees = []
2010
2079
                last_revision = self.last_revision()
2011
 
                if last_revision != NULL_REVISION:
 
2080
                if last_revision != _mod_revision.NULL_REVISION:
2012
2081
                    if basis_tree is None:
2013
2082
                        basis_tree = self.basis_tree()
2014
2083
                        basis_tree.lock_read()
2052
2121
    def set_inventory(self, new_inventory_list):
2053
2122
        from bzrlib.inventory import (Inventory,
2054
2123
                                      InventoryDirectory,
2055
 
                                      InventoryEntry,
2056
2124
                                      InventoryFile,
2057
2125
                                      InventoryLink)
2058
2126
        inv = Inventory(self.get_root_id())
2118
2186
        """
2119
2187
        raise NotImplementedError(self.unlock)
2120
2188
 
2121
 
    def update(self, change_reporter=None, possible_transports=None):
 
2189
    _marker = object()
 
2190
 
 
2191
    def update(self, change_reporter=None, possible_transports=None,
 
2192
               revision=None, old_tip=_marker):
2122
2193
        """Update a working tree along its branch.
2123
2194
 
2124
2195
        This will update the branch if its bound too, which means we have
2142
2213
        - Merge current state -> basis tree of the master w.r.t. the old tree
2143
2214
          basis.
2144
2215
        - 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.
2145
2222
        """
2146
2223
        if self.branch.get_bound_location() is not None:
2147
2224
            self.lock_write()
2148
 
            update_branch = True
 
2225
            update_branch = (old_tip is self._marker)
2149
2226
        else:
2150
2227
            self.lock_tree_write()
2151
2228
            update_branch = False
2153
2230
            if update_branch:
2154
2231
                old_tip = self.branch.update(possible_transports)
2155
2232
            else:
2156
 
                old_tip = None
2157
 
            return self._update_tree(old_tip, change_reporter)
 
2233
                if old_tip is self._marker:
 
2234
                    old_tip = None
 
2235
            return self._update_tree(old_tip, change_reporter, revision)
2158
2236
        finally:
2159
2237
            self.unlock()
2160
2238
 
2161
2239
    @needs_tree_write_lock
2162
 
    def _update_tree(self, old_tip=None, change_reporter=None):
 
2240
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2163
2241
        """Update a tree to the master branch.
2164
2242
 
2165
2243
        :param old_tip: if supplied, the previous tip revision the branch,
2175
2253
        # We MUST save it even if an error occurs, because otherwise the users
2176
2254
        # local work is unreferenced and will appear to have been lost.
2177
2255
        #
2178
 
        result = 0
 
2256
        nb_conflicts = 0
2179
2257
        try:
2180
2258
            last_rev = self.get_parent_ids()[0]
2181
2259
        except IndexError:
2182
2260
            last_rev = _mod_revision.NULL_REVISION
2183
 
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2184
 
            # merge tree state up to new branch tip.
 
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
 
2185
2285
            basis = self.basis_tree()
2186
2286
            basis.lock_read()
2187
2287
            try:
2188
 
                to_tree = self.branch.basis_tree()
2189
 
                if basis.inventory.root is None:
2190
 
                    self.set_root_id(to_tree.get_root_id())
 
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)
2191
2291
                    self.flush()
2192
 
                result += merge.merge_inner(
2193
 
                                      self.branch,
2194
 
                                      to_tree,
2195
 
                                      basis,
2196
 
                                      this_tree=self,
2197
 
                                      change_reporter=change_reporter)
2198
2292
            finally:
2199
2293
                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)
2200
2305
            # TODO - dedup parents list with things merged by pull ?
2201
2306
            # reuse the tree we've updated to to set the basis:
2202
 
            parent_trees = [(self.branch.last_revision(), to_tree)]
 
2307
            parent_trees = [(revision, to_tree)]
2203
2308
            merges = self.get_parent_ids()[1:]
2204
2309
            # Ideally we ask the tree for the trees here, that way the working
2205
 
            # tree can decide whether to give us teh entire tree or give us a
 
2310
            # tree can decide whether to give us the entire tree or give us a
2206
2311
            # lazy initialised tree. dirstate for instance will have the trees
2207
2312
            # in ram already, whereas a last-revision + basis-inventory tree
2208
2313
            # will not, but also does not need them when setting parents.
2209
2314
            for parent in merges:
2210
2315
                parent_trees.append(
2211
2316
                    (parent, self.branch.repository.revision_tree(parent)))
2212
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2317
            if not _mod_revision.is_null(old_tip):
2213
2318
                parent_trees.append(
2214
2319
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2215
2320
            self.set_parent_trees(parent_trees)
2216
2321
            last_rev = parent_trees[0][0]
2217
 
        else:
2218
 
            # the working tree had the same last-revision as the master
2219
 
            # branch did. We may still have pivot local work from the local
2220
 
            # branch into old_tip:
2221
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2222
 
                self.add_parent_tree_id(old_tip)
2223
 
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
2224
 
            and old_tip != last_rev):
2225
 
            # our last revision was not the prior branch last revision
2226
 
            # and we have converted that last revision to a pending merge.
2227
 
            # base is somewhere between the branch tip now
2228
 
            # and the now pending merge
2229
 
 
2230
 
            # Since we just modified the working tree and inventory, flush out
2231
 
            # the current state, before we modify it again.
2232
 
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2233
 
            #       requires it only because TreeTransform directly munges the
2234
 
            #       inventory and calls tree._write_inventory(). Ultimately we
2235
 
            #       should be able to remove this extra flush.
2236
 
            self.flush()
2237
 
            graph = self.branch.repository.get_graph()
2238
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2239
 
                                                old_tip)
2240
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2241
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2242
 
            result += merge.merge_inner(
2243
 
                                  self.branch,
2244
 
                                  other_tree,
2245
 
                                  base_tree,
2246
 
                                  this_tree=self,
2247
 
                                  change_reporter=change_reporter)
2248
 
        return result
 
2322
        return nb_conflicts
2249
2323
 
2250
2324
    def _write_hashcache_if_dirty(self):
2251
2325
        """Write out the hashcache if it is dirty."""
2351
2425
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2352
2426
                        ('.bzr', '.bzr'))
2353
2427
                    if (bzrdir_loc < len(cur_disk_dir_content)
2354
 
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
 
2428
                        and self.bzrdir.is_control_filename(
 
2429
                            cur_disk_dir_content[bzrdir_loc][0])):
2355
2430
                        # we dont yield the contents of, or, .bzr itself.
2356
2431
                        del cur_disk_dir_content[bzrdir_loc]
2357
2432
            if inv_finished:
2491
2566
        return un_resolved, resolved
2492
2567
 
2493
2568
    @needs_read_lock
2494
 
    def _check(self):
 
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
        """
2495
2576
        tree_basis = self.basis_tree()
2496
2577
        tree_basis.lock_read()
2497
2578
        try:
2498
 
            repo_basis = self.branch.repository.revision_tree(
2499
 
                self.last_revision())
 
2579
            repo_basis = references[('trees', self.last_revision())]
2500
2580
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2501
2581
                raise errors.BzrCheckError(
2502
2582
                    "Mismatched basis inventory content.")
2515
2595
        """
2516
2596
        return
2517
2597
 
2518
 
    @needs_read_lock
2519
2598
    def _get_rules_searcher(self, default_searcher):
2520
2599
        """See Tree._get_rules_searcher."""
2521
2600
        if self._rules_searcher is None:
2548
2627
        if self._inventory is None:
2549
2628
            self.read_working_inventory()
2550
2629
 
 
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
 
2551
2634
    def lock_tree_write(self):
2552
2635
        """See WorkingTree.lock_tree_write().
2553
2636
 
2599
2682
 
2600
2683
    def _change_last_revision(self, revision_id):
2601
2684
        """See WorkingTree._change_last_revision."""
2602
 
        if revision_id is None or revision_id == NULL_REVISION:
 
2685
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2603
2686
            try:
2604
2687
                self._transport.delete('last-revision')
2605
2688
            except errors.NoSuchFile:
2607
2690
            return False
2608
2691
        else:
2609
2692
            self._transport.put_bytes('last-revision', revision_id,
2610
 
                mode=self._control_files._file_mode)
 
2693
                mode=self.bzrdir._get_file_mode())
2611
2694
            return True
2612
2695
 
 
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
 
2613
2700
    @needs_tree_write_lock
2614
2701
    def set_conflicts(self, conflicts):
2615
2702
        self._put_rio('conflicts', conflicts.to_stanzas(),
2692
2779
        """Return the format for the working tree object in a_bzrdir."""
2693
2780
        try:
2694
2781
            transport = a_bzrdir.get_workingtree_transport(None)
2695
 
            format_string = transport.get("format").read()
 
2782
            format_string = transport.get_bytes("format")
2696
2783
            return klass._formats[format_string]
2697
2784
        except errors.NoSuchFile:
2698
2785
            raise errors.NoWorkingTree(base=transport.base)
2769
2856
        no working tree.  (See bug #43064).
2770
2857
        """
2771
2858
        sio = StringIO()
2772
 
        inv = Inventory()
 
2859
        inv = inventory.Inventory()
2773
2860
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2774
2861
        sio.seek(0)
2775
2862
        transport.put_file('inventory', sio, file_mode)
2791
2878
            branch.generate_revision_history(revision_id)
2792
2879
        finally:
2793
2880
            branch.unlock()
2794
 
        inv = Inventory()
 
2881
        inv = inventory.Inventory()
2795
2882
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2796
2883
                         branch,
2797
2884
                         inv,
2888
2975
        control_files.create_lock()
2889
2976
        control_files.lock_write()
2890
2977
        transport.put_bytes('format', self.get_format_string(),
2891
 
            mode=control_files._file_mode)
 
2978
            mode=a_bzrdir._get_file_mode())
2892
2979
        if from_branch is not None:
2893
2980
            branch = from_branch
2894
2981
        else:
2914
3001
            # only set an explicit root id if there is one to set.
2915
3002
            if basis_tree.inventory.root is not None:
2916
3003
                wt.set_root_id(basis_tree.get_root_id())
2917
 
            if revision_id == NULL_REVISION:
 
3004
            if revision_id == _mod_revision.NULL_REVISION:
2918
3005
                wt.set_parent_trees([])
2919
3006
            else:
2920
3007
                wt.set_parent_trees([(revision_id, basis_tree)])
2927
3014
        return wt
2928
3015
 
2929
3016
    def _initial_inventory(self):
2930
 
        return Inventory()
 
3017
        return inventory.Inventory()
2931
3018
 
2932
3019
    def __init__(self):
2933
3020
        super(WorkingTreeFormat3, self).__init__()
2962
3049
        return self.get_format_string()
2963
3050
 
2964
3051
 
2965
 
__default_format = WorkingTreeFormat4()
 
3052
__default_format = WorkingTreeFormat6()
2966
3053
WorkingTreeFormat.register_format(__default_format)
2967
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
 
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
2968
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
2969
3057
WorkingTreeFormat.set_default_format(__default_format)
2970
3058
# formats which have no format string are not discoverable