/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: James Westby
  • Date: 2009-03-12 06:04:54 UTC
  • mto: This revision was merged to the branch mainline in revision 4139.
  • Revision ID: james.westby@canonical.com-20090312060454-f04pmpufns32zyk6
Move the shelve docs from bzrtools to the main help.

Also change them to document the new "shelve" rather than the old one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""WorkingTree object and friends.
18
18
 
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
42
48
import itertools
43
49
import operator
44
50
import stat
 
51
from time import time
 
52
import warnings
45
53
import re
46
54
 
47
55
import bzrlib
49
57
    branch,
50
58
    bzrdir,
51
59
    conflicts as _mod_conflicts,
 
60
    dirstate,
52
61
    errors,
53
62
    generate_ids,
54
63
    globbing,
55
 
    graph as _mod_graph,
56
64
    hashcache,
57
65
    ignores,
58
 
    inventory,
59
66
    merge,
60
67
    revision as _mod_revision,
61
68
    revisiontree,
 
69
    repository,
 
70
    textui,
62
71
    trace,
63
72
    transform,
64
73
    ui,
 
74
    urlutils,
65
75
    views,
66
76
    xml5,
 
77
    xml6,
67
78
    xml7,
68
79
    )
69
80
import bzrlib.branch
70
81
from bzrlib.transport import get_transport
71
 
from bzrlib.workingtree_4 import (
72
 
    WorkingTreeFormat4,
73
 
    WorkingTreeFormat5,
74
 
    WorkingTreeFormat6,
75
 
    )
 
82
import bzrlib.ui
 
83
from bzrlib.workingtree_4 import WorkingTreeFormat4, WorkingTreeFormat5
76
84
""")
77
85
 
78
86
from bzrlib import symbol_versioning
79
87
from bzrlib.decorators import needs_read_lock, needs_write_lock
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,
94
104
    supports_executable,
95
105
    )
96
 
from bzrlib.filters import filtered_input_file
97
106
from bzrlib.trace import mutter, note
98
107
from bzrlib.transport.local import LocalTransport
99
 
from bzrlib.revision import CURRENT_REVISION
 
108
from bzrlib.progress import DummyProgress, ProgressPhase
 
109
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
100
110
from bzrlib.rio import RioReader, rio_file, Stanza
101
 
from bzrlib.symbol_versioning import (
102
 
    deprecated_passed,
103
 
    DEPRECATED_PARAMETER,
104
 
    )
 
111
from bzrlib.symbol_versioning import (deprecated_passed,
 
112
        deprecated_method,
 
113
        deprecated_function,
 
114
        DEPRECATED_PARAMETER,
 
115
        )
105
116
 
106
117
 
107
118
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
119
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
120
 
113
121
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
176
        return ''
169
177
 
170
178
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
179
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
180
    """Working copy tree.
174
181
 
175
182
    The inventory is held in the `Branch` working-inventory, and the
223
230
        wt_trans = self.bzrdir.get_workingtree_transport(None)
224
231
        cache_filename = wt_trans.local_abspath('stat-cache')
225
232
        self._hashcache = hashcache.HashCache(basedir, cache_filename,
226
 
            self.bzrdir._get_file_mode(),
227
 
            self._content_filter_stack_provider())
 
233
            self.bzrdir._get_file_mode())
228
234
        hc = self._hashcache
229
235
        hc.read()
230
236
        # is this scan needed ? it makes things kinda slow.
248
254
        self._rules_searcher = None
249
255
        self.views = self._make_views()
250
256
 
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
257
    def _detect_case_handling(self):
260
258
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
259
        try:
286
284
        self._control_files.break_lock()
287
285
        self.branch.break_lock()
288
286
 
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
287
    def requires_rich_root(self):
300
288
        return self._format.requires_rich_root
301
289
 
425
413
            return self.branch.repository.revision_tree(revision_id)
426
414
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
427
415
            # 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
 
416
            # occured. If the revision is present, its a problem, if its not
429
417
            # its a ghost.
430
418
            if self.branch.repository.has_revision(revision_id):
431
419
                raise
447
435
    def has_filename(self, filename):
448
436
        return osutils.lexists(self.abspath(filename))
449
437
 
450
 
    def get_file(self, file_id, path=None, filtered=True):
451
 
        return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
 
438
    def get_file(self, file_id, path=None):
 
439
        return self.get_file_with_stat(file_id, path)[0]
452
440
 
