/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

merge bzr.dev r4042

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,
95
106
from bzrlib.filters import filtered_input_file
96
107
from bzrlib.trace import mutter, note
97
108
from bzrlib.transport.local import LocalTransport
98
 
from bzrlib.revision import CURRENT_REVISION
 
109
from bzrlib.progress import DummyProgress, ProgressPhase
 
110
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
111
from bzrlib.rio import RioReader, rio_file, Stanza
100
 
from bzrlib.symbol_versioning import (
101
 
    deprecated_passed,
102
 
    DEPRECATED_PARAMETER,
103
 
    )
 
112
from bzrlib.symbol_versioning import (deprecated_passed,
 
113
        deprecated_method,
 
114
        deprecated_function,
 
115
        DEPRECATED_PARAMETER,
 
116
        )
104
117
 
105
118
 
106
119
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
120
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
121
 
112
122
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
177
        return ''
168
178
 
169
179
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
180
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
181
    """Working copy tree.
173
182
 
174
183
    The inventory is held in the `Branch` working-inventory, and the
247
256
        self._rules_searcher = None
248
257
        self.views = self._make_views()
249
258
 
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
259
    def _detect_case_handling(self):
259
260
        wt_trans = self.bzrdir.get_workingtree_transport(None)
260
261
        try:
285
286
        self._control_files.break_lock()
286
287
        self.branch.break_lock()
287
288
 
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
289
    def requires_rich_root(self):
299
290
        return self._format.requires_rich_root
300
291
 
424
415
            return self.branch.repository.revision_tree(revision_id)
425
416
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
426
417
            # 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
 
418
            # occured. If the revision is present, its a problem, if its not
428
419
            # its a ghost.
429
420
            if self.branch.repository.has_revision(revision_id):
430
421
                raise
451
442
 
452
443
    def get_file_with_stat(self, file_id, path=None, filtered=True,
453
444
        _fstat=os.fstat):
454
 
        """See Tree.get_file_with_stat."""
 
445
        """See MutableTree.get_file_with_stat."""
455
446
        if path is None:
456
447
            path = self.id2path(file_id)
457
448
        file_obj = self.get_file_byname(path, filtered=False)
458
449
        stat_value = _fstat(file_obj.fileno())
459
 
        if filtered and self.supports_content_filtering():
 
450
        if self.supports_content_filtering() and filtered:
460
451
            filters = self._content_filter_stack(path)
461
452
            file_obj = filtered_input_file(file_obj, filters)
462
453
        return (file_obj, stat_value)
467
458
    def get_file_byname(self, filename, filtered=True):
468
459
        path = self.abspath(filename)
469
460
        f = file(path, 'rb')
470
 
        if filtered and self.supports_content_filtering():
 
461
        if self.supports_content_filtering() and filtered:
471
462
            filters = self._content_filter_stack(filename)
472
463
            return filtered_input_file(f, filters)
473
464
        else:
492
483
        incorrectly attributed to CURRENT_REVISION (but after committing, the
493
484
        attribution will be correct).
494
485
        """
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
 
486
        basis = self.basis_tree()
 
487
        basis.lock_read()
 
488
        try:
 
489
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
490
                require_versioned=True).next()
 
491
            changed_content, kind = changes[2], changes[6]
 
492
            if not changed_content:
 
493
                return basis.annotate_iter(file_id)
 
494
            if kind[1] is None:
 
495
                return None
 
496
            import annotate
 
497
            if kind[0] != 'file':
 
498
                old_lines = []
 
499
            else:
 
500
                old_lines = list(basis.annotate_iter(file_id))
 
501
            old = [old_lines]
 
502
            for tree in self.branch.repository.revision_trees(
 
503
                self.get_parent_ids()[1:]):
 
504
                if file_id not in tree:
 
505
                    continue
 
506
                old.append(list(tree.annotate_iter(file_id)))
 
507
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
508
                                       default_revision)
 
509
        finally:
 
510
            basis.unlock()
531
511
 
532
512
    def _get_ancestors(self, default_revision):
533
513
        ancestors = set([default_revision])
548
528
        else:
