/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

Fix 1 more lock-related test failure.

* tests/test_rename_map.py:
(TestRenameMap.test_guess_renames_preserves_children): Add the
forgotten unlock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
42
48
import itertools
43
49
import operator
44
50
import stat
 
51
from time import time
 
52
import warnings
45
53
import re
46
54
 
47
55
import bzrlib
49
57
    branch,
50
58
    bzrdir,
51
59
    conflicts as _mod_conflicts,
 
60
    dirstate,
52
61
    errors,
53
62
    generate_ids,
54
63
    globbing,
55
 
    graph as _mod_graph,
56
64
    hashcache,
57
65
    ignores,
58
 
    inventory,
59
66
    merge,
60
67
    revision as _mod_revision,
61
68
    revisiontree,
 
69
    repository,
 
70
    textui,
62
71
    trace,
63
72
    transform,
64
73
    ui,
 
74
    urlutils,
65
75
    views,
66
76
    xml5,
 
77
    xml6,
67
78
    xml7,
68
79
    )
69
80
import bzrlib.branch
70
81
from bzrlib.transport import get_transport
 
82
import bzrlib.ui
71
83
from bzrlib.workingtree_4 import (
72
84
    WorkingTreeFormat4,
73
85
    WorkingTreeFormat5,
77
89
 
78
90
from bzrlib import symbol_versioning
79
91
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
 
from bzrlib.lock import LogicalLockResult
 
92
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
81
93
from bzrlib.lockable_files import LockableFiles
82
94
from bzrlib.lockdir import LockDir
83
95
import bzrlib.mutabletree
84
96
from bzrlib.mutabletree import needs_tree_write_lock
85
97
from bzrlib import osutils
86
98
from bzrlib.osutils import (
 
99
    compact_date,
87
100
    file_kind,
88
101
    isdir,
89
102
    normpath,
90
103
    pathjoin,
 
104
    rand_chars,
91
105
    realpath,
92
106
    safe_unicode,
93
107
    splitpath,
96
110
from bzrlib.filters import filtered_input_file
97
111
from bzrlib.trace import mutter, note
98
112
from bzrlib.transport.local import LocalTransport
99
 
from bzrlib.revision import CURRENT_REVISION
 
113
from bzrlib.progress import DummyProgress, ProgressPhase
 
114
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
100
115
from bzrlib.rio import RioReader, rio_file, Stanza
101
 
from bzrlib.symbol_versioning import (
102
 
    deprecated_passed,
103
 
    DEPRECATED_PARAMETER,
104
 
    )
 
116
from bzrlib.symbol_versioning import (deprecated_passed,
 
117
        deprecated_method,
 
118
        deprecated_function,
 
119
        DEPRECATED_PARAMETER,
 
120
        )
105
121
 
106
122
 
107
123
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
124
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
125
 
113
126
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
181
        return ''
169
182
 
170
183
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
184
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
185
    """Working copy tree.
174
186
 
175
187
    The inventory is held in the `Branch` working-inventory, and the
248
260
        self._rules_searcher = None
249
261
        self.views = self._make_views()
250
262
 
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
263
    def _detect_case_handling(self):
260
264
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
265
        try:
286
290
        self._control_files.break_lock()
287
291
        self.branch.break_lock()
288
292
 
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
293
    def requires_rich_root(self):
300
294
        return self._format.requires_rich_root
301
295
 
452
446
 
453
447
    def get_file_with_stat(self, file_id, path=None, filtered=True,
454
448
        _fstat=os.fstat):
455
 
        """See Tree.get_file_with_stat."""
 
449
        """See MutableTree.get_file_with_stat."""
456
450
        if path is None:
457
451
            path = self.id2path(file_id)
458
452
        file_obj = self.get_file_byname(path, filtered=False)
459
453
        stat_value = _fstat(file_obj.fileno())
460
 
        if filtered and self.supports_content_filtering():
 
454
        if self.supports_content_filtering() and filtered:
461
455
            filters = self._content_filter_stack(path)
462
456
            file_obj = filtered_input_file(file_obj, filters)
463
457
        return (file_obj, stat_value)
468
462
    def get_file_byname(self, filename, filtered=True):
469
463
        path = self.abspath(filename)
470
464
        f = file(path, 'rb')
471
 
        if filtered and self.supports_content_filtering():
 
465
        if self.supports_content_filtering() and filtered:
472
466
            filters = self._content_filter_stack(filename)
473
467
            return filtered_input_file(f, filters)
474
468
        else:
493
487
        incorrectly attributed to CURRENT_REVISION (but after committing, the
494
488
        attribution will be correct).
495
489
        """
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
 
490
        basis = self.basis_tree()
 
491
        basis.lock_read()
 
492
        try:
 
493
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
494
                require_versioned=True).next()
 
495
            changed_content, kind = changes[2], changes[6]
 
496
            if not changed_content:
 
497
                return basis.annotate_iter(file_id)
 
498
            if kind[1] is None:
 
499
                return None
 
500
            import annotate
 
501
            if kind[0] != 'file':
 
502
                old_lines = []
 
503
            else:
 
504
                old_lines = list(basis.annotate_iter(file_id))
 
505
            old = [old_lines]
 
506
            for tree in self.branch.repository.revision_trees(
 
507
                self.get_parent_ids()[1:]):
 
508
                if file_id not in tree:
 
509
                    continue
 
510
                old.append(list(tree.annotate_iter(file_id)))
 
511
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
512
                                       default_revision)
 