453
 
    def get_file_with_stat(self, file_id, path=None, filtered=True,
454
 
        _fstat=os.fstat):
455
 
        """See Tree.get_file_with_stat."""
 
441
    def get_file_with_stat(self, file_id, path=None, _fstat=os.fstat):
 
442
        """See MutableTree.get_file_with_stat."""
456
443
        if path is None:
457
444
            path = self.id2path(file_id)
458
 
        file_obj = self.get_file_byname(path, filtered=False)
459
 
        stat_value = _fstat(file_obj.fileno())
460
 
        if filtered and self.supports_content_filtering():
461
 
            filters = self._content_filter_stack(path)
462
 
            file_obj = filtered_input_file(file_obj, filters)
463
 
        return (file_obj, stat_value)
464
 
 
465
 
    def get_file_text(self, file_id, path=None, filtered=True):
466
 
        return self.get_file(file_id, path=path, filtered=filtered).read()
467
 
 
468
 
    def get_file_byname(self, filename, filtered=True):
469
 
        path = self.abspath(filename)
470
 
        f = file(path, 'rb')
471
 
        if filtered and self.supports_content_filtering():
472
 
            filters = self._content_filter_stack(filename)
473
 
            return filtered_input_file(f, filters)
474
 
        else:
475
 
            return f
476
 
 
477
 
    def get_file_lines(self, file_id, path=None, filtered=True):
 
445
        file_obj = self.get_file_byname(path)
 
446
        return (file_obj, _fstat(file_obj.fileno()))
 
447
 
 
448
    def get_file_byname(self, filename):
 
449
        return file(self.abspath(filename), 'rb')
 
450
 
 
451
    def get_file_lines(self, file_id, path=None):
478
452
        """See Tree.get_file_lines()"""
479
 
        file = self.get_file(file_id, path, filtered=filtered)
 
453
        file = self.get_file(file_id, path)
480
454
        try:
481
455
            return file.readlines()
482
456
        finally:
493
467
        incorrectly attributed to CURRENT_REVISION (but after committing, the
494
468
        attribution will be correct).
495
469
        """
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
 
470
        basis = self.basis_tree()
 
471
        basis.lock_read()
 
472
        try:
 
473
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
474
                require_versioned=True).next()
 
475
            changed_content, kind = changes[2], changes[6]
 
476
            if not changed_content:
 
477
                return basis.annotate_iter(file_id)
 
478
            if kind[1] is None:
 
479
                return None
 
480
            import annotate
 
481
            if kind[0] != 'file':
 
482
                old_lines = []
 
483
            else:
 
484
                old_lines = list(basis.annotate_iter(file_id))
 
485
            old = [old_lines]
 
486
            for tree in self.branch.repository.revision_trees(
 
487
                self.get_parent_ids()[1:]):
 
488
                if file_id not in tree:
 
489
                    continue
 
490
                old.append(list(tree.annotate_iter(file_id)))
 
491
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
492
                                       default_revision)
 
493
        finally:
 
494
            basis.unlock()
532
495
 
533
496
    def _get_ancestors(self, default_revision):
534
497
        ancestors = set([default_revision])
549
512
        else:
550
513
            parents = [last_rev]
551
514
        try:
552
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
515
            merges_file = self._transport.get('pending-merges')
553
516
        except errors.NoSuchFile:
554
517
            pass
555
518
        else:
556
 
            for l in osutils.split_lines(merges_bytes):
 
519
            for l in merges_file.readlines():
557
520
                revision_id = l.rstrip('\n')
558
521
                parents.append(revision_id)
559
522
        return parents
578
541
 
579
542
        revision
580
543
            If not None, the cloned tree will have its last revision set to
581
 
            revision, and difference between the source trees last revision
 
544
            revision, and and difference between the source trees last revision
582
545
            and this one merged in.
583
546
        """
584
547
        # assumes the target bzr dir format is compatible.
618
581
 
619
582
    def get_file_size(self, file_id):
620
583
        """See Tree.get_file_size"""
621
 
        # XXX: this returns the on-disk size; it should probably return the
622
 
        # canonical size
623
584
        try:
624
585
            return os.path.getsize(self.id2abspath(file_id))
625
586
        except OSError, e:
641
602
 
642
603
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
604
        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
605
        return self._inventory[file_id].executable
649
606
 
650
607
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
760
717
            raise
761
718
        kind = _mapper(stat_result.st_mode)
762
719
        if kind == 'file':
