/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

remove all trailing whitespace from bzr source

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""WorkingTree object and friends.
18
18
 
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
42
48
import itertools
43
49
import operator
44
50
import stat
 
51
from time import time
 
52
import warnings
45
53
import re
46
54
 
47
55
import bzrlib
49
57
    branch,
50
58
    bzrdir,
51
59
    conflicts as _mod_conflicts,
 
60
    dirstate,
52
61
    errors,
53
62
    generate_ids,
54
63
    globbing,
55
 
    graph as _mod_graph,
56
64
    hashcache,
57
65
    ignores,
58
 
    inventory,
59
66
    merge,
60
67
    revision as _mod_revision,
61
68
    revisiontree,
 
69
    repository,
 
70
    textui,
62
71
    trace,
63
72
    transform,
64
73
    ui,
65
 
    views,
 
74
    urlutils,
66
75
    xml5,
 
76
    xml6,
67
77
    xml7,
68
78
    )
69
79
import bzrlib.branch
70
80
from bzrlib.transport import get_transport
71
 
from bzrlib.workingtree_4 import (
72
 
    WorkingTreeFormat4,
73
 
    WorkingTreeFormat5,
74
 
    WorkingTreeFormat6,
75
 
    )
 
81
import bzrlib.ui
 
82
from bzrlib.workingtree_4 import WorkingTreeFormat4, WorkingTreeFormat5
76
83
""")
77
84
 
78
85
from bzrlib import symbol_versioning
79
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
87
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
80
88
from bzrlib.lockable_files import LockableFiles
81
89
from bzrlib.lockdir import LockDir
82
90
import bzrlib.mutabletree
83
91
from bzrlib.mutabletree import needs_tree_write_lock
84
92
from bzrlib import osutils
85
93
from bzrlib.osutils import (
 
94
    compact_date,
86
95
    file_kind,
87
96
    isdir,
88
97
    normpath,
89
98
    pathjoin,
 
99
    rand_chars,
90
100
    realpath,
91
101
    safe_unicode,
92
102
    splitpath,
93
103
    supports_executable,
94
104
    )
95
 
from bzrlib.filters import filtered_input_file
96
105
from bzrlib.trace import mutter, note
97
106
from bzrlib.transport.local import LocalTransport
98
 
from bzrlib.revision import CURRENT_REVISION
 
107
from bzrlib.progress import DummyProgress, ProgressPhase
 
108
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
109
from bzrlib.rio import RioReader, rio_file, Stanza
100
 
from bzrlib.symbol_versioning import (
101
 
    deprecated_passed,
102
 
    DEPRECATED_PARAMETER,
103
 
    )
 
110
from bzrlib.symbol_versioning import (deprecated_passed,
 
111
        deprecated_method,
 
112
        deprecated_function,
 
113
        DEPRECATED_PARAMETER,
 
114
        )
104
115
 
105
116
 
106
117
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
 
# TODO: Modifying the conflict objects or their type is currently nearly
108
 
# impossible as there is no clear relationship between the working tree format
109
 
# and the conflict list file format.
110
118
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
119
 
112
120
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
175
        return ''
168
176
 
169
177
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
178
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
179
    """Working copy tree.
173
180
 
174
181
    The inventory is held in the `Branch` working-inventory, and the
178
185
    not listed in the Inventory and vice versa.
179
186
    """
180
187
 
181
 
    # override this to set the strategy for storing views
182
 
    def _make_views(self):
183
 
        return views.DisabledViews(self)
184
 
 
185
188
    def __init__(self, basedir='.',
186
189
                 branch=DEPRECATED_PARAMETER,
187
190
                 _inventory=None,
222
225
        wt_trans = self.bzrdir.get_workingtree_transport(None)
223
226
        cache_filename = wt_trans.local_abspath('stat-cache')
224
227
        self._hashcache = hashcache.HashCache(basedir, cache_filename,
225
 
            self.bzrdir._get_file_mode(),
226
 
            self._content_filter_stack_provider())
 
228
            self.bzrdir._get_file_mode())
227
229
        hc = self._hashcache
228
230
        hc.read()
229
231
        # is this scan needed ? it makes things kinda slow.
245
247
            self._set_inventory(_inventory, dirty=False)
246
248
        self._detect_case_handling()
247
249
        self._rules_searcher = None
248
 
        self.views = self._make_views()
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
250
 
258
251
    def _detect_case_handling(self):
259
252
        wt_trans = self.bzrdir.get_workingtree_transport(None)
285
278
        self._control_files.break_lock()
286
279
        self.branch.break_lock()
287
280
 
288
 
    def _get_check_refs(self):
289
 
        """Return the references needed to perform a check of this tree.
290
 
        
291
 
        The default implementation returns no refs, and is only suitable for
292
 
        trees that have no local caching and can commit on ghosts at any time.
293
 
 
294
 
        :seealso: bzrlib.check for details about check_refs.
295
 
        """
296
 
        return []
297
 
 
298
281
    def requires_rich_root(self):
299
282
        return self._format.requires_rich_root
300
283
 
305
288
        return self._format.supports_content_filtering()
306
289
 
307
290
    def supports_views(self):
308
 
        return self.views.supports_views()
 
291
        return self._format.supports_views()
309
292
 
310
293
    def _set_inventory(self, inv, dirty):
311
294
        """Set the internal cached inventory.
424
407
            return self.branch.repository.revision_tree(revision_id)
425
408
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
426
409
            # the basis tree *may* be a ghost or a low level error may have
