/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: Sabin Iacob
  • Date: 2009-03-23 14:59:43 UTC
  • mto: (4189.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4193.
  • Revision ID: iacobs@m0n5t3r.info-20090323145943-3s3p1px5q1rkh2e5
update FSF mailing address

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
42
48
import itertools
43
49
import operator
44
50
import stat
 
51
from time import time
 
52
import warnings
45
53
import re
46
54
 
47
55
import bzrlib
49
57
    branch,
50
58
    bzrdir,
51
59
    conflicts as _mod_conflicts,
 
60
    dirstate,
52
61
    errors,
53
62
    generate_ids,
54
63
    globbing,
55
 
    graph as _mod_graph,
56
64
    hashcache,
57
65
    ignores,
58
 
    inventory,
59
66
    merge,
60
67
    revision as _mod_revision,
61
68
    revisiontree,
 
69
    repository,
 
70
    textui,
62
71
    trace,
63
72
    transform,
64
73
    ui,
 
74
    urlutils,
65
75
    views,
66
76
    xml5,
 
77
    xml6,
67
78
    xml7,
68
79
    )
69
80
import bzrlib.branch
70
81
from bzrlib.transport import get_transport
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
80
 
from bzrlib.lock import LogicalLockResult
 
88
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
81
89
from bzrlib.lockable_files import LockableFiles
82
90
from bzrlib.lockdir import LockDir
83
91
import bzrlib.mutabletree
84
92
from bzrlib.mutabletree import needs_tree_write_lock
85
93
from bzrlib import osutils
86
94
from bzrlib.osutils import (
 
95
    compact_date,
87
96
    file_kind,
88
97
    isdir,
89
98
    normpath,
90
99
    pathjoin,
 
100
    rand_chars,
91
101
    realpath,
92
102
    safe_unicode,
93
103
    splitpath,
96
106
from bzrlib.filters import filtered_input_file
97
107
from bzrlib.trace import mutter, note
98
108
from bzrlib.transport.local import LocalTransport
99
 
from bzrlib.revision import CURRENT_REVISION
 
109
from bzrlib.progress import DummyProgress, ProgressPhase
 
110
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
100
111
from bzrlib.rio import RioReader, rio_file, Stanza
101
 
from bzrlib.symbol_versioning import (
102
 
    deprecated_passed,
103
 
    DEPRECATED_PARAMETER,
104
 
    )
 
112
from bzrlib.symbol_versioning import (deprecated_passed,
 
113
        deprecated_method,
 
114
        deprecated_function,
 
115
        DEPRECATED_PARAMETER,
 
116
        )
105
117
 
106
118
 
107
119
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
 
# TODO: Modifying the conflict objects or their type is currently nearly
109
 
# impossible as there is no clear relationship between the working tree format
110
 
# and the conflict list file format.
111
120
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
121
 
113
122
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
177
        return ''
169
178
 
170
179
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
180
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
181
    """Working copy tree.
174
182
 
175
183
    The inventory is held in the `Branch` working-inventory, and the
248
256
        self._rules_searcher = None
249
257
        self.views = self._make_views()
250
258
 
251
 
    @property
252
 
    def user_transport(self):
253
 
        return self.bzrdir.user_transport
254
 
 
255
 
    @property
256
 
    def control_transport(self):
257
 
        return self._transport
258
 
 
259
259
    def _detect_case_handling(self):
260
260
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
261
        try:
286
286
        self._control_files.break_lock()
287
287
        self.branch.break_lock()
288
288
 
289
 
    def _get_check_refs(self):
290
 
        """Return the references needed to perform a check of this tree.
291
 
        
292
 
        The default implementation returns no refs, and is only suitable for
293
 
        trees that have no local caching and can commit on ghosts at any time.
294
 
 
295
 
        :seealso: bzrlib.check for details about check_refs.
296
 
        """
297
 
        return []
298
 
 
299
289
    def requires_rich_root(self):
300
290
        return self._format.requires_rich_root
301
291
 
425
415
            return self.branch.repository.revision_tree(revision_id)
426
416
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
427
417
            # the basis tree *may* be a ghost or a low level error may have
428
 
            # occurred. If the revision is present, its a problem, if its not
 
418
            # occured. If the revision is present, its a problem, if its not
429
419
            # its a ghost.
430
420
            if self.branch.repository.has_revision(revision_id):
431
421
                raise
452
442
 
453
443
    def get_file_with_stat(self, file_id, path=None, filtered=True,
454
444
        _fstat=os.fstat):
455
 
        """See Tree.get_file_with_stat."""
 
445
        """See MutableTree.get_file_with_stat."""
456
446
        if path is None:
457
447
            path = self.id2path(file_id)
458
448
        file_obj = self.get_file_byname(path, filtered=False)
459
449
        stat_value = _fstat(file_obj.fileno())
460
 
        if filtered and self.supports_content_filtering():
 
450
        if self.supports_content_filtering() and filtered:
461
451
            filters = self._content_filter_stack(path)
462
452
            file_obj = filtered_input_file(file_obj, filters)
463
453
        return (file_obj, stat_value)
468
458
    def get_file_byname(self, filename, filtered=True):
469
459
        path = self.abspath(filename)
470
460
        f = file(path, 'rb')
471
 
        if filtered and self.supports_content_filtering():
 
461
        if self.supports_content_filtering() and filtered:
472
462
            filters = self._content_filter_stack(filename)
473
463
            return filtered_input_file(f, filters)
474
464
        else:
493
483
        incorrectly attributed to CURRENT_REVISION (but after committing, the
494
484
        attribution will be correct).
495
485
        """
496
 
        maybe_file_parent_keys = []
497
 
        for parent_id in self.get_parent_ids():
498
 
            try:
499
 
                parent_tree = self.revision_tree(parent_id)
500
 
            except errors.NoSuchRevisionInTree:
501
 
                parent_tree = self.branch.repository.revision_tree(parent_id)
502
 
            parent_tree.lock_read()
503
 
            try:
504
 
                if file_id not in parent_tree:
505
 
                    continue
506
 
                ie = parent_tree.inventory[file_id]
507
 
                if ie.kind != 'file':
508
 
                    # Note: this is slightly unnecessary, because symlinks and
509
 
                    # directories have a "text" which is the empty text, and we
510
 
                    # know that won't mess up annotations. But it seems cleaner
511
 
                    continue
512
 
                parent_text_key = (file_id, ie.revision)
513
 
                if parent_text_key not in maybe_file_parent_keys:
514
 
                    maybe_file_parent_keys.append(parent_text_key)
515
 
            finally:
516
 
                parent_tree.unlock()
517
 
        graph = _mod_graph.Graph(self.branch.repository.texts)
518
 
        heads = graph.heads(maybe_file_parent_keys)
519
 
        file_parent_keys = []
520
 
        for key in maybe_file_parent_keys:
521
 
            if key in heads:
522
 
                file_parent_keys.append(key)
523
 
 
524
 
        # Now we have the parents of this content
525
 
        annotator = self.branch.repository.texts.get_annotator()
526
 
        text = self.get_file(file_id).read()
527
 
        this_key =(file_id, default_revision)
528
 
        annotator.add_special_text(this_key, file_parent_keys, text)
529
 
        annotations = [(key[-1], line)
530
 
                       for key, line in annotator.annotate_flat(this_key)]
531
 
        return annotations
 
486
        basis = self.basis_tree()
 
487
        basis.lock_read()
 
488
        try:
 
489
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
490
                require_versioned=True).next()
 