763
 
            return self._file_content_summary(path, stat_result)
 
720
            size = stat_result.st_size
 
721
            # try for a stat cache lookup
 
722
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
723
            return (kind, size, executable, self._sha_from_stat(
 
724
                path, stat_result))
764
725
        elif kind == 'directory':
765
726
            # perhaps it looks like a plain directory, but it's really a
766
727
            # reference.
768
729
                kind = 'tree-reference'
769
730
            return kind, None, None, None
770
731
        elif kind == 'symlink':
771
 
            target = osutils.readlink(abspath)
772
 
            return ('symlink', None, None, target)
 
732
            return ('symlink', None, None,
 
733
                    os.readlink(abspath.encode(osutils._fs_enc)
 
734
                                ).decode(osutils._fs_enc))
773
735
        else:
774
736
            return (kind, None, None, None)
775
737
 
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
738
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
739
        """Common ghost checking functionality from set_parent_*.
785
740
 
795
750
    def _set_merges_from_parent_ids(self, parent_ids):
796
751
        merges = parent_ids[1:]
797
752
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
798
 
            mode=self.bzrdir._get_file_mode())
 
753
            mode=self._control_files._file_mode)
799
754
 
800
755
    def _filter_parent_ids_by_ancestry(self, revision_ids):
801
756
        """Check that all merged revisions are proper 'heads'.
901
856
        self._must_be_locked()
902
857
        my_file = rio_file(stanzas, header)
903
858
        self._transport.put_file(filename, my_file,
904
 
            mode=self.bzrdir._get_file_mode())
 
859
            mode=self._control_files._file_mode)
905
860
 
906
861
    @needs_write_lock # because merge pulls data into the branch.
907
862
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
 
                          merge_type=None, force=False):
 
863
        merge_type=None):
909
864
        """Merge from a branch into this working tree.
910
865
 
911
866
        :param branch: The branch to merge from.
915
870
            branch.last_revision().
916
871
        """
917
872
        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()
 
873
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
874
        try:
 
875
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
876
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
877
            merger.pp.next_phase()
 
878
            # check that there are no
 
879
            # local alterations
 
880
            merger.check_basis(check_clean=True, require_commits=False)
 
881
            if to_revision is None:
 
882
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
883
            merger.other_rev_id = to_revision
 
884
            if _mod_revision.is_null(merger.other_rev_id):
 
885
                raise errors.NoCommits(branch)
 
886
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
887
            merger.other_basis = merger.other_rev_id
 
888
            merger.other_tree = self.branch.repository.revision_tree(
 
889
                merger.other_rev_id)
 
890
            merger.other_branch = branch
 
891
            merger.pp.next_phase()
 
892
            if from_revision is None:
 
893
                merger.find_base()
 
894
            else:
 
895
                merger.set_base_revision(from_revision, branch)
 
896
            if merger.base_rev_id == merger.other_rev_id:
 
897
                raise errors.PointlessMerge
 
898
            merger.backup_files = False
 
899
            if merge_type is None:
 
900
                merger.merge_type = Merge3Merger
 
901
            else:
 
902
                merger.merge_type = merge_type
 
903
            merger.set_interesting_files(None)
 
904
            merger.show_base = False
 
905
            merger.reprocess = False
 
906
            conflicts = merger.do_merge()
 
907
            merger.set_pending()
 
908
        finally:
 
909
            pb.finished()
948
910
        return conflicts
949
911
 
950
912
    @needs_read_lock
991
953
        return file_id
992
954
 
993
955
    def get_symlink_target(self, file_id):
994
 
        abspath = self.id2abspath(file_id)
995
 
        target = osutils.readlink(abspath)
996
 
        return target
 
956
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc))
997
957
 
998
958
    @needs_write_lock
999
959
    def subsume(self, other_tree):
1097
1057
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1058
        if tree_transport.base != branch_transport.base:
1099
1059
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1060
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1061
        else:
1103
1062
            tree_bzrdir = branch_bzrdir
1104
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1063
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1105
1064
        wt.set_parent_ids(self.get_parent_ids())
1106
1065
        my_inv = self.inventory
1107
 
        child_inv = inventory.Inventory(root_id=None)
 
1066
        child_inv = Inventory(root_id=None)
1108
1067
        new_root = my_inv[file_id]
1109
1068
        my_inv.remove_recursive_id(file_id)
1110
1069
        new_root.parent_id = None
1129
1088
        self._serialize(self._inventory, sio)