427
 
            # occurred. If the revision is present, its a problem, if its not
 
410
            # occured. If the revision is present, its a problem, if its not
428
411
            # its a ghost.
429
412
            if self.branch.repository.has_revision(revision_id):
430
413
                raise
446
429
    def has_filename(self, filename):
447
430
        return osutils.lexists(self.abspath(filename))
448
431
 
449
 
    def get_file(self, file_id, path=None, filtered=True):
450
 
        return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
 
432
    def get_file(self, file_id, path=None):
 
433
        return self.get_file_with_stat(file_id, path)[0]
451
434
 
452
 
    def get_file_with_stat(self, file_id, path=None, filtered=True,
453
 
        _fstat=os.fstat):
454
 
        """See Tree.get_file_with_stat."""
 
435
    def get_file_with_stat(self, file_id, path=None, _fstat=os.fstat):
 
436
        """See MutableTree.get_file_with_stat."""
455
437
        if path is None:
456
438
            path = self.id2path(file_id)
457
 
        file_obj = self.get_file_byname(path, filtered=False)
458
 
        stat_value = _fstat(file_obj.fileno())
459
 
        if filtered and self.supports_content_filtering():
460
 
            filters = self._content_filter_stack(path)
461
 
            file_obj = filtered_input_file(file_obj, filters)
462
 
        return (file_obj, stat_value)
463
 
 
464
 
    def get_file_text(self, file_id, path=None, filtered=True):
465
 
        return self.get_file(file_id, path=path, filtered=filtered).read()
466
 
 
467
 
    def get_file_byname(self, filename, filtered=True):
468
 
        path = self.abspath(filename)
469
 
        f = file(path, 'rb')
470
 
        if filtered and self.supports_content_filtering():
471
 
            filters = self._content_filter_stack(filename)
472
 
            return filtered_input_file(f, filters)
473
 
        else:
474
 
            return f
475
 
 
476
 
    def get_file_lines(self, file_id, path=None, filtered=True):
 
439
        file_obj = self.get_file_byname(path)
 
440
        return (file_obj, _fstat(file_obj.fileno()))
 
441
 
 
442
    def get_file_byname(self, filename):
 
443
        return file(self.abspath(filename), 'rb')
 
444
 
 
445
    def get_file_lines(self, file_id, path=None):
477
446
        """See Tree.get_file_lines()"""
478
 
        file = self.get_file(file_id, path, filtered=filtered)
 
447
        file = self.get_file(file_id, path)
479
448
        try:
480
449
            return file.readlines()
481
450
        finally:
492
461
        incorrectly attributed to CURRENT_REVISION (but after committing, the
493
462
        attribution will be correct).
494
463
        """
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
 
464
        basis = self.basis_tree()
 
465
        basis.lock_read()
 
466
        try:
 
467
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
468
                require_versioned=True).next()
 
469
            changed_content, kind = changes[2], changes[6]
 
470
            if not changed_content:
 
471
                return basis.annotate_iter(file_id)
 
472
            if kind[1] is None:
 
473
                return None
 
474
            import annotate
 
475
            if kind[0] != 'file':
 
476
                old_lines = []
 
477
            else:
 
478
                old_lines = list(basis.annotate_iter(file_id))
 
479
            old = [old_lines]
 
480
            for tree in self.branch.repository.revision_trees(
 
481
                self.get_parent_ids()[1:]):
 
482
                if file_id not in tree:
 
483
                    continue
 
484
                old.append(list(tree.annotate_iter(file_id)))
 
485
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
486
                                       default_revision)
 
487
        finally:
 
488
            basis.unlock()
531
489
 
532
490
    def _get_ancestors(self, default_revision):
533
491
        ancestors = set([default_revision])
548
506
        else:
549
507
            parents = [last_rev]
550
508
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
509
            merges_file = self._transport.get('pending-merges')
552
510
        except errors.NoSuchFile:
553
511
            pass
554
512
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
513
            for l in merges_file.readlines():
556
514
                revision_id = l.rstrip('\n')
557
515
                parents.append(revision_id)
558
516
        return parents
577
535
 
578
536
        revision
579
537
            If not None, the cloned tree will have its last revision set to
580
 
            revision, and difference between the source trees last revision
 
538
            revision, and and difference between the source trees last revision
581
539
            and this one merged in.
582
540
        """
583
541
        # assumes the target bzr dir format is compatible.
617
575
 
618
576
    def get_file_size(self, file_id):
619
577
        """See Tree.get_file_size"""
620
 
        # XXX: this returns the on-disk size; it should probably return the
621
 
        # canonical size
622
578
        try:
623
579
            return os.path.getsize(self.id2abspath(file_id))
624
580
        except OSError, e:
640
596
 
641
597
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
598
        file_id = self.path2id(path)
643
 
        if file_id is None:
644
 
            # For unversioned files on win32, we just assume they are not
645
 
            # executable
646
 
            return False
647
599
        return self._inventory[file_id].executable
648
600
 
649
601
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
759
711
            raise
760
712
        kind = _mapper(stat_result.st_mode)
761
713
        if kind == 'file':
762
 
            return self._file_content_summary(path, stat_result)
 
714
            size = stat_result.st_size
 
715
            # try for a stat cache lookup
 
716
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
717
            return (kind, size, executable, self._sha_from_stat(
 
718
                path, stat_result))
763
719
        elif kind == 'directory':
764
720
            # perhaps it looks like a plain directory, but it's really a
765
721
            # reference.
767
723
                kind = 'tree-reference'
