/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: Ian Clatworthy
  • Date: 2009-03-16 13:16:44 UTC
  • mto: (4150.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 4151.
  • Revision ID: ian.clatworthy@canonical.com-20090316131644-r7kevoidcxw30i8d
faster check

Show diffs side-by-side

added added

removed removed

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