1130
1089
        sio.seek(0)
1131
1090
        self._transport.put_file('inventory', sio,
1132
 
            mode=self.bzrdir._get_file_mode())
 
1091
            mode=self._control_files._file_mode)
1133
1092
        self._inventory_is_modified = False
1134
1093
 
1135
1094
    def _kind(self, relpath):
1136
1095
        return osutils.file_kind(self.abspath(relpath))
1137
1096
 
1138
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1139
 
        """List all files as (path, class, kind, id, entry).
 
1097
    def list_files(self, include_root=False):
 
1098
        """Recursively list all files as (path, class, kind, id, entry).
1140
1099
 
1141
1100
        Lists, but does not descend into unversioned directories.
 
1101
 
1142
1102
        This does not include files that have been deleted in this
1143
 
        tree. Skips the control directory.
 
1103
        tree.
1144
1104
 
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
 
1105
        Skips the control directory.
1148
1106
        """
1149
1107
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1150
1108
        # with it. So callers should be careful to always read_lock the tree.
1152
1110
            raise errors.ObjectNotLocked(self)
1153
1111
 
1154
1112
        inv = self.inventory
1155
 
        if from_dir is None and include_root is True:
 
1113
        if include_root is True:
1156
1114
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1157
1115
        # Convert these into local objects to save lookup times
1158
1116
        pathjoin = osutils.pathjoin
1165
1123
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1166
1124
 
1167
1125
        # 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)
 
1126
        children = os.listdir(self.basedir)
1178
1127
        children.sort()
1179
1128
        # jam 20060527 The kernel sized tree seems equivalent whether we
1180
1129
        # use a deque and popleft to keep them sorted, or if we use a plain
1181
1130
        # list and just reverse() them.
1182
1131
        children = collections.deque(children)
1183
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1132
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1184
1133
        while stack:
1185
1134
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1186
1135
 
1244
1193
                if fk != 'directory':
1245
1194
                    continue
1246
1195
 
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
 
1196
                # But do this child first
 
1197
                new_children = os.listdir(fap)
 
1198
                new_children.sort()
 
1199
                new_children = collections.deque(new_children)
 
1200
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1201
                # Break out of inner loop,
 
1202
                # so that we start outer loop with child
 
1203
                break
1256
1204
            else:
1257
1205
                # if we finished all children, pop it off the stack
1258
1206
                stack.pop()
1436
1384
        inv = self.inventory
1437
1385
        for entry in moved:
1438
1386
            try:
1439
 
                self._move_entry(WorkingTree._RenameEntry(
1440
 
                    entry.to_rel, entry.from_id,
 
1387
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1441
1388
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1442
1389
                    entry.from_tail, entry.from_parent_id,
1443
1390
                    entry.only_change_inv))
1494
1441
        from_tail = splitpath(from_rel)[-1]
1495
1442
        from_id = inv.path2id(from_rel)
1496
1443
        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]
 
1444
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1445
                errors.NotVersionedError(path=str(from_rel)))
 
1446
        from_entry = inv[from_id]
1508
1447
        from_parent_id = from_entry.parent_id
1509
1448
        to_dir, to_tail = os.path.split(to_rel)
1510
1449
        to_dir_id = inv.path2id(to_dir)
1572
1511
        :raises: NoSuchId if any fileid is not currently versioned.
1573
1512
        """
1574
1513
        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
1514
            if self._inventory.has_id(file_id):
1579
1515
                self._inventory.remove_recursive_id(file_id)
 
1516
            else:
 
1517
                raise errors.NoSuchId(self, file_id)
1580
1518
        if len(file_ids):
1581
1519
            # in the future this should just set a dirty bit to wait for the
1582
1520
            # final unlock. However, until all methods of workingtree start
1601
1539
 
1602
1540
    @needs_write_lock
1603
1541
    def pull(self, source, overwrite=False, stop_revision=None,
1604
 
             change_reporter=None, possible_transports=None, local=False):
 
1542
             change_reporter=None, possible_transports=None):
 
1543
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1605
1544
        source.lock_read()
1606
1545
        try:
 
1546
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1547
            pp.next_phase()
1607
1548
            old_revision_info = self.branch.last_revision_info()
1608
1549
            basis_tree = self.basis_tree()
1609
1550
            count = self.branch.pull(source, overwrite, stop_revision,
1610
 
                                     possible_transports=possible_transports,
1611
 
                                     local=local)
 
1551
                                     possible_transports=possible_transports)