768
724
            return kind, None, None, None
769
725
        elif kind == 'symlink':
770
 
            target = osutils.readlink(abspath)
771
 
            return ('symlink', None, None, target)
 
726
            return ('symlink', None, None, os.readlink(abspath))
772
727
        else:
773
728
            return (kind, None, None, None)
774
729
 
775
 
    def _file_content_summary(self, path, stat_result):
776
 
        size = stat_result.st_size
777
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
778
 
        # try for a stat cache lookup
779
 
        return ('file', size, executable, self._sha_from_stat(
780
 
            path, stat_result))
781
 
 
782
730
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
731
        """Common ghost checking functionality from set_parent_*.
784
732
 
794
742
    def _set_merges_from_parent_ids(self, parent_ids):
795
743
        merges = parent_ids[1:]
796
744
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
797
 
            mode=self.bzrdir._get_file_mode())
 
745
            mode=self._control_files._file_mode)
798
746
 
799
747
    def _filter_parent_ids_by_ancestry(self, revision_ids):
800
748
        """Check that all merged revisions are proper 'heads'.
900
848
        self._must_be_locked()
901
849
        my_file = rio_file(stanzas, header)
902
850
        self._transport.put_file(filename, my_file,
903
 
            mode=self.bzrdir._get_file_mode())
 
851
            mode=self._control_files._file_mode)
904
852
 
905
853
    @needs_write_lock # because merge pulls data into the branch.
906
854
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
855
        merge_type=None):
908
856
        """Merge from a branch into this working tree.
909
857
 
910
858
        :param branch: The branch to merge from.
914
862
            branch.last_revision().
915
863
        """
916
864
        from bzrlib.merge import Merger, Merge3Merger
917
 
        merger = Merger(self.branch, this_tree=self)
918
 
        # check that there are no local alterations
919
 
        if not force and self.has_changes():
920
 
            raise errors.UncommittedChanges(self)
921
 
        if to_revision is None:
922
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
923
 
        merger.other_rev_id = to_revision
924
 
        if _mod_revision.is_null(merger.other_rev_id):
925
 
            raise errors.NoCommits(branch)
926
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
 
        merger.other_basis = merger.other_rev_id
928
 
        merger.other_tree = self.branch.repository.revision_tree(
929
 
            merger.other_rev_id)
930
 
        merger.other_branch = branch
931
 
        if from_revision is None:
932
 
            merger.find_base()
933
 
        else:
934
 
            merger.set_base_revision(from_revision, branch)
935
 
        if merger.base_rev_id == merger.other_rev_id:
936
 
            raise errors.PointlessMerge
937
 
        merger.backup_files = False
938
 
        if merge_type is None:
939
 
            merger.merge_type = Merge3Merger
940
 
        else:
941
 
            merger.merge_type = merge_type
942
 
        merger.set_interesting_files(None)
943
 
        merger.show_base = False
944
 
        merger.reprocess = False
945
 
        conflicts = merger.do_merge()
946
 
        merger.set_pending()
 
865
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
866
        try:
 
867
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
868
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
869
            merger.pp.next_phase()
 
870
            # check that there are no
 
871
            # local alterations
 
872
            merger.check_basis(check_clean=True, require_commits=False)
 
873
            if to_revision is None:
 
874
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
875
            merger.other_rev_id = to_revision
 
876
            if _mod_revision.is_null(merger.other_rev_id):
 
877
                raise errors.NoCommits(branch)
 
878
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
879
            merger.other_basis = merger.other_rev_id
 
880
            merger.other_tree = self.branch.repository.revision_tree(
 
881
                merger.other_rev_id)
 
882
            merger.other_branch = branch
 
883
            merger.pp.next_phase()
 
884
            if from_revision is None:
 
885
                merger.find_base()
 
886
            else:
 
887
                merger.set_base_revision(from_revision, branch)
 
888
            if merger.base_rev_id == merger.other_rev_id:
 
889
                raise errors.PointlessMerge
 
890
            merger.backup_files = False
 
891
            if merge_type is None:
 
892
                merger.merge_type = Merge3Merger
 
893
            else:
 
894
                merger.merge_type = merge_type
 
895
            merger.set_interesting_files(None)
 
896
            merger.show_base = False
 
897
            merger.reprocess = False
 
898
            conflicts = merger.do_merge()
 
899
            merger.set_pending()
 
900
        finally:
 
901
            pb.finished()
947
902
        return conflicts
948
903
 
949
904
    @needs_read_lock
990
945
        return file_id
991
946
 
992
947
    def get_symlink_target(self, file_id):
993
 
        abspath = self.id2abspath(file_id)
994
 
        target = osutils.readlink(abspath)
995
 
        return target
 
948
        return os.readlink(self.id2abspath(file_id))
996
949
 
997
950
    @needs_write_lock
998
951
    def subsume(self, other_tree):
1096
1049
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1050
        if tree_transport.base != branch_transport.base:
1098
1051
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1052
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1053
        else:
1102
1054
            tree_bzrdir = branch_bzrdir
1103
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1055
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1104
1056
        wt.set_parent_ids(self.get_parent_ids())
1105
1057
        my_inv = self.inventory
1106
 
        child_inv = inventory.Inventory(root_id=None)
 
1058
        child_inv = Inventory(root_id=None)
1107
1059
        new_root = my_inv[file_id]
1108
1060
        my_inv.remove_recursive_id(file_id)
1109
1061
        new_root.parent_id = None
1128
1080
        self._serialize(self._inventory, sio)