513
        finally:
 
514
            basis.unlock()
532
515
 
533
516
    def _get_ancestors(self, default_revision):
534
517
        ancestors = set([default_revision])
549
532
        else:
550
533
            parents = [last_rev]
551
534
        try:
552
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
535
            merges_file = self._transport.get('pending-merges')
553
536
        except errors.NoSuchFile:
554
537
            pass
555
538
        else:
556
 
            for l in osutils.split_lines(merges_bytes):
 
539
            for l in merges_file.readlines():
557
540
                revision_id = l.rstrip('\n')
558
541
                parents.append(revision_id)
559
542
        return parents
618
601
 
619
602
    def get_file_size(self, file_id):
620
603
        """See Tree.get_file_size"""
621
 
        # XXX: this returns the on-disk size; it should probably return the
622
 
        # canonical size
623
604
        try:
624
605
            return os.path.getsize(self.id2abspath(file_id))
625
606
        except OSError, e:
641
622
 
642
623
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
624
        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
625
        return self._inventory[file_id].executable
649
626
 
650
627
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
760
737
            raise
761
738
        kind = _mapper(stat_result.st_mode)
762
739
        if kind == 'file':
763
 
            return self._file_content_summary(path, stat_result)
 
740
            size = stat_result.st_size
 
741
            # try for a stat cache lookup
 
742
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
743
            return (kind, size, executable, self._sha_from_stat(
 
744
                path, stat_result))
764
745
        elif kind == 'directory':
765
746
            # perhaps it looks like a plain directory, but it's really a
766
747
            # reference.
768
749
                kind = 'tree-reference'
769
750
            return kind, None, None, None
770
751
        elif kind == 'symlink':
771
 
            target = osutils.readlink(abspath)
772
 
            return ('symlink', None, None, target)
 
752
            return ('symlink', None, None,
 
753
                    os.readlink(abspath.encode(osutils._fs_enc)
 
754
                                ).decode(osutils._fs_enc))
773
755
        else:
774
756
            return (kind, None, None, None)
775
757
 
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
758
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
759
        """Common ghost checking functionality from set_parent_*.
785
760
 
905
880
 
906
881
    @needs_write_lock # because merge pulls data into the branch.
907
882
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
 
                          merge_type=None, force=False):
 
883
        merge_type=None):
909
884
        """Merge from a branch into this working tree.
910
885
 
911
886
        :param branch: The branch to merge from.
915
890
            branch.last_revision().