1612
1552
            new_revision_info = self.branch.last_revision_info()
1613
1553
            if new_revision_info != old_revision_info:
 
1554
                pp.next_phase()
1614
1555
                repository = self.branch.repository
 
1556
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1615
1557
                basis_tree.lock_read()
1616
1558
                try:
1617
1559
                    new_basis_tree = self.branch.basis_tree()
1620
1562
                                new_basis_tree,
1621
1563
                                basis_tree,
1622
1564
                                this_tree=self,
1623
 
                                pb=None,
 
1565
                                pb=pb,
1624
1566
                                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)
 
1567
                    if (basis_tree.inventory.root is None and
 
1568
                        new_basis_tree.inventory.root is not None):
 
1569
                        self.set_root_id(new_basis_tree.get_root_id())
1629
1570
                finally:
 
1571
                    pb.finished()
1630
1572
                    basis_tree.unlock()
1631
1573
                # TODO - dedup parents list with things merged by pull ?
1632
1574
                # reuse the revisiontree we merged against to set the new
1645
1587
            return count
1646
1588
        finally:
1647
1589
            source.unlock()
 
1590
            top_pb.finished()
1648
1591
 
1649
1592
    @needs_write_lock
1650
1593
    def put_file_bytes_non_atomic(self, file_id, bytes):
1676
1619
 
1677
1620
            fl = []
1678
1621
            for subf in os.listdir(dirabs):
1679
 
                if self.bzrdir.is_control_filename(subf):
 
1622
                if subf == '.bzr':
1680
1623
                    continue
1681
1624
                if subf not in dir_entry.children:
1682
1625
                    try:
1735
1678
        r"""Check whether the filename matches an ignore pattern.
1736
1679
 
1737
1680
        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.
 
1681
        others match against only the last component.
1741
1682
 
1742
1683
        If the file is ignored, returns the pattern which caused it to
1743
1684
        be ignored, otherwise None.  So this can simply be used as a
1744
1685
        boolean if desired."""
1745
1686
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1687
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1688
        return self._ignoreglobster.match(filename)
1748
1689
 
1749
1690
    def kind(self, file_id):
1799
1740
            raise errors.ObjectNotLocked(self)
1800
1741
 