491
            changed_content, kind = changes[2], changes[6]
 
492
            if not changed_content:
 
493
                return basis.annotate_iter(file_id)
 
494
            if kind[1] is None:
 
495
                return None
 
496
            import annotate
 
497
            if kind[0] != 'file':
 
498
                old_lines = []
 
499
            else:
 
500
                old_lines = list(basis.annotate_iter(file_id))
 
501
            old = [old_lines]
 
502
            for tree in self.branch.repository.revision_trees(
 
503
                self.get_parent_ids()[1:]):
 
504
                if file_id not in tree:
 
505
                    continue
 
506
                old.append(list(tree.annotate_iter(file_id)))
 
507
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
508
                                       default_revision)
 
509
        finally:
 
510
            basis.unlock()
532
511
 
533
512
    def _get_ancestors(self, default_revision):
534
513
        ancestors = set([default_revision])
549
528
        else:
550
529
            parents = [last_rev]
551
530
        try:
552
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
531
            merges_file = self._transport.get('pending-merges')
553
532
        except errors.NoSuchFile:
554
533
            pass
555
534
        else:
556
 
            for l in osutils.split_lines(merges_bytes):
 
535
            for l in merges_file.readlines():
557
536
                revision_id = l.rstrip('\n')
558
537
                parents.append(revision_id)
559
538
        return parents
578
557
 
579
558
        revision
580
559
            If not None, the cloned tree will have its last revision set to
581
 
            revision, and difference between the source trees last revision
 
560
            revision, and and difference between the source trees last revision
582
561
            and this one merged in.
583
562
        """
584
563
        # assumes the target bzr dir format is compatible.
618
597
 
619
598
    def get_file_size(self, file_id):
620
599
        """See Tree.get_file_size"""
621
 
        # XXX: this returns the on-disk size; it should probably return the
622
 
        # canonical size
623
600
        try:
624
601
            return os.path.getsize(self.id2abspath(file_id))
625
602
        except OSError, e:
641
618
 
642
619
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
620
        file_id = self.path2id(path)
644
 
        if file_id is None:
645
 
            # For unversioned files on win32, we just assume they are not
646
 
            # executable
647
 
            return False
648
621
        return self._inventory[file_id].executable
649
622
 
650
623
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
760
733
            raise
761
734
        kind = _mapper(stat_result.st_mode)
762
735
        if kind == 'file':
763
 
            return self._file_content_summary(path, stat_result)
 
736
            size = stat_result.st_size
 
737
            # try for a stat cache lookup
 
738
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
739
            return (kind, size, executable, self._sha_from_stat(
 
740
                path, stat_result))
764
741
        elif kind == 'directory':
765
742
            # perhaps it looks like a plain directory, but it's really a
766
743
            # reference.
768
745
                kind = 'tree-reference'
769
746
            return kind, None, None, None
770
747
        elif kind == 'symlink':
771
 
            target = osutils.readlink(abspath)
772
 
            return ('symlink', None, None, target)
 
748
            return ('symlink', None, None,
 
749
                    os.readlink(abspath.encode(osutils._fs_enc)
 
750
                                ).decode(osutils._fs_enc))
773
751
        else:
774
752
            return (kind, None, None, None)
775
753
 
776
 
    def _file_content_summary(self, path, stat_result):
777
 
        size = stat_result.st_size
778
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
779
 
        # try for a stat cache lookup
780
 
        return ('file', size, executable, self._sha_from_stat(
781
 
            path, stat_result))
782
 
 
783
754
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
755
        """Common ghost checking functionality from set_parent_*.