549
529
            parents = [last_rev]
550
530
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
531
            merges_file = self._transport.get('pending-merges')
552
532
        except errors.NoSuchFile:
553
533
            pass
554
534
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
535
            for l in merges_file.readlines():
556
536
                revision_id = l.rstrip('\n')
557
537
                parents.append(revision_id)
558
538
        return parents
577
557
 
578
558
        revision
579
559
            If not None, the cloned tree will have its last revision set to
580
 
            revision, and difference between the source trees last revision
 
560
            revision, and and difference between the source trees last revision
581
561
            and this one merged in.
582
562
        """
583
563
        # assumes the target bzr dir format is compatible.
617
597
 
618
598
    def get_file_size(self, file_id):
619
599
        """See Tree.get_file_size"""
620
 
        # XXX: this returns the on-disk size; it should probably return the
621
 
        # canonical size
622
600
        try:
623
601
            return os.path.getsize(self.id2abspath(file_id))
624
602
        except OSError, e:
640
618
 
641
619
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
620
        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
621
        return self._inventory[file_id].executable
648
622
 
649
623
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
759
733
            raise
760
734
        kind = _mapper(stat_result.st_mode)
761
735
        if kind == 'file':
762
 
            return self._file_content_summary(path, stat_result)
 
736
            size = stat_result.st_size
 
737
            # try for a stat cache lookup
 
738
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
739
            return (kind, size, executable, self._sha_from_stat(
 
740
                path, stat_result))
763
741
        elif kind == 'directory':
764
742
            # perhaps it looks like a plain directory, but it's really a
765
743
            # reference.
767
745
                kind = 'tree-reference'
768
746
            return kind, None, None, None
769
747
        elif kind == 'symlink':
770
 
            target = osutils.readlink(abspath)
771
 
            return ('symlink', None, None, target)
 
748
            return ('symlink', None, None, os.readlink(abspath.encode(osutils._fs_enc)))
772
749
        else:
773
750
            return (kind, None, None, None)
774
751
 
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
752
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
753
        """Common ghost checking functionality from set_parent_*.
784
754
 
794
764
    def _set_merges_from_parent_ids(self, parent_ids):
795
765
        merges = parent_ids[1:]
796
766
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
797
 
            mode=self.bzrdir._get_file_mode())
 
767
            mode=self._control_files._file_mode)
798
768
 
799
769
    def _filter_parent_ids_by_ancestry(self, revision_ids):
800
770
        """Check that all merged revisions are proper 'heads'.
900
870
        self._must_be_locked()
901
871
        my_file = rio_file(stanzas, header)
902
872
        self._transport.put_file(filename, my_file,
903
 
            mode=self.bzrdir._get_file_mode())
 
873
            mode=self._control_files._file_mode)
904
874
 
905
875
    @needs_write_lock # because merge pulls data into the branch.
906
876
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
877
        merge_type=None):
908
878
        """Merge from a branch into this working tree.
909
879
 
910
880
        :param branch: The branch to merge from.
914
884
            branch.last_revision().