1801
1742
    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
 
        """
 
1743
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1744
        if not self.is_locked():
1809
1745
            self._reset_data()
1810
1746
        self.branch.lock_read()
1811
1747
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1748
            return self._control_files.lock_read()
1814
1749
        except:
1815
1750
            self.branch.unlock()
1816
1751
            raise
1817
1752
 
1818
1753
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1754
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1755
        if not self.is_locked():
1824
1756
            self._reset_data()
1825
1757
        self.branch.lock_read()
1826
1758
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1759
            return self._control_files.lock_write()
1829
1760
        except:
1830
1761
            self.branch.unlock()
1831
1762
            raise
1832
1763
 
1833
1764
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1765
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1766
        if not self.is_locked():
1839
1767
            self._reset_data()
1840
1768
        self.branch.lock_write()
1841
1769
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1770
            return self._control_files.lock_write()
1844
1771
        except:
1845
1772
            self.branch.unlock()
1846
1773
            raise
1854
1781
    def _reset_data(self):
1855
1782
        """Reset transient data that cannot be revalidated."""
1856
1783
        self._inventory_is_modified = False
1857
 
        f = self._transport.get('inventory')
1858
 
        try:
1859
 
            result = self._deserialize(f)
1860
 
        finally:
1861
 
            f.close()
 
1784
        result = self._deserialize(self._transport.get('inventory'))
1862
1785
        self._set_inventory(result, dirty=False)
1863
1786
 
1864
1787
    @needs_tree_write_lock
1888
1811
        path = self._basis_inventory_name()
1889
1812
        sio = StringIO(xml)
1890
1813
        self._transport.put_file(path, sio,
1891
 
            mode=self.bzrdir._get_file_mode())
 
1814
            mode=self._control_files._file_mode)
1892
1815
 
1893
1816
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1894
1817
        """Create the text that will be saved in basis-inventory"""
1911
1834
            # revision_id is set. We must check for this full string, because a
1912
1835
            # root node id can legitimately look like 'revision_id' but cannot
1913
1836
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1837
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1838
            firstline = xml.split('\n', 1)[0]
1916
1839
            if (not 'revision_id="' in firstline or
1917
1840
                'format="7"' not in firstline):
1918
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1919
 
                    xml, new_revision)
 
1841
                inv = self.branch.repository.deserialise_inventory(
 
1842
                    new_revision, xml)
1920
1843
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1921
1844
            self._write_basis_inventory(xml)
1922
1845
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1940
1863
        # binary.
1941
1864
        if self._inventory_is_modified:
1942
1865
            raise errors.InventoryModified(self)
1943
 
        f = self._transport.get('inventory')
1944
 
        try:
1945
 
            result = self._deserialize(f)
1946
 
        finally:
1947
 
            f.close()
 
1866
        result = self._deserialize(self._transport.get('inventory'))
1948
1867
        self._set_inventory(result, dirty=False)
1949
1868
        return result
1950
1869
 
1965
1884
 
1966
1885
        new_files=set()
1967
1886
        unknown_nested_files=set()
1968
 
        if to_file is None:
1969
 
            to_file = sys.stdout
1970
1887
 
1971
1888
        def recurse_directory_to_add_files(directory):
1972
1889
            # Recurse directory and add all files
2028
1945
                        tree_delta.unversioned.extend((unknown_file,))
2029
1946
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2030
1947
 
2031
 
        # Build inv_delta and delete files where applicable,
 
1948
        # Build inv_delta and delete files where applicaple,
2032
1949
        # do this before any modifications to inventory.
2033
1950
        for f in files:
2034
1951
            fid = self.path2id(f)
2042
1959
                        new_status = 'I'
2043
1960
                    else:
2044
1961
                        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')
 
1962
                    textui.show_status(new_status, self.kind(fid), f,
 
1963
                                       to_file=to_file)
2048
1964
                # Unversion file
2049
1965
                inv_delta.append((f, None, fid, None))
2050
1966
                message = "removed %s" % (f,)
2073
1989
 
2074
1990
    @needs_tree_write_lock
2075
1991
    def revert(self, filenames=None, old_tree=None, backups=True,
2076
 
               pb=None, report_changes=False):
 
1992
               pb=DummyProgress(), report_changes=False):
2077
1993
        from bzrlib.conflicts import resolve
2078
1994
        if filenames == []:
2079
1995
            filenames = None
2092
2008
            if filenames is None and len(self.get_parent_ids()) > 1:
2093
2009
                parent_trees = []
2094
2010
                last_revision = self.last_revision()
2095
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2011
                if last_revision != NULL_REVISION:
2096
2012
                    if basis_tree is None:
2097
2013
                        basis_tree = self.basis_tree()
2098
2014
                        basis_tree.lock_read()
2136
2052
    def set_inventory(self, new_inventory_list):
2137
2053
        from bzrlib.inventory import (Inventory,
2138
2054
                                      InventoryDirectory,
 
2055
                                      InventoryEntry,
2139
2056
                                      InventoryFile,
2140
2057
                                      InventoryLink)
2141
2058
        inv = Inventory(self.get_root_id())
2201
2118
        """
2202
2119
        raise NotImplementedError(self.unlock)
2203
2120
 
2204
 
    _marker = object()
2205
 
 
2206
 
    def update(self, change_reporter=None, possible_transports=None,
2207
 
               revision=None, old_tip=_marker):
 
2121
    def update(self, change_reporter=None, possible_transports=None):
2208
2122
        """Update a working tree along its branch.
2209
2123
 
2210
2124
        This will update the branch if its bound too, which means we have
2228
2142
        - Merge current state -> basis tree of the master w.r.t. the old tree
2229
2143
          basis.
2230
2144
        - 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
2145
        """
2238
2146
        if self.branch.get_bound_location() is not None:
2239
2147
            self.lock_write()
2240
 
            update_branch = (old_tip is self._marker)
 
2148
            update_branch = True
2241
2149
        else:
2242
2150
            self.lock_tree_write()
2243
2151
            update_branch = False
2245
2153
            if update_branch:
2246
2154
                old_tip = self.branch.update(possible_transports)
2247
2155
            else:
2248
 
                if old_tip is self._marker:
2249
 
                    old_tip = None
2250
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2156
                old_tip = None
 
2157
            return self._update_tree(old_tip, change_reporter)
2251
2158
        finally:
2252
2159
            self.unlock()
2253
2160
 
2254
2161
    @needs_tree_write_lock
2255
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2162
    def _update_tree(self, old_tip=None, change_reporter=None):