1129
1081
        sio.seek(0)
1130
1082
        self._transport.put_file('inventory', sio,
1131
 
            mode=self.bzrdir._get_file_mode())
 
1083
            mode=self._control_files._file_mode)
1132
1084
        self._inventory_is_modified = False
1133
1085
 
1134
1086
    def _kind(self, relpath):
1135
1087
        return osutils.file_kind(self.abspath(relpath))
1136
1088
 
1137
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
 
        """List all files as (path, class, kind, id, entry).
 
1089
    def list_files(self, include_root=False):
 
1090
        """Recursively list all files as (path, class, kind, id, entry).
1139
1091
 
1140
1092
        Lists, but does not descend into unversioned directories.
 
1093
 
1141
1094
        This does not include files that have been deleted in this
1142
 
        tree. Skips the control directory.
 
1095
        tree.
1143
1096
 
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
 
1097
        Skips the control directory.
1147
1098
        """
1148
1099
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1100
        # with it. So callers should be careful to always read_lock the tree.
1151
1102
            raise errors.ObjectNotLocked(self)
1152
1103
 
1153
1104
        inv = self.inventory
1154
 
        if from_dir is None and include_root is True:
 
1105
        if include_root is True:
1155
1106
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1156
1107
        # Convert these into local objects to save lookup times
1157
1108
        pathjoin = osutils.pathjoin
1164
1115
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1165
1116
 
1166
1117
        # directory file_id, relative path, absolute path, reverse sorted children
1167
 
        if from_dir is not None:
1168
 
            from_dir_id = inv.path2id(from_dir)
1169
 
            if from_dir_id is None:
1170
 
                # Directory not versioned
1171
 
                return
1172
 
            from_dir_abspath = pathjoin(self.basedir, from_dir)
1173
 
        else:
1174
 
            from_dir_id = inv.root.file_id
1175
 
            from_dir_abspath = self.basedir
1176
 
        children = os.listdir(from_dir_abspath)
 
1118
        children = os.listdir(self.basedir)
1177
1119
        children.sort()
1178
1120
        # jam 20060527 The kernel sized tree seems equivalent whether we
1179
1121
        # use a deque and popleft to keep them sorted, or if we use a plain
1180
1122
        # list and just reverse() them.
1181
1123
        children = collections.deque(children)
1182
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1124
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1183
1125
        while stack:
1184
1126
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1185
1127
 
1243
1185
                if fk != 'directory':
1244
1186
                    continue
1245
1187
 
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
 
1188
                # But do this child first
 
1189
                new_children = os.listdir(fap)
 
1190
                new_children.sort()
 
1191
                new_children = collections.deque(new_children)
 
1192
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1193
                # Break out of inner loop,
 
1194
                # so that we start outer loop with child
 
1195
                break
1255
1196
            else:
1256
1197
                # if we finished all children, pop it off the stack
1257
1198
                stack.pop()
1435
1376
        inv = self.inventory
1436
1377
        for entry in moved:
1437
1378
            try:
1438
 
                self._move_entry(WorkingTree._RenameEntry(
1439
 
                    entry.to_rel, entry.from_id,
 
1379
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1440
1380
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
1381
                    entry.from_tail, entry.from_parent_id,
1442
1382
                    entry.only_change_inv))
1493
1433
        from_tail = splitpath(from_rel)[-1]
1494
1434
        from_id = inv.path2id(from_rel)
1495
1435
        if from_id is None:
1496
 
            # if file is missing in the inventory maybe it's in the basis_tree
1497
 
            basis_tree = self.branch.basis_tree()
1498
 
            from_id = basis_tree.path2id(from_rel)
1499
 
            if from_id is None:
1500
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1501
 
                    errors.NotVersionedError(path=str(from_rel)))
1502
 
            # put entry back in the inventory so we can rename it
1503
 
            from_entry = basis_tree.inventory[from_id].copy()
1504
 
            inv.add(from_entry)
1505
 
        else:
1506
 
            from_entry = inv[from_id]
 
1436
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1437
                errors.NotVersionedError(path=str(from_rel)))
 
1438
        from_entry = inv[from_id]
1507
1439
        from_parent_id = from_entry.parent_id
1508
1440
        to_dir, to_tail = os.path.split(to_rel)
1509
1441
        to_dir_id = inv.path2id(to_dir)
1571
1503
        :raises: NoSuchId if any fileid is not currently versioned.
1572
1504
        """
1573
1505
        for file_id in file_ids:
1574
 
            if file_id not in self._inventory:
1575
 
                raise errors.NoSuchId(self, file_id)
1576
 
        for file_id in file_ids:
1577
1506
            if self._inventory.has_id(file_id):
1578
1507
                self._inventory.remove_recursive_id(file_id)
 
1508
            else:
 
1509
                raise errors.NoSuchId(self, file_id)
1579
1510
        if len(file_ids):
1580
1511
            # in the future this should just set a dirty bit to wait for the
1581
1512
            # final unlock. However, until all methods of workingtree start
1600
1531
 
1601
1532
    @needs_write_lock
1602
1533
    def pull(self, source, overwrite=False, stop_revision=None,
1603
 
             change_reporter=None, possible_transports=None, local=False):
 
1534
             change_reporter=None, possible_transports=None):
 
1535
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1604
1536
        source.lock_read()
1605
1537
        try:
 
1538
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1539
            pp.next_phase()
1606
1540
            old_revision_info = self.branch.last_revision_info()
1607
1541
            basis_tree = self.basis_tree()