916
891
        """
917
892
        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()
 
893
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
894
        try:
 
895
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
896
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
897
            merger.pp.next_phase()
 
898
            # check that there are no
 
899
            # local alterations
 
900
            merger.check_basis(check_clean=True, require_commits=False)
 
901
            if to_revision is None:
 
902
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
903
            merger.other_rev_id = to_revision
 
904
            if _mod_revision.is_null(merger.other_rev_id):
 
905
                raise errors.NoCommits(branch)
 
906
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
907
            merger.other_basis = merger.other_rev_id
 
908
            merger.other_tree = self.branch.repository.revision_tree(
 
909
                merger.other_rev_id)
 
910
            merger.other_branch = branch
 
911
            merger.pp.next_phase()
 
912
            if from_revision is None:
 
913
                merger.find_base()
 
914
            else:
 
915
                merger.set_base_revision(from_revision, branch)
 
916
            if merger.base_rev_id == merger.other_rev_id:
 
917
                raise errors.PointlessMerge
 
918
            merger.backup_files = False
 
919
            if merge_type is None:
 
920
                merger.merge_type = Merge3Merger
 
921
            else:
 
922
                merger.merge_type = merge_type
 
923
            merger.set_interesting_files(None)
 
924
            merger.show_base = False
 
925
            merger.reprocess = False
 
926
            conflicts = merger.do_merge()
 
927
            merger.set_pending()
 
928
        finally:
 
929
            pb.finished()
948
930
        return conflicts
949
931
 
950
932
    @needs_read_lock
991
973
        return file_id
992
974
 
993
975
    def get_symlink_target(self, file_id):
994
 
        abspath = self.id2abspath(file_id)
995
 
        target = osutils.readlink(abspath)
996
 
        return target
 
976
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc)
 
977
            ).decode(osutils._fs_enc)
997
978
 
998
979
    @needs_write_lock
999
980
    def subsume(self, other_tree):
1097
1078
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1079
        if tree_transport.base != branch_transport.base:
1099
1080
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1081
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1082
        else:
1103
1083
            tree_bzrdir = branch_bzrdir
1104
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1084
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1105
1085
        wt.set_parent_ids(self.get_parent_ids())
1106
1086
        my_inv = self.inventory
1107
 
        child_inv = inventory.Inventory(root_id=None)
 
1087
        child_inv = Inventory(root_id=None)
1108
1088
        new_root = my_inv[file_id]
1109
1089
        my_inv.remove_recursive_id(file_id)
1110
1090
        new_root.parent_id = None
1135
1115
    def _kind(self, relpath):
1136
1116
        return osutils.file_kind(self.abspath(relpath))
1137
1117
 
1138
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1139
 
        """List all files as (path, class, kind, id, entry).
 
1118
    def list_files(self, include_root=False):
 
1119
        """Recursively list all files as (path, class, kind, id, entry).
1140
1120
 
1141
1121
        Lists, but does not descend into unversioned directories.
 
1122
 
1142
1123
        This does not include files that have been deleted in this
1143
 
        tree. Skips the control directory.
 
1124
        tree.
1144
1125
 
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
 
1126
        Skips the control directory.
1148
1127
        """
1149
1128
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1150
1129
        # with it. So callers should be careful to always read_lock the tree.
1152
1131
            raise errors.ObjectNotLocked(self)
1153
1132
 
1154
1133
        inv = self.inventory
1155
 
        if from_dir is None and include_root is True:
 
1134
        if include_root is True:
1156
1135
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1157
1136
        # Convert these into local objects to save lookup times
1158
1137
        pathjoin = osutils.pathjoin
1165
1144
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1166
1145
 
1167
1146
        # 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)
 
1147
        children = os.listdir(self.basedir)
1178
1148
        children.sort()
1179
1149
        # jam 20060527 The kernel sized tree seems equivalent whether we
1180
1150
        # use a deque and popleft to keep them sorted, or if we use a plain
1181
1151
        # list and just reverse() them.
1182
1152
        children = collections.deque(children)
1183
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1153
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1184
1154
        while stack:
1185
1155
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1186
1156
 
1244
1214
                if fk != 'directory':
1245
1215
                    continue
1246
1216
 
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
 
1217
                # But do this child first
 
1218
                new_children = os.listdir(fap)
 
1219
                new_children.sort()
 
1220
                new_children = collections.deque(new_children)
 
1221
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1222
                # Break out of inner loop,
 
1223
                # so that we start outer loop with child
 
1224
                break
1256
1225
            else:
1257
1226
                # if we finished all children, pop it off the stack
1258
1227
                stack.pop()
1436
1405
        inv = self.inventory
1437
1406
        for entry in moved:
1438
1407
            try:
1439
 
                self._move_entry(WorkingTree._RenameEntry(
1440
 
                    entry.to_rel, entry.from_id,
 
1408
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1441
1409
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1442
1410
                    entry.from_tail, entry.from_parent_id,
1443
1411
                    entry.only_change_inv))
1494
1462
        from_tail = splitpath(from_rel)[-1]
1495
1463
        from_id = inv.path2id(from_rel)