2256
2163
        """Update a tree to the master branch.
2257
2164
 
2258
2165
        :param old_tip: if supplied, the previous tip revision the branch,
2268
2175
        # We MUST save it even if an error occurs, because otherwise the users
2269
2176
        # local work is unreferenced and will appear to have been lost.
2270
2177
        #
2271
 
        nb_conflicts = 0
 
2178
        result = 0
2272
2179
        try:
2273
2180
            last_rev = self.get_parent_ids()[0]
2274
2181
        except IndexError:
2275
2182
            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
 
 
 
2183
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2184
            # merge tree state up to new branch tip.
2300
2185
            basis = self.basis_tree()
2301
2186
            basis.lock_read()
2302
2187
            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)
 
2188
                to_tree = self.branch.basis_tree()
 
2189
                if basis.inventory.root is None:
 
2190
                    self.set_root_id(to_tree.get_root_id())
2306
2191
                    self.flush()
 
2192
                result += merge.merge_inner(
 
2193
                                      self.branch,
 
2194
                                      to_tree,
 
2195
                                      basis,
 
2196
                                      this_tree=self,
 
2197
                                      change_reporter=change_reporter)
2307
2198
            finally:
2308
2199
                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
2200
            # TODO - dedup parents list with things merged by pull ?
2321
2201
            # reuse the tree we've updated to to set the basis:
2322
 
            parent_trees = [(revision, to_tree)]
 
2202
            parent_trees = [(self.branch.last_revision(), to_tree)]
2323
2203
            merges = self.get_parent_ids()[1:]
2324
2204
            # 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
 
2205
            # tree can decide whether to give us teh entire tree or give us a
2326
2206
            # lazy initialised tree. dirstate for instance will have the trees
2327
2207
            # in ram already, whereas a last-revision + basis-inventory tree
2328
2208
            # will not, but also does not need them when setting parents.
2329
2209
            for parent in merges:
2330
2210
                parent_trees.append(
2331
2211
                    (parent, self.branch.repository.revision_tree(parent)))
2332
 
            if not _mod_revision.is_null(old_tip):
 
2212
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2333
2213
                parent_trees.append(
2334
2214
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2335
2215
            self.set_parent_trees(parent_trees)
2336
2216
            last_rev = parent_trees[0][0]
2337
 
        return nb_conflicts
 
2217
        else:
 
2218
            # the working tree had the same last-revision as the master
 
2219
            # branch did. We may still have pivot local work from the local
 
2220
            # branch into old_tip:
 
2221
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2222
                self.add_parent_tree_id(old_tip)
 
2223
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2224
            and old_tip != last_rev):
 
2225
            # our last revision was not the prior branch last revision
 
2226
            # and we have converted that last revision to a pending merge.
 
2227
            # base is somewhere between the branch tip now
 
2228
            # and the now pending merge
 
2229
 
 
2230
            # Since we just modified the working tree and inventory, flush out
 
2231
            # the current state, before we modify it again.
 
2232
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2233
            #       requires it only because TreeTransform directly munges the
 
2234
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2235
            #       should be able to remove this extra flush.
 
2236
            self.flush()
 
2237
            graph = self.branch.repository.get_graph()
 
2238
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2239
                                                old_tip)
 
2240
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2241
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2242
            result += merge.merge_inner(
 
2243
                                  self.branch,
 
2244
                                  other_tree,
 
2245
                                  base_tree,
 
2246
                                  this_tree=self,
 
2247
                                  change_reporter=change_reporter)
 
2248
        return result
2338
2249
 
2339
2250
    def _write_hashcache_if_dirty(self):
2340
2251
        """Write out the hashcache if it is dirty."""
2440
2351
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2441
2352
                        ('.bzr', '.bzr'))
2442
2353
                    if (bzrdir_loc < len(cur_disk_dir_content)
2443
 
                        and self.bzrdir.is_control_filename(
2444
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2354
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2445
2355
                        # we dont yield the contents of, or, .bzr itself.
2446
2356
                        del cur_disk_dir_content[bzrdir_loc]
2447
2357
            if inv_finished:
2581
2491
        return un_resolved, resolved
2582
2492
 
2583
2493
    @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
 
        """
 
2494
    def _check(self):
2591
2495
        tree_basis = self.basis_tree()
2592
2496
        tree_basis.lock_read()
2593
2497
        try:
2594
 
            repo_basis = references[('trees', self.last_revision())]
 
2498
            repo_basis = self.branch.repository.revision_tree(
 
2499
                self.last_revision())