915
885
        """
916
886
        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()
 
887
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
888
        try:
 
889
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
890
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
891
            merger.pp.next_phase()
 
892
            # check that there are no
 
893
            # local alterations
 
894
            merger.check_basis(check_clean=True, require_commits=False)
 
895
            if to_revision is None:
 
896
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
897
            merger.other_rev_id = to_revision
 
898
            if _mod_revision.is_null(merger.other_rev_id):
 
899
                raise errors.NoCommits(branch)
 
900
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
901
            merger.other_basis = merger.other_rev_id
 
902
            merger.other_tree = self.branch.repository.revision_tree(
 
903
                merger.other_rev_id)
 
904
            merger.other_branch = branch
 
905
            merger.pp.next_phase()
 
906
            if from_revision is None:
 
907
                merger.find_base()
 
908
            else:
 
909
                merger.set_base_revision(from_revision, branch)
 
910
            if merger.base_rev_id == merger.other_rev_id:
 
911
                raise errors.PointlessMerge
 
912
            merger.backup_files = False
 
913
            if merge_type is None:
 
914
                merger.merge_type = Merge3Merger
 
915
            else:
 
916
                merger.merge_type = merge_type
 
917
            merger.set_interesting_files(None)
 
918
            merger.show_base = False
 
919
            merger.reprocess = False
 
920
            conflicts = merger.do_merge()
 
921
            merger.set_pending()
 
922
        finally:
 
923
            pb.finished()
947
924
        return conflicts
948
925
 
949
926
    @needs_read_lock
990
967
        return file_id
991
968
 
992
969
    def get_symlink_target(self, file_id):
993
 
        abspath = self.id2abspath(file_id)
994
 
        target = osutils.readlink(abspath)
995
 
        return target
 
970
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc))
996
971
 
997
972
    @needs_write_lock
998
973
    def subsume(self, other_tree):
1096
1071
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1072
        if tree_transport.base != branch_transport.base:
1098
1073
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1074
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1075
        else:
1102
1076
            tree_bzrdir = branch_bzrdir
1103
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1077
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1104
1078
        wt.set_parent_ids(self.get_parent_ids())
1105
1079
        my_inv = self.inventory
1106
 
        child_inv = inventory.Inventory(root_id=None)
 
1080
        child_inv = Inventory(root_id=None)
1107
1081
        new_root = my_inv[file_id]
1108
1082
        my_inv.remove_recursive_id(file_id)
1109
1083
        new_root.parent_id = None
1128
1102
        self._serialize(self._inventory, sio)
1129
1103
        sio.seek(0)
1130
1104
        self._transport.put_file('inventory', sio,
1131
 
            mode=self.bzrdir._get_file_mode())
 
1105
            mode=self._control_files._file_mode)
1132
1106
        self._inventory_is_modified = False
1133
1107
 
1134
1108
    def _kind(self, relpath):
1135
1109
        return osutils.file_kind(self.abspath(relpath))
1136
1110
 
1137
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
 
        """List all files as (path, class, kind, id, entry).
 
1111
    def list_files(self, include_root=False):
 
1112
        """Recursively list all files as (path, class, kind, id, entry).
1139
1113
 
1140
1114
        Lists, but does not descend into unversioned directories.
 
1115
 
1141
1116
        This does not include files that have been deleted in this
1142
 
        tree. Skips the control directory.
 
1117
        tree.
1143
1118
 
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
 
1119
        Skips the control directory.
1147
1120
        """
1148
1121
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1122
        # with it. So callers should be careful to always read_lock the tree.
1151
1124
            raise errors.ObjectNotLocked(self)
1152
1125
 
1153
1126
        inv = self.inventory
1154
 
        if from_dir is None and include_root is True:
 
1127
        if include_root is True:
1155
1128
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1156
1129
        # Convert these into local objects to save lookup times
1157
1130
        pathjoin = osutils.pathjoin
1164
1137
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1165
1138
 
1166
1139
        # 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)
 
1140
        children = os.listdir(self.basedir)
1177
1141
        children.sort()
1178
1142
        # jam 20060527 The kernel sized tree seems equivalent whether we
1179
1143
        # use a deque and popleft to keep them sorted, or if we use a plain
1180
1144
        # list and just reverse() them.
1181
1145
        children = collections.deque(children)
1182
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1146
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1183
1147
        while stack:
1184
1148
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1185
1149
 
1243
1207
                if fk != 'directory':
1244
1208
                    continue
1245
1209
 
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
 
1210
                # But do this child first
 
1211
                new_children = os.listdir(fap)
 
1212
                new_children.sort()
 
1213
                new_children = collections.deque(new_children)
 
1214
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1215
                # Break out of inner loop,
 
1216
                # so that we start outer loop with child
 
1217
                break
1255
1218
            else:
1256
1219
                # if we finished all children, pop it off the stack
1257
1220
                stack.pop()
1435
1398
        inv = self.inventory
1436
1399
        for entry in moved:
1437
1400
            try:
1438
 
                self._move_entry(WorkingTree._RenameEntry(
1439
 
                    entry.to_rel, entry.from_id,
 
1401
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1440
1402
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
1403
                    entry.from_tail, entry.from_parent_id,
1442
1404
                    entry.only_change_inv))