785
756
 
795
766
    def _set_merges_from_parent_ids(self, parent_ids):
796
767
        merges = parent_ids[1:]
797
768
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
798
 
            mode=self.bzrdir._get_file_mode())
 
769
            mode=self._control_files._file_mode)
799
770
 
800
771
    def _filter_parent_ids_by_ancestry(self, revision_ids):
801
772
        """Check that all merged revisions are proper 'heads'.
901
872
        self._must_be_locked()
902
873
        my_file = rio_file(stanzas, header)
903
874
        self._transport.put_file(filename, my_file,
904
 
            mode=self.bzrdir._get_file_mode())
 
875
            mode=self._control_files._file_mode)
905
876
 
906
877
    @needs_write_lock # because merge pulls data into the branch.
907
878
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
 
                          merge_type=None, force=False):
 
879
        merge_type=None):
909
880
        """Merge from a branch into this working tree.
910
881
 
911
882
        :param branch: The branch to merge from.
915
886
            branch.last_revision().
916
887
        """
917
888
        from bzrlib.merge import Merger, Merge3Merger
918
 
        merger = Merger(self.branch, this_tree=self)
919
 
        # check that there are no local alterations
920
 
        if not force and self.has_changes():
921
 
            raise errors.UncommittedChanges(self)
922
 
        if to_revision is None:
923
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
924
 
        merger.other_rev_id = to_revision
925
 
        if _mod_revision.is_null(merger.other_rev_id):
926
 
            raise errors.NoCommits(branch)
927
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
928
 
        merger.other_basis = merger.other_rev_id
929
 
        merger.other_tree = self.branch.repository.revision_tree(
930
 
            merger.other_rev_id)
931
 
        merger.other_branch = branch
932
 
        if from_revision is None:
933
 
            merger.find_base()
934
 
        else:
935
 
            merger.set_base_revision(from_revision, branch)
936
 
        if merger.base_rev_id == merger.other_rev_id:
937
 
            raise errors.PointlessMerge
938
 
        merger.backup_files = False
939
 
        if merge_type is None:
940
 
            merger.merge_type = Merge3Merger
941
 
        else:
942
 
            merger.merge_type = merge_type
943
 
        merger.set_interesting_files(None)
944
 
        merger.show_base = False
945
 
        merger.reprocess = False
946
 
        conflicts = merger.do_merge()
947
 
        merger.set_pending()
 
889
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
890
        try:
 
891
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
892
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
893
            merger.pp.next_phase()
 
894
            # check that there are no
 
895
            # local alterations
 
896
            merger.check_basis(check_clean=True, require_commits=False)
 
897
            if to_revision is None:
 
898
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
899
            merger.other_rev_id = to_revision
 
900
            if _mod_revision.is_null(merger.other_rev_id):
 
901
                raise errors.NoCommits(branch)
 
902
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
903
            merger.other_basis = merger.other_rev_id
 
904
            merger.other_tree = self.branch.repository.revision_tree(
 
905
                merger.other_rev_id)
 
906
            merger.other_branch = branch
 
907
            merger.pp.next_phase()
 
908
            if from_revision is None:
 
909
                merger.find_base()
 
910
            else:
 
911
                merger.set_base_revision(from_revision, branch)
 
912
            if merger.base_rev_id == merger.other_rev_id:
 
913
                raise errors.PointlessMerge
 
914
            merger.backup_files = False
 
915
            if merge_type is None:
 
916
                merger.merge_type = Merge3Merger
 
917
            else:
 
918
                merger.merge_type = merge_type
 
919
            merger.set_interesting_files(None)
 
920
            merger.show_base = False
 
921
            merger.reprocess = False
 
922
            conflicts = merger.do_merge()
 
923
            merger.set_pending()
 
924
        finally:
 
925
            pb.finished()
948
926
        return conflicts
949
927
 
950
928
    @needs_read_lock
991
969
        return file_id
992
970
 
993
971
    def get_symlink_target(self, file_id):
994
 
        abspath = self.id2abspath(file_id)
995
 
        target = osutils.readlink(abspath)
996
 
        return target
 
972
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc))
997
973
 
998
974
    @needs_write_lock
999
975
    def subsume(self, other_tree):
1097
1073
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1074
        if tree_transport.base != branch_transport.base:
1099
1075
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1076
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1077
        else:
1103
1078
            tree_bzrdir = branch_bzrdir
1104
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1079
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1105
1080
        wt.set_parent_ids(self.get_parent_ids())
1106
1081
        my_inv = self.inventory
1107
 
        child_inv = inventory.Inventory(root_id=None)
 
1082
        child_inv = Inventory(root_id=None)
1108
1083
        new_root = my_inv[file_id]
1109
1084
        my_inv.remove_recursive_id(file_id)
1110
1085
        new_root.parent_id = None
1129
1104
        self._serialize(self._inventory, sio)
1130
1105
        sio.seek(0)
1131
1106
        self._transport.put_file('inventory', sio,
1132
 
            mode=self.bzrdir._get_file_mode())
 
1107
            mode=self._control_files._file_mode)
1133
1108
        self._inventory_is_modified = False
1134
1109
 
1135
1110
    def _kind(self, relpath):
1136
1111
        return osutils.file_kind(self.abspath(relpath))
1137
1112
 
1138
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1139
 
        """List all files as (path, class, kind, id, entry).
 