1608
1542
            count = self.branch.pull(source, overwrite, stop_revision,
1609
 
                                     possible_transports=possible_transports,
1610
 
                                     local=local)
 
1543
                                     possible_transports=possible_transports)
1611
1544
            new_revision_info = self.branch.last_revision_info()
1612
1545
            if new_revision_info != old_revision_info:
 
1546
                pp.next_phase()
1613
1547
                repository = self.branch.repository
 
1548
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1614
1549
                basis_tree.lock_read()
1615
1550
                try:
1616
1551
                    new_basis_tree = self.branch.basis_tree()
1619
1554
                                new_basis_tree,
1620
1555
                                basis_tree,
1621
1556
                                this_tree=self,
1622
 
                                pb=None,
 
1557
                                pb=pb,
1623
1558
                                change_reporter=change_reporter)
1624
 
                    basis_root_id = basis_tree.get_root_id()
1625
 
                    new_root_id = new_basis_tree.get_root_id()
1626
 
                    if basis_root_id != new_root_id:
1627
 
                        self.set_root_id(new_root_id)
 
1559
                    if (basis_tree.inventory.root is None and
 
1560
                        new_basis_tree.inventory.root is not None):
 
1561
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1562
                finally:
 
1563
                    pb.finished()
1629
1564
                    basis_tree.unlock()
1630
1565
                # TODO - dedup parents list with things merged by pull ?
1631
1566
                # reuse the revisiontree we merged against to set the new
1644
1579
            return count
1645
1580
        finally:
1646
1581
            source.unlock()
 
1582
            top_pb.finished()
1647
1583
 
1648
1584
    @needs_write_lock
1649
1585
    def put_file_bytes_non_atomic(self, file_id, bytes):
1675
1611
 
1676
1612
            fl = []
1677
1613
            for subf in os.listdir(dirabs):
1678
 
                if self.bzrdir.is_control_filename(subf):
 
1614
                if subf == '.bzr':
1679
1615
                    continue
1680
1616
                if subf not in dir_entry.children:
1681
1617
                    try:
1734
1670
        r"""Check whether the filename matches an ignore pattern.
1735
1671
 
1736
1672
        Patterns containing '/' or '\' need to match the whole path;
1737
 
        others match against only the last component.  Patterns starting
1738
 
        with '!' are ignore exceptions.  Exceptions take precedence
1739
 
        over regular patterns and cause the filename to not be ignored.
 
1673
        others match against only the last component.
1740
1674
 
1741
1675
        If the file is ignored, returns the pattern which caused it to
1742
1676
        be ignored, otherwise None.  So this can simply be used as a
1743
1677
        boolean if desired."""
1744
1678
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1679
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1680
        return self._ignoreglobster.match(filename)
1747
1681
 
1748
1682
    def kind(self, file_id):
1798
1732
            raise errors.ObjectNotLocked(self)
1799
1733
 
1800
1734
    def lock_read(self):
1801
 
        """Lock the tree for reading.
1802
 
 
1803
 
        This also locks the branch, and can be unlocked via self.unlock().
1804
 
 
1805
 
        :return: An object with an unlock method which will release the lock
1806
 
            obtained.
1807
 
        """
 
1735
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1736
        if not self.is_locked():
1809
1737
            self._reset_data()
1810
1738
        self.branch.lock_read()
1811
1739
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return self
 
1740
            return self._control_files.lock_read()
1814
1741
        except:
1815
1742
            self.branch.unlock()
1816
1743
            raise
1817
1744
 
1818
1745
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: An object with an unlock method which will release the lock
1822
 
            obtained.
1823
 
        """
 
1746
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1824
1747
        if not self.is_locked():
1825
1748
            self._reset_data()
1826
1749
        self.branch.lock_read()
1827
1750
        try:
1828
 
            self._control_files.lock_write()
1829
 
            return self
 
1751
            return self._control_files.lock_write()
1830
1752
        except:
1831
1753
            self.branch.unlock()
1832
1754
            raise
1833
1755
 
1834
1756
    def lock_write(self):
1835
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1836
 
 
1837
 
        :return: An object with an unlock method which will release the lock
1838
 
            obtained.
1839
 
        """
 
1757
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1758
        if not self.is_locked():
1841
1759
            self._reset_data()
1842
1760
        self.branch.lock_write()
1843
1761
        try:
1844
 
            self._control_files.lock_write()
1845
 
            return self
 
1762
            return self._control_files.lock_write()
1846
1763
        except:
1847
1764
            self.branch.unlock()
1848
1765
            raise
1856
1773
    def _reset_data(self):
1857
1774
        """Reset transient data that cannot be revalidated."""
1858
1775
        self._inventory_is_modified = False
1859
 
        f = self._transport.get('inventory')
1860
 
        try:
1861
 
            result = self._deserialize(f)
1862
 
        finally:
1863
 
            f.close()
 
1776
        result = self._deserialize(self._transport.get('inventory'))
1864
1777
        self._set_inventory(result, dirty=False)
1865
1778
 
1866
1779
    @needs_tree_write_lock
1890
1803
        path = self._basis_inventory_name()
1891
1804
        sio = StringIO(xml)
1892
1805
        self._transport.put_file(path, sio,
1893
 
            mode=self.bzrdir._get_file_mode())
 
1806
            mode=self._control_files._file_mode)
1894
1807
 
1895
1808
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1896
1809
        """Create the text that will be saved in basis-inventory"""
1913
1826
            # revision_id is set. We must check for this full string, because a