1496
1464
        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]
 
1465
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1466
                errors.NotVersionedError(path=str(from_rel)))
 
1467
        from_entry = inv[from_id]
1508
1468
        from_parent_id = from_entry.parent_id
1509
1469
        to_dir, to_tail = os.path.split(to_rel)
1510
1470
        to_dir_id = inv.path2id(to_dir)
1601
1561
 
1602
1562
    @needs_write_lock
1603
1563
    def pull(self, source, overwrite=False, stop_revision=None,
1604
 
             change_reporter=None, possible_transports=None, local=False):
 
1564
             change_reporter=None, possible_transports=None):
 
1565
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1605
1566
        source.lock_read()
1606
1567
        try:
 
1568
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1569
            pp.next_phase()
1607
1570
            old_revision_info = self.branch.last_revision_info()
1608
1571
            basis_tree = self.basis_tree()
1609
1572
            count = self.branch.pull(source, overwrite, stop_revision,
1610
 
                                     possible_transports=possible_transports,
1611
 
                                     local=local)
 
1573
                                     possible_transports=possible_transports)
1612
1574
            new_revision_info = self.branch.last_revision_info()
1613
1575
            if new_revision_info != old_revision_info:
 
1576
                pp.next_phase()
1614
1577
                repository = self.branch.repository
 
1578
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1615
1579
                basis_tree.lock_read()
1616
1580
                try:
1617
1581
                    new_basis_tree = self.branch.basis_tree()
1620
1584
                                new_basis_tree,
1621
1585
                                basis_tree,
1622
1586
                                this_tree=self,
1623
 
                                pb=None,
 
1587
                                pb=pb,
1624
1588
                                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)
 
1589
                    if (basis_tree.inventory.root is None and
 
1590
                        new_basis_tree.inventory.root is not None):
 
1591
                        self.set_root_id(new_basis_tree.get_root_id())
1629
1592
                finally:
 
1593
                    pb.finished()
1630
1594
                    basis_tree.unlock()
1631
1595
                # TODO - dedup parents list with things merged by pull ?
1632
1596
                # reuse the revisiontree we merged against to set the new
1645
1609
            return count
1646
1610
        finally:
1647
1611
            source.unlock()
 
1612
            top_pb.finished()
1648
1613
 
1649
1614
    @needs_write_lock
1650
1615
    def put_file_bytes_non_atomic(self, file_id, bytes):
1676
1641
 
1677
1642
            fl = []
1678
1643
            for subf in os.listdir(dirabs):
1679
 
                if self.bzrdir.is_control_filename(subf):
 
1644
                if subf == '.bzr':
1680
1645
                    continue
1681
1646
                if subf not in dir_entry.children:
1682
1647
                    try:
1735
1700
        r"""Check whether the filename matches an ignore pattern.
1736
1701
 
1737
1702
        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.
 
1703
        others match against only the last component.
1741
1704
 
1742
1705
        If the file is ignored, returns the pattern which caused it to
1743
1706
        be ignored, otherwise None.  So this can simply be used as a
1744
1707
        boolean if desired."""
1745
1708
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1709
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1710
        return self._ignoreglobster.match(filename)
1748
1711
 
1749
1712
    def kind(self, file_id):
1799
1762
            raise errors.ObjectNotLocked(self)
1800
1763
 