1493
1455
        from_tail = splitpath(from_rel)[-1]
1494
1456
        from_id = inv.path2id(from_rel)
1495
1457
        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]
 
1458
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1459
                errors.NotVersionedError(path=str(from_rel)))
 
1460
        from_entry = inv[from_id]
1507
1461
        from_parent_id = from_entry.parent_id
1508
1462
        to_dir, to_tail = os.path.split(to_rel)
1509
1463
        to_dir_id = inv.path2id(to_dir)
1571
1525
        :raises: NoSuchId if any fileid is not currently versioned.
1572
1526
        """
1573
1527
        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
1528
            if self._inventory.has_id(file_id):
1578
1529
                self._inventory.remove_recursive_id(file_id)
 
1530
            else:
 
1531
                raise errors.NoSuchId(self, file_id)
1579
1532
        if len(file_ids):
1580
1533
            # in the future this should just set a dirty bit to wait for the
1581
1534
            # final unlock. However, until all methods of workingtree start
1600
1553
 
1601
1554
    @needs_write_lock
1602
1555
    def pull(self, source, overwrite=False, stop_revision=None,
1603
 
             change_reporter=None, possible_transports=None, local=False):
 
1556
             change_reporter=None, possible_transports=None):
 
1557
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1604
1558
        source.lock_read()
1605
1559
        try:
 
1560
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1561
            pp.next_phase()
1606
1562
            old_revision_info = self.branch.last_revision_info()
1607
1563
            basis_tree = self.basis_tree()
1608
1564
            count = self.branch.pull(source, overwrite, stop_revision,
1609
 
                                     possible_transports=possible_transports,
1610
 
                                     local=local)
 
1565
                                     possible_transports=possible_transports)
1611
1566
            new_revision_info = self.branch.last_revision_info()
1612
1567
            if new_revision_info != old_revision_info:
 
1568
                pp.next_phase()
1613
1569
                repository = self.branch.repository
 
1570
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1614
1571
                basis_tree.lock_read()
1615
1572
                try:
1616
1573
                    new_basis_tree = self.branch.basis_tree()
1619
1576
                                new_basis_tree,
1620
1577
                                basis_tree,
1621
1578
                                this_tree=self,
1622
 
                                pb=None,
 
1579
                                pb=pb,
1623
1580
                                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)
 
1581
                    if (basis_tree.inventory.root is None and
 
1582
                        new_basis_tree.inventory.root is not None):
 
1583
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1584
                finally:
 
1585
                    pb.finished()
1629
1586
                    basis_tree.unlock()
1630
1587
                # TODO - dedup parents list with things merged by pull ?
1631
1588
                # reuse the revisiontree we merged against to set the new
1644
1601
            return count
1645
1602
        finally:
1646
1603
            source.unlock()
 
1604
            top_pb.finished()
1647
1605
 
1648
1606
    @needs_write_lock
1649
1607
    def put_file_bytes_non_atomic(self, file_id, bytes):
1675
1633
 
1676
1634
            fl = []
1677
1635
            for subf in os.listdir(dirabs):
1678
 
                if self.bzrdir.is_control_filename(subf):
 
1636
                if subf == '.bzr':
1679
1637
                    continue
1680
1638
                if subf not in dir_entry.children:
1681
1639
                    try:
1734
1692
        r"""Check whether the filename matches an ignore pattern.
1735
1693
 
1736
1694
        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.
 
1695
        others match against only the last component.
1740
1696
 
1741
1697
        If the file is ignored, returns the pattern which caused it to
1742
1698
        be ignored, otherwise None.  So this can simply be used as a