1113
    def list_files(self, include_root=False):
 
1114
        """Recursively list all files as (path, class, kind, id, entry).
1140
1115
 
1141
1116
        Lists, but does not descend into unversioned directories.
 
1117
 
1142
1118
        This does not include files that have been deleted in this
1143
 
        tree. Skips the control directory.
 
1119
        tree.
1144
1120
 
1145
 
        :param include_root: if True, return an entry for the root
1146
 
        :param from_dir: start from this directory or None for the root
1147
 
        :param recursive: whether to recurse into subdirectories or not
 
1121
        Skips the control directory.
1148
1122
        """
1149
1123
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1150
1124
        # with it. So callers should be careful to always read_lock the tree.
1152
1126
            raise errors.ObjectNotLocked(self)
1153
1127
 
1154
1128
        inv = self.inventory
1155
 
        if from_dir is None and include_root is True:
 
1129
        if include_root is True:
1156
1130
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1157
1131
        # Convert these into local objects to save lookup times
1158
1132
        pathjoin = osutils.pathjoin
1165
1139
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1166
1140
 
1167
1141
        # directory file_id, relative path, absolute path, reverse sorted children
1168
 
        if from_dir is not None:
1169
 
            from_dir_id = inv.path2id(from_dir)
1170
 
            if from_dir_id is None:
1171
 
                # Directory not versioned
1172
 
                return
1173
 
            from_dir_abspath = pathjoin(self.basedir, from_dir)
1174
 
        else:
1175
 
            from_dir_id = inv.root.file_id
1176
 
            from_dir_abspath = self.basedir
1177
 
        children = os.listdir(from_dir_abspath)
 
1142
        children = os.listdir(self.basedir)
1178
1143
        children.sort()
1179
1144
        # jam 20060527 The kernel sized tree seems equivalent whether we
1180
1145
        # use a deque and popleft to keep them sorted, or if we use a plain
1181
1146
        # list and just reverse() them.
1182
1147
        children = collections.deque(children)
1183
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1148
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1184
1149
        while stack:
1185
1150
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1186
1151
 
1244
1209
                if fk != 'directory':
1245
1210
                    continue
1246
1211
 
1247
 
                # But do this child first if recursing down
1248
 
                if recursive:
1249
 
                    new_children = os.listdir(fap)
1250
 
                    new_children.sort()
1251
 
                    new_children = collections.deque(new_children)
1252
 
                    stack.append((f_ie.file_id, fp, fap, new_children))
1253
 
                    # Break out of inner loop,
1254
 
                    # so that we start outer loop with child
1255
 
                    break
 
1212
                # But do this child first
 
1213
                new_children = os.listdir(fap)
 
1214
                new_children.sort()
 
1215
                new_children = collections.deque(new_children)
 
1216
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1217
                # Break out of inner loop,
 
1218
                # so that we start outer loop with child
 
1219
                break
1256
1220
            else:
1257
1221
                # if we finished all children, pop it off the stack
1258
1222
                stack.pop()
1436
1400
        inv = self.inventory
1437
1401
        for entry in moved:
1438
1402
            try:
1439
 
                self._move_entry(WorkingTree._RenameEntry(
1440
 
                    entry.to_rel, entry.from_id,
 
1403
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1441
1404
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1442
1405
                    entry.from_tail, entry.from_parent_id,
1443
1406
                    entry.only_change_inv))
1494
1457
        from_tail = splitpath(from_rel)[-1]
1495
1458
        from_id = inv.path2id(from_rel)
1496
1459
        if from_id is None:
1497
 
            # if file is missing in the inventory maybe it's in the basis_tree
1498
 
            basis_tree = self.branch.basis_tree()
1499
 
            from_id = basis_tree.path2id(from_rel)
1500
 
            if from_id is None:
1501
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1502
 
                    errors.NotVersionedError(path=str(from_rel)))
1503
 
            # put entry back in the inventory so we can rename it
1504
 
            from_entry = basis_tree.inventory[from_id].copy()
1505
 
            inv.add(from_entry)
1506
 
        else:
1507
 
            from_entry = inv[from_id]
 
1460
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1461
                errors.NotVersionedError(path=str(from_rel)))
 
1462
        from_entry = inv[from_id]
1508
1463
        from_parent_id = from_entry.parent_id
1509
1464
        to_dir, to_tail = os.path.split(to_rel)
1510
1465
        to_dir_id = inv.path2id(to_dir)
1572
1527
        :raises: NoSuchId if any fileid is not currently versioned.