1801
1764
    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
 
        """
 
1765
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1766
        if not self.is_locked():
1809
1767
            self._reset_data()
1810
1768
        self.branch.lock_read()
1811
1769
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1770
            return self._control_files.lock_read()
1814
1771
        except:
1815
1772
            self.branch.unlock()
1816
1773
            raise
1817
1774
 
1818
1775
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1776
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1777
        if not self.is_locked():
1824
1778
            self._reset_data()
1825
1779
        self.branch.lock_read()
1826
1780
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1781
            return self._control_files.lock_write()
1829
1782
        except:
1830
1783
            self.branch.unlock()
1831
1784
            raise
1832
1785
 
1833
1786
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1787
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1788
        if not self.is_locked():
1839
1789
            self._reset_data()
1840
1790
        self.branch.lock_write()
1841
1791
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1792
            return self._control_files.lock_write()
1844
1793
        except:
1845
1794
            self.branch.unlock()
1846
1795
            raise
1854
1803
    def _reset_data(self):
1855
1804
        """Reset transient data that cannot be revalidated."""
1856
1805
        self._inventory_is_modified = False
1857
 
        f = self._transport.get('inventory')
1858
 
        try:
1859
 
            result = self._deserialize(f)
1860
 
        finally:
1861
 
            f.close()
 
1806
        result = self._deserialize(self._transport.get('inventory'))
1862
1807
        self._set_inventory(result, dirty=False)
1863
1808
 
1864
1809
    @needs_tree_write_lock
1911
1856
            # revision_id is set. We must check for this full string, because a
1912
1857
            # root node id can legitimately look like 'revision_id' but cannot
1913
1858
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1859
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1860
            firstline = xml.split('\n', 1)[0]
1916
1861
            if (not 'revision_id="' in firstline or
1917
1862
                'format="7"' not in firstline):
1918
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1919
 
                    xml, new_revision)
 
1863
                inv = self.branch.repository.deserialise_inventory(
 
1864
                    new_revision, xml)
1920
1865
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1921
1866
            self._write_basis_inventory(xml)
1922
1867
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1940
1885
        # binary.
1941
1886
        if self._inventory_is_modified:
1942
1887
            raise errors.InventoryModified(self)
1943
 
        f = self._transport.get('inventory')
1944
 
        try:
1945
 
            result = self._deserialize(f)
1946
 
        finally:
1947
 
            f.close()
 
1888
        result = self._deserialize(self._transport.get('inventory'))
1948
1889
        self._set_inventory(result, dirty=False)
1949
1890
        return result
1950
1891
 
1965
1906
 
1966
1907
        new_files=set()
1967
1908
        unknown_nested_files=set()
1968
 
        if to_file is None:
1969
 
            to_file = sys.stdout
1970
1909
 
1971
1910
        def recurse_directory_to_add_files(directory):
1972
1911
            # Recurse directory and add all files
2042
1981
                        new_status = 'I'
2043
1982
                    else:
2044
1983
                        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')
 
1984
                    textui.show_status(new_status, self.kind(fid), f,
 
1985
                                       to_file=to_file)
2048
1986
                # Unversion file
2049
1987
                inv_delta.append((f, None, fid, None))
2050
1988
                message = "removed %s" % (f,)
2073
2011
 
2074
2012
    @needs_tree_write_lock
2075
2013
    def revert(self, filenames=None, old_tree=None, backups=True,
2076
 
               pb=None, report_changes=False):
 
2014
               pb=DummyProgress(), report_changes=False):
2077
2015
        from bzrlib.conflicts import resolve
2078
2016
        if filenames == []:
2079
2017
            filenames = None
2092
2030
            if filenames is None and len(self.get_parent_ids()) > 1:
2093
2031
                parent_trees = []
2094
2032
                last_revision = self.last_revision()
2095
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2033
                if last_revision != NULL_REVISION:
2096
2034
                    if basis_tree is None:
2097
2035
                        basis_tree = self.basis_tree()
2098
2036
                        basis_tree.lock_read()
2136
2074
    def set_inventory(self, new_inventory_list):
2137
2075
        from bzrlib.inventory import (Inventory,
2138
2076
                                      InventoryDirectory,
 
2077
                                      InventoryEntry,
2139
2078
                                      InventoryFile,
2140
2079
                                      InventoryLink)
2141
2080
        inv = Inventory(self.get_root_id())
2201
2140
        """
2202
2141
        raise NotImplementedError(self.unlock)
2203
2142
 
2204
 
    _marker = object()
2205
 
 
2206
 
    def update(self, change_reporter=None, possible_transports=None,
2207
 
               revision=None, old_tip=_marker):
 
2143
    def update(self, change_reporter=None, possible_transports=None):
2208
2144
        """Update a working tree along its branch.
2209
2145
 
2210
2146
        This will update the branch if its bound too, which means we have
2228
2164
        - Merge current state -> basis tree of the master w.r.t. the old tree
2229
2165
          basis.
2230
2166
        - 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
2167
        """
2238
2168
        if self.branch.get_bound_location() is not None:
2239
2169
            self.lock_write()
2240
 
            update_branch = (old_tip is self._marker)
 
2170
            update_branch = True
2241
2171
        else:
2242
2172
            self.lock_tree_write()
2243
2173
            update_branch = False
2245
2175
            if update_branch:
2246
2176
                old_tip = self.branch.update(possible_transports)