1914
1827
            # root node id can legitimately look like 'revision_id' but cannot
1915
1828
            # contain a '"'.
1916
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1829
            xml = self.branch.repository.get_inventory_xml(new_revision)
1917
1830
            firstline = xml.split('\n', 1)[0]
1918
1831
            if (not 'revision_id="' in firstline or
1919
1832
                'format="7"' not in firstline):
1920
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1921
 
                    xml, new_revision)
 
1833
                inv = self.branch.repository.deserialise_inventory(
 
1834
                    new_revision, xml)
1922
1835
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1923
1836
            self._write_basis_inventory(xml)
1924
1837
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1942
1855
        # binary.
1943
1856
        if self._inventory_is_modified:
1944
1857
            raise errors.InventoryModified(self)
1945
 
        f = self._transport.get('inventory')
1946
 
        try:
1947
 
            result = self._deserialize(f)
1948
 
        finally:
1949
 
            f.close()
 
1858
        result = self._deserialize(self._transport.get('inventory'))
1950
1859
        self._set_inventory(result, dirty=False)
1951
1860
        return result
1952
1861
 
1967
1876
 
1968
1877
        new_files=set()
1969
1878
        unknown_nested_files=set()
1970
 
        if to_file is None:
1971
 
            to_file = sys.stdout
1972
1879
 
1973
1880
        def recurse_directory_to_add_files(directory):
1974
1881
            # Recurse directory and add all files
2030
1937
                        tree_delta.unversioned.extend((unknown_file,))
2031
1938
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2032
1939
 
2033
 
        # Build inv_delta and delete files where applicable,
 
1940
        # Build inv_delta and delete files where applicaple,
2034
1941
        # do this before any modifications to inventory.
2035
1942
        for f in files:
2036
1943
            fid = self.path2id(f)
2044
1951
                        new_status = 'I'
2045
1952
                    else:
2046
1953
                        new_status = '?'
2047
 
                    # XXX: Really should be a more abstract reporter interface
2048
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2049
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1954
                    textui.show_status(new_status, self.kind(fid), f,
 
1955
                                       to_file=to_file)
2050
1956
                # Unversion file
2051
1957
                inv_delta.append((f, None, fid, None))
2052
1958
                message = "removed %s" % (f,)
2075
1981
 
2076
1982
    @needs_tree_write_lock
2077
1983
    def revert(self, filenames=None, old_tree=None, backups=True,
2078
 
               pb=None, report_changes=False):
 
1984
               pb=DummyProgress(), report_changes=False):
2079
1985
        from bzrlib.conflicts import resolve
2080
1986
        if filenames == []:
2081
1987
            filenames = None
2094
2000
            if filenames is None and len(self.get_parent_ids()) > 1:
2095
2001
                parent_trees = []
2096
2002
                last_revision = self.last_revision()
2097
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2003
                if last_revision != NULL_REVISION:
2098
2004
                    if basis_tree is None:
2099
2005
                        basis_tree = self.basis_tree()
2100
2006
                        basis_tree.lock_read()
2138
2044
    def set_inventory(self, new_inventory_list):
2139
2045
        from bzrlib.inventory import (Inventory,
2140
2046
                                      InventoryDirectory,
 
2047
                                      InventoryEntry,
2141
2048
                                      InventoryFile,
2142
2049
                                      InventoryLink)
2143
2050
        inv = Inventory(self.get_root_id())
2203
2110
        """
2204
2111
        raise NotImplementedError(self.unlock)
2205
2112
 
2206
 
    _marker = object()
2207
 
 
2208
 
    def update(self, change_reporter=None, possible_transports=None,
2209
 
               revision=None, old_tip=_marker):
 
2113
    def update(self, change_reporter=None, possible_transports=None):
2210
2114
        """Update a working tree along its branch.
2211
2115
 
2212
2116
        This will update the branch if its bound too, which means we have
2230
2134
        - Merge current state -> basis tree of the master w.r.t. the old tree
2231
2135
          basis.
2232
2136
        - Do a 'normal' merge of the old branch basis if it is relevant.
2233
 
 
2234
 
        :param revision: The target revision to update to. Must be in the
2235
 
            revision history.
2236
 
        :param old_tip: If branch.update() has already been run, the value it
2237
 
            returned (old tip of the branch or None). _marker is used
2238
 
            otherwise.
2239
2137
        """
2240
2138
        if self.branch.get_bound_location() is not None:
2241
2139
            self.lock_write()
2242
 
            update_branch = (old_tip is self._marker)
 
2140
            update_branch = True
2243
2141
        else:
2244
2142
            self.lock_tree_write()
2245
2143
            update_branch = False
2247
2145
            if update_branch:
2248
2146
                old_tip = self.branch.update(possible_transports)
2249
2147
            else:
2250
 
                if old_tip is self._marker:
2251
 
                    old_tip = None
2252
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2148
                old_tip = None
 
2149
            return self._update_tree(old_tip, change_reporter)
2253
2150
        finally:
2254
2151
            self.unlock()
2255
2152
 
2256
2153
    @needs_tree_write_lock
2257
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2154
    def _update_tree(self, old_tip=None, change_reporter=None):
2258
2155
        """Update a tree to the master branch.
2259
2156
 
2260
2157
        :param old_tip: if supplied, the previous tip revision the branch,
2270
2167
        # We MUST save it even if an error occurs, because otherwise the users
2271
2168
        # local work is unreferenced and will appear to have been lost.
2272
2169
        #
2273
 
        nb_conflicts = 0
 