1573
1528
        """
1574
1529
        for file_id in file_ids:
1575
 
            if file_id not in self._inventory:
1576
 
                raise errors.NoSuchId(self, file_id)
1577
 
        for file_id in file_ids:
1578
1530
            if self._inventory.has_id(file_id):
1579
1531
                self._inventory.remove_recursive_id(file_id)
 
1532
            else:
 
1533
                raise errors.NoSuchId(self, file_id)
1580
1534
        if len(file_ids):
1581
1535
            # in the future this should just set a dirty bit to wait for the
1582
1536
            # final unlock. However, until all methods of workingtree start
1601
1555
 
1602
1556
    @needs_write_lock
1603
1557
    def pull(self, source, overwrite=False, stop_revision=None,
1604
 
             change_reporter=None, possible_transports=None, local=False):
 
1558
             change_reporter=None, possible_transports=None):
 
1559
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1605
1560
        source.lock_read()
1606
1561
        try:
 
1562
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1563
            pp.next_phase()
1607
1564
            old_revision_info = self.branch.last_revision_info()
1608
1565
            basis_tree = self.basis_tree()
1609
1566
            count = self.branch.pull(source, overwrite, stop_revision,
1610
 
                                     possible_transports=possible_transports,
1611
 
                                     local=local)
 
1567
                                     possible_transports=possible_transports)
1612
1568
            new_revision_info = self.branch.last_revision_info()
1613
1569
            if new_revision_info != old_revision_info:
 
1570
                pp.next_phase()
1614
1571
                repository = self.branch.repository
 
1572
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1615
1573
                basis_tree.lock_read()
1616
1574
                try:
1617
1575
                    new_basis_tree = self.branch.basis_tree()
1620
1578
                                new_basis_tree,
1621
1579
                                basis_tree,
1622
1580
                                this_tree=self,
1623
 
                                pb=None,
 
1581
                                pb=pb,
1624
1582
                                change_reporter=change_reporter)
1625
 
                    basis_root_id = basis_tree.get_root_id()
1626
 
                    new_root_id = new_basis_tree.get_root_id()
1627
 
                    if basis_root_id != new_root_id:
1628
 
                        self.set_root_id(new_root_id)
 
1583
                    if (basis_tree.inventory.root is None and
 
1584
                        new_basis_tree.inventory.root is not None):
 
1585
                        self.set_root_id(new_basis_tree.get_root_id())
1629
1586
                finally:
 
1587
                    pb.finished()
1630
1588
                    basis_tree.unlock()
1631
1589
                # TODO - dedup parents list with things merged by pull ?
1632
1590
                # reuse the revisiontree we merged against to set the new
1645
1603
            return count
1646
1604
        finally:
1647
1605
            source.unlock()
 
1606
            top_pb.finished()
1648
1607
 
1649
1608
    @needs_write_lock
1650
1609
    def put_file_bytes_non_atomic(self, file_id, bytes):
1676
1635
 
1677
1636
            fl = []
1678
1637
            for subf in os.listdir(dirabs):
1679
 
                if self.bzrdir.is_control_filename(subf):
 
1638
                if subf == '.bzr':
1680
1639
                    continue
1681
1640
                if subf not in dir_entry.children:
1682
1641
                    try:
1735
1694
        r"""Check whether the filename matches an ignore pattern.
1736
1695
 
1737
1696
        Patterns containing '/' or '\' need to match the whole path;
1738
 
        others match against only the last component.  Patterns starting
1739
 
        with '!' are ignore exceptions.  Exceptions take precedence
1740
 
        over regular patterns and cause the filename to not be ignored.
 
1697
        others match against only the last component.
1741
1698
 
1742
1699
        If the file is ignored, returns the pattern which caused it to
1743
1700
        be ignored, otherwise None.  So this can simply be used as a
1744
1701
        boolean if desired."""
1745
1702
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1703
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1704
        return self._ignoreglobster.match(filename)
1748
1705
 
1749
1706
    def kind(self, file_id):
1799
1756
            raise errors.ObjectNotLocked(self)
1800
1757
 
1801
1758
    def lock_read(self):
1802
 
        """Lock the tree for reading.
1803
 
 
1804
 
        This also locks the branch, and can be unlocked via self.unlock().
1805
 
 
1806
 
        :return: A bzrlib.lock.LogicalLockResult.