1743
1699
        boolean if desired."""
1744
1700
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1701
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1702
        return self._ignoreglobster.match(filename)
1747
1703
 
1748
1704
    def kind(self, file_id):
1839
1795
    def _reset_data(self):
1840
1796
        """Reset transient data that cannot be revalidated."""
1841
1797
        self._inventory_is_modified = False
1842
 
        f = self._transport.get('inventory')
1843
 
        try:
1844
 
            result = self._deserialize(f)
1845
 
        finally:
1846
 
            f.close()
 
1798
        result = self._deserialize(self._transport.get('inventory'))
1847
1799
        self._set_inventory(result, dirty=False)
1848
1800
 
1849
1801
    @needs_tree_write_lock
1873
1825
        path = self._basis_inventory_name()
1874
1826
        sio = StringIO(xml)
1875
1827
        self._transport.put_file(path, sio,
1876
 
            mode=self.bzrdir._get_file_mode())
 
1828
            mode=self._control_files._file_mode)
1877
1829
 
1878
1830
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1879
1831
        """Create the text that will be saved in basis-inventory"""
1896
1848
            # revision_id is set. We must check for this full string, because a
1897
1849
            # root node id can legitimately look like 'revision_id' but cannot
1898
1850
            # contain a '"'.
1899
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1851
            xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1852
            firstline = xml.split('\n', 1)[0]
1901
1853
            if (not 'revision_id="' in firstline or
1902
1854
                'format="7"' not in firstline):
1903
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1904
 
                    xml, new_revision)
 
1855
                inv = self.branch.repository.deserialise_inventory(
 
1856
                    new_revision, xml)
1905
1857
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1906
1858
            self._write_basis_inventory(xml)
1907
1859
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
1877
        # binary.
1926
1878
        if self._inventory_is_modified:
1927
1879
            raise errors.InventoryModified(self)
1928
 
        f = self._transport.get('inventory')
1929
 
        try:
1930
 
            result = self._deserialize(f)
1931
 
        finally:
1932
 
            f.close()
 
1880
        result = self._deserialize(self._transport.get('inventory'))
1933
1881
        self._set_inventory(result, dirty=False)
1934
1882
        return result
1935
1883
 
1950
1898
 
1951
1899
        new_files=set()
1952
1900
        unknown_nested_files=set()
1953
 
        if to_file is None:
1954
 
            to_file = sys.stdout
1955
1901
 
1956
1902
        def recurse_directory_to_add_files(directory):
1957
1903
            # Recurse directory and add all files
2013
1959
                        tree_delta.unversioned.extend((unknown_file,))
2014
1960
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2015
1961
 
2016
 
        # Build inv_delta and delete files where applicable,
 
1962
        # Build inv_delta and delete files where applicaple,
2017
1963
        # do this before any modifications to inventory.
2018
1964
        for f in files:
2019
1965
            fid = self.path2id(f)
2027
1973
                        new_status = 'I'
2028
1974
                    else:
2029
1975
                        new_status = '?'
2030
 
                    # XXX: Really should be a more abstract reporter interface
2031
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2032
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1976
                    textui.show_status(new_status, self.kind(fid), f,
 
1977
                                       to_file=to_file)
2033
1978
                # Unversion file
2034
1979
                inv_delta.append((f, None, fid, None))
2035
1980
                message = "removed %s" % (f,)
2058
2003
 
2059
2004
    @needs_tree_write_lock
2060
2005
    def revert(self, filenames=None, old_tree=None, backups=True,
2061
 
               pb=None, report_changes=False):
 
2006
               pb=DummyProgress(), report_changes=False):
2062
2007
        from bzrlib.conflicts import resolve
2063
2008
        if filenames == []:
2064
2009
            filenames = None
2077
2022
            if filenames is None and len(self.get_parent_ids()) > 1:
2078
2023
                parent_trees = []
2079
2024
                last_revision = self.last_revision()
2080
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2025
                if last_revision != NULL_REVISION:
2081
2026
                    if basis_tree is None:
2082
2027
                        basis_tree = self.basis_tree()
2083
2028
                        basis_tree.lock_read()
2121
2066
    def set_inventory(self, new_inventory_list):
2122
2067
        from bzrlib.inventory import (Inventory,
2123
2068
                                      InventoryDirectory,
 
2069
                                      InventoryEntry,
2124
2070
                                      InventoryFile,
2125
2071
                                      InventoryLink)
2126
2072
        inv = Inventory(self.get_root_id())
2186
2132
        """