2595
2500
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2596
2501
                raise errors.BzrCheckError(
2597
2502
                    "Mismatched basis inventory content.")
2610
2515
        """
2611
2516
        return
2612
2517
 
 
2518
    @needs_read_lock
2613
2519
    def _get_rules_searcher(self, default_searcher):
2614
2520
        """See Tree._get_rules_searcher."""
2615
2521
        if self._rules_searcher is None:
2642
2548
        if self._inventory is None:
2643
2549
            self.read_working_inventory()
2644
2550
 
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
2551
    def lock_tree_write(self):
2650
2552
        """See WorkingTree.lock_tree_write().
2651
2553
 
2652
2554
        In Format2 WorkingTrees we have a single lock for the branch and tree
2653
2555
        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
2556
        """
2658
2557
        self.branch.lock_write()
2659
2558
        try:
2660
 
            self._control_files.lock_write()
2661
 
            return self
 
2559
            return self._control_files.lock_write()
2662
2560
        except:
2663
2561
            self.branch.unlock()
2664
2562
            raise
2701
2599
 
2702
2600
    def _change_last_revision(self, revision_id):
2703
2601
        """See WorkingTree._change_last_revision."""
2704
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2602
        if revision_id is None or revision_id == NULL_REVISION:
2705
2603
            try:
2706
2604
                self._transport.delete('last-revision')
2707
2605
            except errors.NoSuchFile:
2709
2607
            return False
2710
2608
        else:
2711
2609
            self._transport.put_bytes('last-revision', revision_id,
2712
 
                mode=self.bzrdir._get_file_mode())
 
2610
                mode=self._control_files._file_mode)
2713
2611
            return True
2714
2612
 
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
2613
    @needs_tree_write_lock
2720
2614
    def set_conflicts(self, conflicts):
2721
2615
        self._put_rio('conflicts', conflicts.to_stanzas(),
2798
2692
        """Return the format for the working tree object in a_bzrdir."""
2799
2693
        try:
2800
2694
            transport = a_bzrdir.get_workingtree_transport(None)
2801
 
            format_string = transport.get_bytes("format")
 
2695
            format_string = transport.get("format").read()
2802
2696
            return klass._formats[format_string]
2803
2697
        except errors.NoSuchFile:
2804
2698
            raise errors.NoWorkingTree(base=transport.base)
2875
2769
        no working tree.  (See bug #43064).
2876
2770
        """
2877
2771
        sio = StringIO()
2878
 
        inv = inventory.Inventory()
 
2772
        inv = Inventory()
2879
2773
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2880
2774
        sio.seek(0)
2881
2775
        transport.put_file('inventory', sio, file_mode)
2897
2791
            branch.generate_revision_history(revision_id)
2898
2792
        finally:
2899
2793
            branch.unlock()
2900
 
        inv = inventory.Inventory()
 
2794
        inv = Inventory()
2901
2795
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2902
2796
                         branch,
2903
2797
                         inv,
2994
2888
        control_files.create_lock()
2995
2889
        control_files.lock_write()
2996
2890
        transport.put_bytes('format', self.get_format_string(),
2997
 
            mode=a_bzrdir._get_file_mode())
 
2891
            mode=control_files._file_mode)
2998
2892
        if from_branch is not None:
2999
2893
            branch = from_branch
3000
2894
        else:
3020
2914
            # only set an explicit root id if there is one to set.
3021
2915
            if basis_tree.inventory.root is not None:
3022
2916
                wt.set_root_id(basis_tree.get_root_id())
3023
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2917
            if revision_id == NULL_REVISION:
3024
2918
                wt.set_parent_trees([])
3025
2919
            else:
3026
2920
                wt.set_parent_trees([(revision_id, basis_tree)])
3033
2927
        return wt
3034
2928
 
3035
2929
    def _initial_inventory(self):
3036
 
        return inventory.Inventory()
 
2930
        return Inventory()
3037
2931
 
3038
2932
    def __init__(self):
3039
2933
        super(WorkingTreeFormat3, self).__init__()
3068
2962
        return self.get_format_string()
3069
2963
 
3070
2964
 
3071
 
__default_format = WorkingTreeFormat6()
 
2965
__default_format = WorkingTreeFormat4()
3072
2966
WorkingTreeFormat.register_format(__default_format)
3073
2967
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3074
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3075
2968
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3076
2969
WorkingTreeFormat.set_default_format(__default_format)
3077
2970
# formats which have no format string are not discoverable