1807
 
        """
 
1759
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1760
        if not self.is_locked():
1809
1761
            self._reset_data()
1810
1762
        self.branch.lock_read()
1811
1763
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1764
            return self._control_files.lock_read()
1814
1765
        except:
1815
1766
            self.branch.unlock()
1816
1767
            raise
1817
1768
 
1818
1769
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1770
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1771
        if not self.is_locked():
1824
1772
            self._reset_data()
1825
1773
        self.branch.lock_read()
1826
1774
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1775
            return self._control_files.lock_write()
1829
1776
        except:
1830
1777
            self.branch.unlock()
1831
1778
            raise
1832
1779
 
1833
1780
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1781
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1782
        if not self.is_locked():
1839
1783
            self._reset_data()
1840
1784
        self.branch.lock_write()
1841
1785
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1786
            return self._control_files.lock_write()
1844
1787
        except:
1845
1788
            self.branch.unlock()
1846
1789
            raise
1854
1797
    def _reset_data(self):
1855
1798
        """Reset transient data that cannot be revalidated."""
1856
1799
        self._inventory_is_modified = False
1857
 
        f = self._transport.get('inventory')
1858
 
        try:
1859
 
            result = self._deserialize(f)
1860
 
        finally:
1861
 
            f.close()
 
1800
        result = self._deserialize(self._transport.get('inventory'))
1862
1801
        self._set_inventory(result, dirty=False)
1863
1802
 
1864
1803
    @needs_tree_write_lock
1888
1827
        path = self._basis_inventory_name()
1889
1828
        sio = StringIO(xml)
1890
1829
        self._transport.put_file(path, sio,
1891
 
            mode=self.bzrdir._get_file_mode())
 
1830
            mode=self._control_files._file_mode)
1892
1831
 
1893
1832
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1894
1833
        """Create the text that will be saved in basis-inventory"""
1911
1850
            # revision_id is set. We must check for this full string, because a
1912
1851
            # root node id can legitimately look like 'revision_id' but cannot
1913
1852
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1853
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1854
            firstline = xml.split('\n', 1)[0]
1916
1855
            if (not 'revision_id="' in firstline or
1917
1856
                'format="7"' not in firstline):
1918
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1919
 
                    xml, new_revision)
 
1857
                inv = self.branch.repository.deserialise_inventory(
 
1858
                    new_revision, xml)
1920
1859
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1921
1860
            self._write_basis_inventory(xml)
1922
1861
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1940
1879
        # binary.
1941
1880
        if self._inventory_is_modified:
1942
1881
            raise errors.InventoryModified(self)
1943
 
        f = self._transport.get('inventory')
1944
 
        try:
1945
 
            result = self._deserialize(f)
1946
 
        finally:
1947
 
            f.close()
 
1882
        result = self._deserialize(self._transport.get('inventory'))
1948
1883
        self._set_inventory(result, dirty=False)
1949
1884
        return result
1950
1885
 
1965
1900
 
1966
1901
        new_files=set()
1967
1902
        unknown_nested_files=set()
1968
 
        if to_file is None:
1969
 
            to_file = sys.stdout
1970
1903
 
1971
1904
        def recurse_directory_to_add_files(directory):
1972
1905
            # Recurse directory and add all files
2028
1961
                        tree_delta.unversioned.extend((unknown_file,))
2029
1962
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2030
1963
 
2031
 
        # Build inv_delta and delete files where applicable,
 
1964
        # Build inv_delta and delete files where applicaple,
2032
1965
        # do this before any modifications to inventory.
2033
1966
        for f in files:
2034
1967
            fid = self.path2id(f)
2042
1975
                        new_status = 'I'
2043
1976
                    else:
2044
1977
                        new_status = '?'
2045
 
                    # XXX: Really should be a more abstract reporter interface
2046
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2047
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1978
                    textui.show_status(new_status, self.kind(fid), f,
 
1979
                                       to_file=to_file)
2048
1980
                # Unversion file
2049
1981
                inv_delta.append((f, None, fid, None))
2050
1982
                message = "removed %s" % (f,)
2073
2005
 
2074
2006
    @needs_tree_write_lock
2075
2007
    def revert(self, filenames=None, old_tree=None, backups=True,
2076
 
               pb=None, report_changes=False):
 
2008
               pb=DummyProgress(), report_changes=False):
2077
2009
        from bzrlib.conflicts import resolve
2078
2010
        if filenames == []:
2079
2011
            filenames = None
2092
2024
            if filenames is None and len(self.get_parent_ids()) > 1:
2093
2025
                parent_trees = []
2094
2026
                last_revision = self.last_revision()
2095
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2027
                if last_revision != NULL_REVISION:
2096
2028
                    if basis_tree is None:
2097
2029
                        basis_tree = self.basis_tree()
2098
2030
                        basis_tree.lock_read()
2136
2068
    def set_inventory(self, new_inventory_list):
2137
2069
        from bzrlib.inventory import (Inventory,
2138
2070
                                      InventoryDirectory,
 
2071
                                      InventoryEntry,
2139
2072
                                      InventoryFile,
2140
2073
                                      InventoryLink)
2141
2074
        inv = Inventory(self.get_root_id())
2201
2134
        """
2202
2135
        raise NotImplementedError(self.unlock)
2203
2136
 
2204
 
    _marker = object()
2205
 
 
2206
 
    def update(self, change_reporter=None, possible_transports=None,
2207
 
               revision=None, old_tip=_marker):
 
2137
    def update(self, change_reporter=None, possible_transports=None):
2208
2138
        """Update a working tree along its branch.
2209
2139
 
2210
2140
        This will update the branch if its bound too, which means we have
2228
2158
        - Merge current state -> basis tree of the master w.r.t. the old tree
2229
2159
          basis.
2230
2160
        - Do a 'normal' merge of the old branch basis if it is relevant.
2231
 
 
2232
 
        :param revision: The target revision to update to. Must be in the
2233
 
            revision history.
2234
 
        :param old_tip: If branch.update() has already been run, the value it
2235
 
            returned (old tip of the branch or None). _marker is used
2236
 
            otherwise.
2237
2161
        """
2238
2162
        if self.branch.get_bound_location() is not None:
2239
2163
            self.lock_write()
2240
 
            update_branch = (old_tip is self._marker)
 
2164
            update_branch = True
2241
2165
        else:
2242
2166
            self.lock_tree_write()
2243
2167
            update_branch = False
2245
2169
            if update_branch:
2246
2170
                old_tip = self.branch.update(possible_transports)
2247
2171
            else:
2248
 
                if old_tip is self._marker:
2249
 
                    old_tip = None
2250
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2172
                old_tip = None
 
2173
            return self._update_tree(old_tip, change_reporter)
2251
2174
        finally:
2252
2175
            self.unlock()
2253
2176
 
2254
2177
    @needs_tree_write_lock
2255
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2178
    def _update_tree(self, old_tip=None, change_reporter=None):