2170
        result = 0
2274
2171
        try:
2275
2172
            last_rev = self.get_parent_ids()[0]
2276
2173
        except IndexError:
2277
2174
            last_rev = _mod_revision.NULL_REVISION
2278
 
        if revision is None:
2279
 
            revision = self.branch.last_revision()
2280
 
 
2281
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2282
 
 
2283
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2284
 
            # the branch we are bound to was updated
2285
 
            # merge those changes in first
2286
 
            base_tree  = self.basis_tree()
2287
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2288
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2289
 
                                             base_tree, this_tree=self,
2290
 
                                             change_reporter=change_reporter)
2291
 
            if nb_conflicts:
2292
 
                self.add_parent_tree((old_tip, other_tree))
2293
 
                trace.note('Rerun update after fixing the conflicts.')
2294
 
                return nb_conflicts
2295
 
 
2296
 
        if last_rev != _mod_revision.ensure_null(revision):
2297
 
            # the working tree is up to date with the branch
2298
 
            # we can merge the specified revision from master
2299
 
            to_tree = self.branch.repository.revision_tree(revision)
2300
 
            to_root_id = to_tree.get_root_id()
2301
 
 
 
2175
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2176
            # merge tree state up to new branch tip.
2302
2177
            basis = self.basis_tree()
2303
2178
            basis.lock_read()
2304
2179
            try:
2305
 
                if (basis.inventory.root is None
2306
 
                    or basis.inventory.root.file_id != to_root_id):
2307
 
                    self.set_root_id(to_root_id)
 
2180
                to_tree = self.branch.basis_tree()
 
2181
                if basis.inventory.root is None:
 
2182
                    self.set_root_id(to_tree.get_root_id())
2308
2183
                    self.flush()
 
2184
                result += merge.merge_inner(
 
2185
                                      self.branch,
 
2186
                                      to_tree,
 
2187
                                      basis,
 
2188
                                      this_tree=self,
 
2189
                                      change_reporter=change_reporter)
2309
2190
            finally:
2310
2191
                basis.unlock()
2311
 
 
2312
 
            # determine the branch point
2313
 
            graph = self.branch.repository.get_graph()
2314
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2315
 
                                                last_rev)
2316
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
 
 
2318
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2319
 
                                             this_tree=self,
2320
 
                                             change_reporter=change_reporter)
2321
 
            self.set_last_revision(revision)
2322
2192
            # TODO - dedup parents list with things merged by pull ?
2323
2193
            # reuse the tree we've updated to to set the basis:
2324
 
            parent_trees = [(revision, to_tree)]
 
2194
            parent_trees = [(self.branch.last_revision(), to_tree)]
2325
2195
            merges = self.get_parent_ids()[1:]
2326
2196
            # Ideally we ask the tree for the trees here, that way the working
2327
 
            # tree can decide whether to give us the entire tree or give us a
 
2197
            # tree can decide whether to give us teh entire tree or give us a
2328
2198
            # lazy initialised tree. dirstate for instance will have the trees
2329
2199
            # in ram already, whereas a last-revision + basis-inventory tree
2330
2200
            # will not, but also does not need them when setting parents.
2331
2201
            for parent in merges:
2332
2202
                parent_trees.append(
2333
2203
                    (parent, self.branch.repository.revision_tree(parent)))
2334
 
            if not _mod_revision.is_null(old_tip):
 
2204
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2335
2205
                parent_trees.append(
2336
2206
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2337
2207
            self.set_parent_trees(parent_trees)
2338
2208
            last_rev = parent_trees[0][0]
2339
 
        return nb_conflicts
 
2209
        else:
 
2210
            # the working tree had the same last-revision as the master
 
2211
            # branch did. We may still have pivot local work from the local
 
2212
            # branch into old_tip:
 
2213
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2214
                self.add_parent_tree_id(old_tip)
 
2215
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2216
            and old_tip != last_rev):
 
2217
            # our last revision was not the prior branch last revision
 
2218
            # and we have converted that last revision to a pending merge.
 
2219
            # base is somewhere between the branch tip now
 
2220
            # and the now pending merge
 
2221
 
 
2222
            # Since we just modified the working tree and inventory, flush out
 
2223
            # the current state, before we modify it again.
 
2224
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2225
            #       requires it only because TreeTransform directly munges the
 
2226
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2227
            #       should be able to remove this extra flush.
 
2228
            self.flush()
 
2229
            graph = self.branch.repository.get_graph()
 
2230
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2231
                                                old_tip)
 
2232
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2233
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2234
            result += merge.merge_inner(
 
2235
                                  self.branch,
 
2236
                                  other_tree,
 
2237
                                  base_tree,
 
2238
                                  this_tree=self,
 
2239
                                  change_reporter=change_reporter)
 
2240
        return result
2340
2241
 
2341
2242
    def _write_hashcache_if_dirty(self):
2342
2243
        """Write out the hashcache if it is dirty."""
2442
2343
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2443
2344
                        ('.bzr', '.bzr'))