2187
2133
        raise NotImplementedError(self.unlock)
2188
2134
 
2189
 
    _marker = object()
2190
 
 
2191
 
    def update(self, change_reporter=None, possible_transports=None,
2192
 
               revision=None, old_tip=_marker):
 
2135
    def update(self, change_reporter=None, possible_transports=None):
2193
2136
        """Update a working tree along its branch.
2194
2137
 
2195
2138
        This will update the branch if its bound too, which means we have
2213
2156
        - Merge current state -> basis tree of the master w.r.t. the old tree
2214
2157
          basis.
2215
2158
        - Do a 'normal' merge of the old branch basis if it is relevant.
2216
 
 
2217
 
        :param revision: The target revision to update to. Must be in the
2218
 
            revision history.
2219
 
        :param old_tip: If branch.update() has already been run, the value it
2220
 
            returned (old tip of the branch or None). _marker is used
2221
 
            otherwise.
2222
2159
        """
2223
2160
        if self.branch.get_bound_location() is not None:
2224
2161
            self.lock_write()
2225
 
            update_branch = (old_tip is self._marker)
 
2162
            update_branch = True
2226
2163
        else:
2227
2164
            self.lock_tree_write()
2228
2165
            update_branch = False
2230
2167
            if update_branch:
2231
2168
                old_tip = self.branch.update(possible_transports)
2232
2169
            else:
2233
 
                if old_tip is self._marker:
2234
 
                    old_tip = None
2235
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2170
                old_tip = None
 
2171
            return self._update_tree(old_tip, change_reporter)
2236
2172
        finally:
2237
2173
            self.unlock()
2238
2174
 
2239
2175
    @needs_tree_write_lock
2240
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2176
    def _update_tree(self, old_tip=None, change_reporter=None):