2247
2177
            else:
2248
 
                if old_tip is self._marker:
2249
 
                    old_tip = None
2250
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2178
                old_tip = None
 
2179
            return self._update_tree(old_tip, change_reporter)
2251
2180
        finally:
2252
2181
            self.unlock()
2253
2182
 
2254
2183
    @needs_tree_write_lock
2255
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2184
    def _update_tree(self, old_tip=None, change_reporter=None):
2256
2185
        """Update a tree to the master branch.
2257
2186
 
2258
2187
        :param old_tip: if supplied, the previous tip revision the branch,
2268
2197
        # We MUST save it even if an error occurs, because otherwise the users
2269
2198
        # local work is unreferenced and will appear to have been lost.
2270
2199
        #
2271
 
        nb_conflicts = 0
 
2200
        result = 0
2272
2201
        try:
2273
2202
            last_rev = self.get_parent_ids()[0]
2274
2203
        except IndexError:
2275
2204
            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
 
 
 
2205
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2206
            # merge tree state up to new branch tip.
2300
2207
            basis = self.basis_tree()
2301
2208
            basis.lock_read()
2302
2209
            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)
 
2210
                to_tree = self.branch.basis_tree()
 
2211
                if basis.inventory.root is None:
 
2212
                    self.set_root_id(to_tree.get_root_id())
2306
2213
                    self.flush()
 
2214
                result += merge.merge_inner(
 
2215
                                      self.branch,
 
2216
                                      to_tree,
 
2217
                                      basis,
 
2218
                                      this_tree=self,
 
2219
                                      change_reporter=change_reporter)
2307
2220
            finally:
2308
2221
                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
2222
            # TODO - dedup parents list with things merged by pull ?
2321
2223
            # reuse the tree we've updated to to set the basis:
2322
 
            parent_trees = [(revision, to_tree)]
 
2224
            parent_trees = [(self.branch.last_revision(), to_tree)]
2323
2225
            merges = self.get_parent_ids()[1:]
2324
2226
            # Ideally we ask the tree for the trees here, that way the working
2325
2227
            # tree can decide whether to give us the entire tree or give us a
2329
2231
            for parent in merges:
2330
2232
                parent_trees.append(
2331
2233
                    (parent, self.branch.repository.revision_tree(parent)))
2332
 
            if not _mod_revision.is_null(old_tip):
 
2234
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2333
2235
                parent_trees.append(
2334
2236
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2335
2237
            self.set_parent_trees(parent_trees)
2336
2238
            last_rev = parent_trees[0][0]
2337
 
        return nb_conflicts
 
2239
        else:
 
2240
            # the working tree had the same last-revision as the master
 
2241
            # branch did. We may still have pivot local work from the local
 
2242
            # branch into old_tip:
 
2243
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2244
                self.add_parent_tree_id(old_tip)
 
2245
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2246
            and old_tip != last_rev):
 
2247
            # our last revision was not the prior branch last revision
 
2248
            # and we have converted that last revision to a pending merge.
 
2249
            # base is somewhere between the branch tip now
 
2250
            # and the now pending merge
 
2251
 
 
2252
            # Since we just modified the working tree and inventory, flush out
 
2253
            # the current state, before we modify it again.
 
2254
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2255
            #       requires it only because TreeTransform directly munges the
 
2256
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2257
            #       should be able to remove this extra flush.
 
2258
            self.flush()
 
2259
            graph = self.branch.repository.get_graph()
 
2260
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2261
                                                old_tip)
 
2262
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2263
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2264
            result += merge.merge_inner(
 
2265
                                  self.branch,
 
2266
                                  other_tree,
 
2267
                                  base_tree,
 
2268
                                  this_tree=self,
 
2269
                                  change_reporter=change_reporter)
 
2270
        return result
2338
2271
 
2339
2272
    def _write_hashcache_if_dirty(self):
2340
2273
        """Write out the hashcache if it is dirty."""
2440
2373
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2441
2374
                        ('.bzr', '.bzr'))
2442
2375
                    if (bzrdir_loc < len(cur_disk_dir_content)
2443
 
                        and self.bzrdir.is_control_filename(
2444
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2376
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2445
2377
                        # we dont yield the contents of, or, .bzr itself.
2446
2378
                        del cur_disk_dir_content[bzrdir_loc]
2447
2379
            if inv_finished:
2581
2513
        return un_resolved, resolved
2582
2514
 
2583
2515
    @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
 
        """
 