2256
2179
        """Update a tree to the master branch.
2257
2180
 
2258
2181
        :param old_tip: if supplied, the previous tip revision the branch,
2268
2191
        # We MUST save it even if an error occurs, because otherwise the users
2269
2192
        # local work is unreferenced and will appear to have been lost.
2270
2193
        #
2271
 
        nb_conflicts = 0
 
2194
        result = 0
2272
2195
        try:
2273
2196
            last_rev = self.get_parent_ids()[0]
2274
2197
        except IndexError:
2275
2198
            last_rev = _mod_revision.NULL_REVISION
2276
 
        if revision is None:
2277
 
            revision = self.branch.last_revision()
2278
 
 
2279
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2280
 
 
2281
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2282
 
            # the branch we are bound to was updated
2283
 
            # merge those changes in first
2284
 
            base_tree  = self.basis_tree()
2285
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2286
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2287
 
                                             base_tree, this_tree=self,
2288
 
                                             change_reporter=change_reporter)
2289
 
            if nb_conflicts:
2290
 
                self.add_parent_tree((old_tip, other_tree))
2291
 
                trace.note('Rerun update after fixing the conflicts.')
2292
 
                return nb_conflicts
2293
 
 
2294
 
        if last_rev != _mod_revision.ensure_null(revision):
2295
 
            # the working tree is up to date with the branch
2296
 
            # we can merge the specified revision from master
2297
 
            to_tree = self.branch.repository.revision_tree(revision)
2298
 
            to_root_id = to_tree.get_root_id()
2299
 
 
 
2199
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2200
            # merge tree state up to new branch tip.
2300
2201
            basis = self.basis_tree()
2301
2202
            basis.lock_read()
2302
2203
            try:
2303
 
                if (basis.inventory.root is None
2304
 
                    or basis.inventory.root.file_id != to_root_id):
2305
 
                    self.set_root_id(to_root_id)
 
2204
                to_tree = self.branch.basis_tree()
 
2205
                if basis.inventory.root is None:
 
2206
                    self.set_root_id(to_tree.get_root_id())
2306
2207
                    self.flush()
 
2208
                result += merge.merge_inner(
 
2209
                                      self.branch,
 
2210
                                      to_tree,
 
2211
                                      basis,
 
2212
                                      this_tree=self,
 
2213
                                      change_reporter=change_reporter)
2307
2214
            finally:
2308
2215
                basis.unlock()
2309
 
 
2310
 
            # determine the branch point
2311
 
            graph = self.branch.repository.get_graph()
2312
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2313
 
                                                last_rev)
2314
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2315
 
 
2316
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2317
 
                                             this_tree=self,
2318
 
                                             change_reporter=change_reporter)
2319
 
            self.set_last_revision(revision)
2320
2216
            # TODO - dedup parents list with things merged by pull ?
2321
2217
            # reuse the tree we've updated to to set the basis:
2322
 
            parent_trees = [(revision, to_tree)]
 
2218
            parent_trees = [(self.branch.last_revision(), to_tree)]
2323
2219
            merges = self.get_parent_ids()[1:]
2324
2220
            # Ideally we ask the tree for the trees here, that way the working
2325
 
            # tree can decide whether to give us the entire tree or give us a
 
2221
            # tree can decide whether to give us teh entire tree or give us a
2326
2222
            # lazy initialised tree. dirstate for instance will have the trees
2327
2223
            # in ram already, whereas a last-revision + basis-inventory tree
2328
2224
            # will not, but also does not need them when setting parents.
2329
2225
            for parent in merges:
2330
2226
                parent_trees.append(
2331
2227
                    (parent, self.branch.repository.revision_tree(parent)))
2332
 
            if not _mod_revision.is_null(old_tip):
 
2228
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2333
2229
                parent_trees.append(
2334
2230
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2335
2231
            self.set_parent_trees(parent_trees)
2336
2232
            last_rev = parent_trees[0][0]
2337
 
        return nb_conflicts
 
2233
        else:
 
2234
            # the working tree had the same last-revision as the master
 
2235
            # branch did. We may still have pivot local work from the local
 
2236
            # branch into old_tip:
 
2237
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2238
                self.add_parent_tree_id(old_tip)
 
2239
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2240
            and old_tip != last_rev):
 
2241
            # our last revision was not the prior branch last revision
 
2242
            # and we have converted that last revision to a pending merge.
 
2243
            # base is somewhere between the branch tip now
 
2244
            # and the now pending merge
 
2245
 
 
2246
            # Since we just modified the working tree and inventory, flush out
 
2247
            # the current state, before we modify it again.
 
2248
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2249
            #       requires it only because TreeTransform directly munges the
 
2250
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2251
            #       should be able to remove this extra flush.
 
2252
            self.flush()
 
2253
            graph = self.branch.repository.get_graph()
 
2254
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2255
                                                old_tip)
 
2256
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2257
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2258
            result += merge.merge_inner(
 
2259
                                  self.branch,
 
2260
                                  other_tree,
 
2261
                                  base_tree,
 
2262
                                  this_tree=self,
 
2263
                                  change_reporter=change_reporter)
 
2264
        return result
2338
2265
 
2339
2266
    def _write_hashcache_if_dirty(self):
2340
2267
        """Write out the hashcache if it is dirty."""
2440
2367
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2441
2368
                        ('.bzr', '.bzr'))
2442
2369
                    if (bzrdir_loc < len(cur_disk_dir_content)
2443
 
                        and self.bzrdir.is_control_filename(
2444
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2370
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2445
2371
                        # we dont yield the contents of, or, .bzr itself.
2446
2372
                        del cur_disk_dir_content[bzrdir_loc]
2447
2373
            if inv_finished:
2581
2507
        return un_resolved, resolved
2582
2508
 
2583
2509
    @needs_read_lock
2584
 
    def _check(self, references):
2585
 
        """Check the tree for consistency.