2241
2177
        """Update a tree to the master branch.
2242
2178
 
2243
2179
        :param old_tip: if supplied, the previous tip revision the branch,
2253
2189
        # We MUST save it even if an error occurs, because otherwise the users
2254
2190
        # local work is unreferenced and will appear to have been lost.
2255
2191
        #
2256
 
        nb_conflicts = 0
 
2192
        result = 0
2257
2193
        try:
2258
2194
            last_rev = self.get_parent_ids()[0]
2259
2195
        except IndexError:
2260
2196
            last_rev = _mod_revision.NULL_REVISION
2261
 
        if revision is None:
2262
 
            revision = self.branch.last_revision()
2263
 
 
2264
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2265
 
 
2266
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
 
            # the branch we are bound to was updated
2268
 
            # merge those changes in first
2269
 
            base_tree  = self.basis_tree()
2270
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2271
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
 
                                             base_tree, this_tree=self,
2273
 
                                             change_reporter=change_reporter)
2274
 
            if nb_conflicts:
2275
 
                self.add_parent_tree((old_tip, other_tree))
2276
 
                trace.note('Rerun update after fixing the conflicts.')
2277
 
                return nb_conflicts
2278
 
 
2279
 
        if last_rev != _mod_revision.ensure_null(revision):
2280
 
            # the working tree is up to date with the branch
2281
 
            # we can merge the specified revision from master
2282
 
            to_tree = self.branch.repository.revision_tree(revision)
2283
 
            to_root_id = to_tree.get_root_id()
2284
 
 
 
2197
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2198
            # merge tree state up to new branch tip.
2285
2199
            basis = self.basis_tree()
2286
2200
            basis.lock_read()
2287
2201
            try:
2288
 
                if (basis.inventory.root is None
2289
 
                    or basis.inventory.root.file_id != to_root_id):
2290
 
                    self.set_root_id(to_root_id)
 
2202
                to_tree = self.branch.basis_tree()
 
2203
                if basis.inventory.root is None:
 
2204
                    self.set_root_id(to_tree.get_root_id())
2291
2205
                    self.flush()
 
2206
                result += merge.merge_inner(
 
2207
                                      self.branch,
 
2208
                                      to_tree,
 
2209
                                      basis,
 
2210
                                      this_tree=self,
 
2211
                                      change_reporter=change_reporter)
2292
2212
            finally:
2293
2213
                basis.unlock()
2294
 
 
2295
 
            # determine the branch point
2296
 
            graph = self.branch.repository.get_graph()
2297
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2298
 
                                                last_rev)
2299
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2300
 
 
2301
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2302
 
                                             this_tree=self,
2303
 
                                             change_reporter=change_reporter)
2304
 
            self.set_last_revision(revision)
2305
2214
            # TODO - dedup parents list with things merged by pull ?
2306
2215
            # reuse the tree we've updated to to set the basis:
2307
 
            parent_trees = [(revision, to_tree)]
 
2216
            parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2217
            merges = self.get_parent_ids()[1:]
2309
2218
            # Ideally we ask the tree for the trees here, that way the working
2310
 
            # tree can decide whether to give us the entire tree or give us a
 
2219
            # tree can decide whether to give us teh entire tree or give us a
2311
2220
            # lazy initialised tree. dirstate for instance will have the trees
2312
2221
            # in ram already, whereas a last-revision + basis-inventory tree
2313
2222
            # will not, but also does not need them when setting parents.
2314
2223
            for parent in merges:
2315
2224
                parent_trees.append(
2316
2225
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2226
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2227
                parent_trees.append(
2319
2228
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2229
            self.set_parent_trees(parent_trees)
2321
2230
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2231
        else:
 
2232
            # the working tree had the same last-revision as the master
 
2233
            # branch did. We may still have pivot local work from the local
 
2234
            # branch into old_tip:
 
2235
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2236
                self.add_parent_tree_id(old_tip)
 
2237
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2238
            and old_tip != last_rev):
 
2239
            # our last revision was not the prior branch last revision
 
2240
            # and we have converted that last revision to a pending merge.
 
2241
            # base is somewhere between the branch tip now
 
2242
            # and the now pending merge
 
2243
 
 
2244
            # Since we just modified the working tree and inventory, flush out
 
2245
            # the current state, before we modify it again.
 
2246
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2247
            #       requires it only because TreeTransform directly munges the
 
2248
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2249
            #       should be able to remove this extra flush.
 
2250
            self.flush()
 
2251
            graph = self.branch.repository.get_graph()
 
2252
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2253
                                                old_tip)
 
2254
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2255
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2256
            result += merge.merge_inner(
 
2257
                                  self.branch,
 
2258
                                  other_tree,
 
2259
                                  base_tree,
 
2260
                                  this_tree=self,
 
2261
                                  change_reporter=change_reporter)
 
2262
        return result
2323
2263
 
2324
2264
    def _write_hashcache_if_dirty(self):
2325
2265
        """Write out the hashcache if it is dirty."""
2425
2365
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2426
2366
                        ('.bzr', '.bzr'))
2427
2367
                    if (bzrdir_loc < len(cur_disk_dir_content)
2428
 
                        and self.bzrdir.is_control_filename(
2429
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2368
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2430
2369
                        # we dont yield the contents of, or, .bzr itself.
2431
2370
                        del cur_disk_dir_content[bzrdir_loc]
2432
2371
            if inv_finished:
2566
2505
        return un_resolved, resolved
2567
2506
 
2568
2507
    @needs_read_lock
2569
 
    def _check(self, references):
2570
 
        """Check the tree for consistency.
2571
 
 
2572
 
        :param references: A dict with keys matching the items returned by
2573
 
            self._get_check_refs(), and values from looking those keys up in
2574
 
            the repository.
2575
 
        """
 
2508
    def _check(self):
2576
2509
        tree_basis = self.basis_tree()
2577
2510
        tree_basis.lock_read()
2578
2511
        try:
2579
 
            repo_basis = references[('trees', self.last_revision())]
 
2512
            repo_basis = self.branch.repository.revision_tree(
 
2513
                self.last_revision())
2580
2514
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
2515
                raise errors.BzrCheckError(
2582
2516
                    "Mismatched basis inventory content.")
2595
2529
        """
2596
2530
        return
2597
2531
 
 
2532
    @needs_read_lock
2598
2533
    def _get_rules_searcher(self, default_searcher):