2444
2345
                    if (bzrdir_loc < len(cur_disk_dir_content)
2445
 
                        and self.bzrdir.is_control_filename(
2446
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2346
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2447
2347
                        # we dont yield the contents of, or, .bzr itself.
2448
2348
                        del cur_disk_dir_content[bzrdir_loc]
2449
2349
            if inv_finished:
2583
2483
        return un_resolved, resolved
2584
2484
 
2585
2485
    @needs_read_lock
2586
 
    def _check(self, references):
2587
 
        """Check the tree for consistency.
2588
 
 
2589
 
        :param references: A dict with keys matching the items returned by
2590
 
            self._get_check_refs(), and values from looking those keys up in
2591
 
            the repository.
2592
 
        """
 
2486
    def _check(self):
2593
2487
        tree_basis = self.basis_tree()
2594
2488
        tree_basis.lock_read()
2595
2489
        try:
2596
 
            repo_basis = references[('trees', self.last_revision())]
 
2490
            repo_basis = self.branch.repository.revision_tree(
 
2491
                self.last_revision())
2597
2492
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2598
2493
                raise errors.BzrCheckError(
2599
2494
                    "Mismatched basis inventory content.")
2612
2507
        """
2613
2508
        return
2614
2509
 
 
2510
    @needs_read_lock
2615
2511
    def _get_rules_searcher(self, default_searcher):
2616
2512
        """See Tree._get_rules_searcher."""
2617
2513
        if self._rules_searcher is None:
2644
2540
        if self._inventory is None:
2645
2541
            self.read_working_inventory()
2646
2542
 
2647
 
    def _get_check_refs(self):
2648
 
        """Return the references needed to perform a check of this tree."""
2649
 
        return [('trees', self.last_revision())]
2650
 
 
2651
2543
    def lock_tree_write(self):
2652
2544
        """See WorkingTree.lock_tree_write().
2653
2545
 
2654
2546
        In Format2 WorkingTrees we have a single lock for the branch and tree
2655
2547
        so lock_tree_write() degrades to lock_write().
2656
 
 
2657
 
        :return: An object with an unlock method which will release the lock
2658
 
            obtained.
2659
2548
        """
2660
2549
        self.branch.lock_write()
2661
2550
        try:
2662
 
            self._control_files.lock_write()
2663
 
            return self
 
2551
            return self._control_files.lock_write()
2664
2552
        except:
2665
2553
            self.branch.unlock()
2666
2554
            raise
2703
2591
 
2704
2592
    def _change_last_revision(self, revision_id):
2705
2593
        """See WorkingTree._change_last_revision."""
2706
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2594
        if revision_id is None or revision_id == NULL_REVISION:
2707
2595
            try:
2708
2596
                self._transport.delete('last-revision')
2709
2597
            except errors.NoSuchFile:
2711
2599
            return False
2712
2600
        else:
2713
2601
            self._transport.put_bytes('last-revision', revision_id,
2714
 
                mode=self.bzrdir._get_file_mode())
 
2602
                mode=self._control_files._file_mode)
2715
2603
            return True
2716
2604
 
2717
 
    def _get_check_refs(self):
2718
 
        """Return the references needed to perform a check of this tree."""
2719
 
        return [('trees', self.last_revision())]
2720
 
 
2721
2605
    @needs_tree_write_lock
2722
2606
    def set_conflicts(self, conflicts):
2723
2607
        self._put_rio('conflicts', conflicts.to_stanzas(),
2800
2684
        """Return the format for the working tree object in a_bzrdir."""
2801
2685
        try:
2802
2686
            transport = a_bzrdir.get_workingtree_transport(None)
2803
 
            format_string = transport.get_bytes("format")
 
2687
            format_string = transport.get("format").read()
2804
2688
            return klass._formats[format_string]
2805
2689
        except errors.NoSuchFile:
2806
2690
            raise errors.NoWorkingTree(base=transport.base)
2877
2761
        no working tree.  (See bug #43064).
2878
2762
        """
2879
2763
        sio = StringIO()
2880
 
        inv = inventory.Inventory()
 
2764
        inv = Inventory()
2881
2765
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2882
2766
        sio.seek(0)
2883
2767
        transport.put_file('inventory', sio, file_mode)
2899
2783
            branch.generate_revision_history(revision_id)
2900
2784
        finally:
2901
2785
            branch.unlock()
2902
 
        inv = inventory.Inventory()
 
2786
        inv = Inventory()
2903
2787
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2904
2788
                         branch,
2905
2789
                         inv,
2996
2880
        control_files.create_lock()
2997
2881
        control_files.lock_write()
2998
2882
        transport.put_bytes('format', self.get_format_string(),
2999
 
            mode=a_bzrdir._get_file_mode())
 
2883
            mode=control_files._file_mode)
3000
2884
        if from_branch is not None:
3001
2885
            branch = from_branch
3002
2886
        else:
3022
2906
            # only set an explicit root id if there is one to set.
3023
2907
            if basis_tree.inventory.root is not None:
3024
2908
                wt.set_root_id(basis_tree.get_root_id())
3025
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2909
            if revision_id == NULL_REVISION:
3026
2910
                wt.set_parent_trees([])
3027
2911
            else:
3028
2912
                wt.set_parent_trees([(revision_id, basis_tree)])
3035
2919
        return wt
3036
2920
 
3037
2921
    def _initial_inventory(self):
3038
 
        return inventory.Inventory()
 
2922
        return Inventory()
3039
2923
 
3040
2924
    def __init__(self):
3041
2925
        super(WorkingTreeFormat3, self).__init__()
3070
2954
        return self.get_format_string()
3071
2955
 
3072
2956
 
3073
 
__default_format = WorkingTreeFormat6()
 
2957
__default_format = WorkingTreeFormat4()
3074
2958
WorkingTreeFormat.register_format(__default_format)
3075
2959
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3076
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3077
2960
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3078
2961
WorkingTreeFormat.set_default_format(__default_format)
3079
2962
# formats which have no format string are not discoverable