2516
    def _check(self):
2591
2517
        tree_basis = self.basis_tree()
2592
2518
        tree_basis.lock_read()
2593
2519
        try:
2594
 
            repo_basis = references[('trees', self.last_revision())]
 
2520
            repo_basis = self.branch.repository.revision_tree(
 
2521
                self.last_revision())
2595
2522
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2596
2523
                raise errors.BzrCheckError(
2597
2524
                    "Mismatched basis inventory content.")
2610
2537
        """
2611
2538
        return
2612
2539
 
 
2540
    @needs_read_lock
2613
2541
    def _get_rules_searcher(self, default_searcher):
2614
2542
        """See Tree._get_rules_searcher."""
2615
2543
        if self._rules_searcher is None:
2642
2570
        if self._inventory is None:
2643
2571
            self.read_working_inventory()
2644
2572
 
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
2573
    def lock_tree_write(self):
2650
2574
        """See WorkingTree.lock_tree_write().
2651
2575
 
2652
2576
        In Format2 WorkingTrees we have a single lock for the branch and tree
2653
2577
        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
2578
        """
2658
2579
        self.branch.lock_write()
2659
2580
        try:
2660
 
            self._control_files.lock_write()
2661
 
            return self
 
2581
            return self._control_files.lock_write()
2662
2582
        except:
2663
2583
            self.branch.unlock()
2664
2584
            raise
2701
2621
 
2702
2622
    def _change_last_revision(self, revision_id):
2703
2623
        """See WorkingTree._change_last_revision."""
2704
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2624
        if revision_id is None or revision_id == NULL_REVISION:
2705
2625
            try:
2706
2626
                self._transport.delete('last-revision')
2707
2627
            except errors.NoSuchFile:
2712
2632
                mode=self.bzrdir._get_file_mode())
2713
2633
            return True
2714
2634
 
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
2635
    @needs_tree_write_lock
2720
2636
    def set_conflicts(self, conflicts):
2721
2637
        self._put_rio('conflicts', conflicts.to_stanzas(),
2798
2714
        """Return the format for the working tree object in a_bzrdir."""
2799
2715
        try:
2800
2716
            transport = a_bzrdir.get_workingtree_transport(None)
2801
 
            format_string = transport.get_bytes("format")
 
2717
            format_string = transport.get("format").read()
2802
2718
            return klass._formats[format_string]
2803
2719
        except errors.NoSuchFile:
2804
2720
            raise errors.NoWorkingTree(base=transport.base)
2875
2791
        no working tree.  (See bug #43064).
2876
2792
        """
2877
2793
        sio = StringIO()
2878
 
        inv = inventory.Inventory()
 
2794
        inv = Inventory()
2879
2795
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2880
2796
        sio.seek(0)
2881
2797
        transport.put_file('inventory', sio, file_mode)
2897
2813
            branch.generate_revision_history(revision_id)
2898
2814
        finally:
2899
2815
            branch.unlock()
2900
 
        inv = inventory.Inventory()
 
2816
        inv = Inventory()
2901
2817
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2902
2818
                         branch,
2903
2819
                         inv,
3020
2936
            # only set an explicit root id if there is one to set.
3021
2937
            if basis_tree.inventory.root is not None:
3022
2938
                wt.set_root_id(basis_tree.get_root_id())
3023
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2939
            if revision_id == NULL_REVISION:
3024
2940
                wt.set_parent_trees([])
3025
2941
            else:
3026
2942
                wt.set_parent_trees([(revision_id, basis_tree)])
3033
2949
        return wt
3034
2950
 
3035
2951
    def _initial_inventory(self):
3036
 
        return inventory.Inventory()
 
2952
        return Inventory()
3037
2953
 
3038
2954
    def __init__(self):
3039
2955
        super(WorkingTreeFormat3, self).__init__()
3068
2984
        return self.get_format_string()
3069
2985
 
3070
2986
 
3071
 
__default_format = WorkingTreeFormat6()
 
2987
__default_format = WorkingTreeFormat4()
3072
2988
WorkingTreeFormat.register_format(__default_format)
 
2989
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3073
2990
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3074
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3075
2991
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3076
2992
WorkingTreeFormat.set_default_format(__default_format)
3077
2993
# formats which have no format string are not discoverable