2599
2534
        """See Tree._get_rules_searcher."""
2600
2535
        if self._rules_searcher is None:
2627
2562
        if self._inventory is None:
2628
2563
            self.read_working_inventory()
2629
2564
 
2630
 
    def _get_check_refs(self):
2631
 
        """Return the references needed to perform a check of this tree."""
2632
 
        return [('trees', self.last_revision())]
2633
 
 
2634
2565
    def lock_tree_write(self):
2635
2566
        """See WorkingTree.lock_tree_write().
2636
2567
 
2682
2613
 
2683
2614
    def _change_last_revision(self, revision_id):
2684
2615
        """See WorkingTree._change_last_revision."""
2685
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2616
        if revision_id is None or revision_id == NULL_REVISION:
2686
2617
            try:
2687
2618
                self._transport.delete('last-revision')
2688
2619
            except errors.NoSuchFile:
2690
2621
            return False
2691
2622
        else:
2692
2623
            self._transport.put_bytes('last-revision', revision_id,
2693
 
                mode=self.bzrdir._get_file_mode())
 
2624
                mode=self._control_files._file_mode)
2694
2625
            return True
2695
2626
 
2696
 
    def _get_check_refs(self):
2697
 
        """Return the references needed to perform a check of this tree."""
2698
 
        return [('trees', self.last_revision())]
2699
 
 
2700
2627
    @needs_tree_write_lock
2701
2628
    def set_conflicts(self, conflicts):
2702
2629
        self._put_rio('conflicts', conflicts.to_stanzas(),
2779
2706
        """Return the format for the working tree object in a_bzrdir."""
2780
2707
        try:
2781
2708
            transport = a_bzrdir.get_workingtree_transport(None)
2782
 
            format_string = transport.get_bytes("format")
 
2709
            format_string = transport.get("format").read()
2783
2710
            return klass._formats[format_string]
2784
2711
        except errors.NoSuchFile:
2785
2712
            raise errors.NoWorkingTree(base=transport.base)
2856
2783
        no working tree.  (See bug #43064).
2857
2784
        """
2858
2785
        sio = StringIO()
2859
 
        inv = inventory.Inventory()
 
2786
        inv = Inventory()
2860
2787
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2861
2788
        sio.seek(0)
2862
2789
        transport.put_file('inventory', sio, file_mode)
2878
2805
            branch.generate_revision_history(revision_id)
2879
2806
        finally:
2880
2807
            branch.unlock()
2881
 
        inv = inventory.Inventory()
 
2808
        inv = Inventory()
2882
2809
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2883
2810
                         branch,
2884
2811
                         inv,
2975
2902
        control_files.create_lock()
2976
2903
        control_files.lock_write()
2977
2904
        transport.put_bytes('format', self.get_format_string(),
2978
 
            mode=a_bzrdir._get_file_mode())
 
2905
            mode=control_files._file_mode)
2979
2906
        if from_branch is not None:
2980
2907
            branch = from_branch
2981
2908
        else:
3001
2928
            # only set an explicit root id if there is one to set.
3002
2929
            if basis_tree.inventory.root is not None:
3003
2930
                wt.set_root_id(basis_tree.get_root_id())
3004
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2931
            if revision_id == NULL_REVISION:
3005
2932
                wt.set_parent_trees([])
3006
2933
            else:
3007
2934
                wt.set_parent_trees([(revision_id, basis_tree)])
3014
2941
        return wt
3015
2942
 
3016
2943
    def _initial_inventory(self):
3017
 
        return inventory.Inventory()
 
2944
        return Inventory()
3018
2945
 
3019
2946
    def __init__(self):
3020
2947
        super(WorkingTreeFormat3, self).__init__()
3049
2976
        return self.get_format_string()
3050
2977
 
3051
2978
 
3052
 
__default_format = WorkingTreeFormat6()
 
2979
__default_format = WorkingTreeFormat4()
3053
2980
WorkingTreeFormat.register_format(__default_format)
3054
2981
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
2982
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2983
WorkingTreeFormat.set_default_format(__default_format)
3058
2984
# formats which have no format string are not discoverable