2586
 
 
2587
 
        :param references: A dict with keys matching the items returned by
2588
 
            self._get_check_refs(), and values from looking those keys up in
2589
 
            the repository.
2590
 
        """
 
2510
    def _check(self):
2591
2511
        tree_basis = self.basis_tree()
2592
2512
        tree_basis.lock_read()
2593
2513
        try:
2594
 
            repo_basis = references[('trees', self.last_revision())]
 
2514
            repo_basis = self.branch.repository.revision_tree(
 
2515
                self.last_revision())
2595
2516
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2596
2517
                raise errors.BzrCheckError(
2597
2518
                    "Mismatched basis inventory content.")
2610
2531
        """
2611
2532
        return
2612
2533
 
 
2534
    @needs_read_lock
2613
2535
    def _get_rules_searcher(self, default_searcher):
2614
2536
        """See Tree._get_rules_searcher."""
2615
2537
        if self._rules_searcher is None:
2642
2564
        if self._inventory is None:
2643
2565
            self.read_working_inventory()
2644
2566
 
2645
 
    def _get_check_refs(self):
2646
 
        """Return the references needed to perform a check of this tree."""
2647
 
        return [('trees', self.last_revision())]
2648
 
 
2649
2567
    def lock_tree_write(self):
2650
2568
        """See WorkingTree.lock_tree_write().
2651
2569
 
2652
2570
        In Format2 WorkingTrees we have a single lock for the branch and tree
2653
2571
        so lock_tree_write() degrades to lock_write().
2654
 
 
2655
 
        :return: An object with an unlock method which will release the lock
2656
 
            obtained.
2657
2572
        """
2658
2573
        self.branch.lock_write()
2659
2574
        try:
2660
 
            self._control_files.lock_write()
2661
 
            return self
 
2575
            return self._control_files.lock_write()
2662
2576
        except:
2663
2577
            self.branch.unlock()
2664
2578
            raise
2701
2615
 
2702
2616
    def _change_last_revision(self, revision_id):
2703
2617
        """See WorkingTree._change_last_revision."""
2704
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2618
        if revision_id is None or revision_id == NULL_REVISION:
2705
2619
            try:
2706
2620
                self._transport.delete('last-revision')
2707
2621
            except errors.NoSuchFile:
2709
2623
            return False
2710
2624
        else:
2711
2625
            self._transport.put_bytes('last-revision', revision_id,
2712
 
                mode=self.bzrdir._get_file_mode())
 
2626
                mode=self._control_files._file_mode)
2713
2627
            return True
2714
2628
 
2715
 
    def _get_check_refs(self):
2716
 
        """Return the references needed to perform a check of this tree."""
2717
 
        return [('trees', self.last_revision())]
2718
 
 
2719
2629
    @needs_tree_write_lock
2720
2630
    def set_conflicts(self, conflicts):
2721
2631
        self._put_rio('conflicts', conflicts.to_stanzas(),
2798
2708
        """Return the format for the working tree object in a_bzrdir."""
2799
2709
        try:
2800
2710
            transport = a_bzrdir.get_workingtree_transport(None)
2801
 
            format_string = transport.get_bytes("format")
 
2711
            format_string = transport.get("format").read()
2802
2712
            return klass._formats[format_string]
2803
2713
        except errors.NoSuchFile:
2804
2714
            raise errors.NoWorkingTree(base=transport.base)
2875
2785
        no working tree.  (See bug #43064).
2876
2786
        """
2877
2787
        sio = StringIO()
2878
 
        inv = inventory.Inventory()
 
2788
        inv = Inventory()
2879
2789
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2880
2790
        sio.seek(0)
2881
2791
        transport.put_file('inventory', sio, file_mode)
2897
2807
            branch.generate_revision_history(revision_id)
2898
2808
        finally:
2899
2809
            branch.unlock()
2900
 
        inv = inventory.Inventory()
 
2810
        inv = Inventory()
2901
2811
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2902
2812
                         branch,
2903
2813
                         inv,
2994
2904
        control_files.create_lock()
2995
2905
        control_files.lock_write()
2996
2906
        transport.put_bytes('format', self.get_format_string(),
2997
 
            mode=a_bzrdir._get_file_mode())
 
2907
            mode=control_files._file_mode)
2998
2908
        if from_branch is not None:
2999
2909
            branch = from_branch
3000
2910
        else:
3020
2930
            # only set an explicit root id if there is one to set.
3021
2931
            if basis_tree.inventory.root is not None:
3022
2932
                wt.set_root_id(basis_tree.get_root_id())
3023
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2933
            if revision_id == NULL_REVISION:
3024
2934
                wt.set_parent_trees([])
3025
2935
            else:
3026
2936
                wt.set_parent_trees([(revision_id, basis_tree)])
3033
2943
        return wt
3034
2944
 
3035
2945
    def _initial_inventory(self):
3036
 
        return inventory.Inventory()
 
2946
        return Inventory()
3037
2947
 
3038
2948
    def __init__(self):
3039
2949
        super(WorkingTreeFormat3, self).__init__()
3068
2978
        return self.get_format_string()
3069
2979
 
3070
2980
 
3071
 
__default_format = WorkingTreeFormat6()
 
2981
__default_format = WorkingTreeFormat4()
3072
2982
WorkingTreeFormat.register_format(__default_format)
3073
2983
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3074
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3075
2984
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3076
2985
WorkingTreeFormat.set_default_format(__default_format)
3077
2986
# formats which have no format string are not discoverable