← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2009-03-31 00:12:10 UTC
  • mto: This revision was merged to the branch mainline in revision 4219.
  • Revision ID: robertc@robertcollins.net-20090331001210-fufeq2heozx9jne0
Fix Tree.get_symlink_target to decode from the disk encoding to get a unicode encoded string.

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
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,
 
749
                    os.readlink(abspath.encode(osutils._fs_enc)
 
750
                                ).decode(osutils._fs_enc))
772
751
        else:
773
752
            return (kind, None, None, None)
774
753
 
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
754
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
755
        """Common ghost checking functionality from set_parent_*.
784
756
 
904
876
 
905
877
    @needs_write_lock # because merge pulls data into the branch.
906
878
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
879
        merge_type=None):
908
880
        """Merge from a branch into this working tree.
909
881
 
910
882
        :param branch: The branch to merge from.
914
886
            branch.last_revision().
915
887
        """
916
888
        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()
 
889
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
890
        try:
 
891
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
892
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
893
            merger.pp.next_phase()
 
894
            # check that there are no
 
895
            # local alterations
 
896
            merger.check_basis(check_clean=True, require_commits=False)
 
897
            if to_revision is None:
 
898
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
899
            merger.other_rev_id = to_revision
 
900
            if _mod_revision.is_null(merger.other_rev_id):
 
901
                raise errors.NoCommits(branch)
 
902
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
903
            merger.other_basis = merger.other_rev_id
 
904
            merger.other_tree = self.branch.repository.revision_tree(
 
905
                merger.other_rev_id)
 
906
            merger.other_branch = branch
 
907
            merger.pp.next_phase()
 
908
            if from_revision is None:
 
909
                merger.find_base()
 
910
            else:
 
911
                merger.set_base_revision(from_revision, branch)
 
912
            if merger.base_rev_id == merger.other_rev_id:
 
913
                raise errors.PointlessMerge
 
914
            merger.backup_files = False
 
915
            if merge_type is None:
 
916
                merger.merge_type = Merge3Merger
 
917
            else:
 
918
                merger.merge_type = merge_type
 
919
            merger.set_interesting_files(None)
 
920
            merger.show_base = False
 
921
            merger.reprocess = False
 
922
            conflicts = merger.do_merge()
 
923
            merger.set_pending()
 
924
        finally:
 
925
            pb.finished()
947
926
        return conflicts
948
927
 
949
928
    @needs_read_lock
990
969
        return file_id
991
970
 
992
971
    def get_symlink_target(self, file_id):
993
 
        abspath = self.id2abspath(file_id)
994
 
        target = osutils.readlink(abspath)
995
 
        return target
 
972
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc)
 
973
            ).decode(osutils._fs_enc)
996
974
 
997
975
    @needs_write_lock
998
976
    def subsume(self, other_tree):
1096
1074
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1075
        if tree_transport.base != branch_transport.base:
1098
1076
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1077
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1078
        else:
1102
1079
            tree_bzrdir = branch_bzrdir
1103
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1080
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1104
1081
        wt.set_parent_ids(self.get_parent_ids())
1105
1082
        my_inv = self.inventory
1106
 
        child_inv = inventory.Inventory(root_id=None)
 
1083
        child_inv = Inventory(root_id=None)
1107
1084
        new_root = my_inv[file_id]
1108
1085
        my_inv.remove_recursive_id(file_id)
1109
1086
        new_root.parent_id = None
1134
1111
    def _kind(self, relpath):
1135
1112
        return osutils.file_kind(self.abspath(relpath))
1136
1113
 
1137
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
 
        """List all files as (path, class, kind, id, entry).
 
1114
    def list_files(self, include_root=False):
 
1115
        """Recursively list all files as (path, class, kind, id, entry).
1139
1116
 
1140
1117
        Lists, but does not descend into unversioned directories.
 
1118
 
1141
1119
        This does not include files that have been deleted in this
1142
 
        tree. Skips the control directory.
 
1120
        tree.
1143
1121
 
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
 
1122
        Skips the control directory.
1147
1123
        """
1148
1124
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1125
        # with it. So callers should be careful to always read_lock the tree.
1151
1127
            raise errors.ObjectNotLocked(self)
1152
1128
 
1153
1129
        inv = self.inventory
1154
 
        if from_dir is None and include_root is True:
 
1130
        if include_root is True:
1155
1131
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1156
1132
        # Convert these into local objects to save lookup times
1157
1133
        pathjoin = osutils.pathjoin
1164
1140
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1165
1141
 
1166
1142
        # 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)
 
1143
        children = os.listdir(self.basedir)
1177
1144
        children.sort()
1178
1145
        # jam 20060527 The kernel sized tree seems equivalent whether we
1179
1146
        # use a deque and popleft to keep them sorted, or if we use a plain
1180
1147
        # list and just reverse() them.
1181
1148
        children = collections.deque(children)
1182
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1149
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1183
1150
        while stack:
1184
1151
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1185
1152
 
1243
1210
                if fk != 'directory':
1244
1211
                    continue
1245
1212
 
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
 
1213
                # But do this child first
 
1214
                new_children = os.listdir(fap)
 
1215
                new_children.sort()
 
1216
                new_children = collections.deque(new_children)
 
1217
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1218
                # Break out of inner loop,
 
1219
                # so that we start outer loop with child
 
1220
                break
1255
1221
            else:
1256
1222
                # if we finished all children, pop it off the stack
1257
1223
                stack.pop()
1435
1401
        inv = self.inventory
1436
1402
        for entry in moved:
1437
1403
            try:
1438
 
                self._move_entry(WorkingTree._RenameEntry(
1439
 
                    entry.to_rel, entry.from_id,
 
1404
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1440
1405
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
1406
                    entry.from_tail, entry.from_parent_id,
1442
1407
                    entry.only_change_inv))
1493
1458
        from_tail = splitpath(from_rel)[-1]
1494
1459
        from_id = inv.path2id(from_rel)
1495
1460
        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]
 
1461
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1462
                errors.NotVersionedError(path=str(from_rel)))
 
1463
        from_entry = inv[from_id]
1507
1464
        from_parent_id = from_entry.parent_id
1508
1465
        to_dir, to_tail = os.path.split(to_rel)
1509
1466
        to_dir_id = inv.path2id(to_dir)
1600
1557
 
1601
1558
    @needs_write_lock
1602
1559
    def pull(self, source, overwrite=False, stop_revision=None,
1603
 
             change_reporter=None, possible_transports=None, local=False):
 
1560
             change_reporter=None, possible_transports=None):
 
1561
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1604
1562
        source.lock_read()
1605
1563
        try:
 
1564
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1565
            pp.next_phase()
1606
1566
            old_revision_info = self.branch.last_revision_info()
1607
1567
            basis_tree = self.basis_tree()
1608
1568
            count = self.branch.pull(source, overwrite, stop_revision,
1609
 
                                     possible_transports=possible_transports,
1610
 
                                     local=local)
 
1569
                                     possible_transports=possible_transports)
1611
1570
            new_revision_info = self.branch.last_revision_info()
1612
1571
            if new_revision_info != old_revision_info:
 
1572
                pp.next_phase()
1613
1573
                repository = self.branch.repository
 
1574
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1614
1575
                basis_tree.lock_read()
1615
1576
                try:
1616
1577
                    new_basis_tree = self.branch.basis_tree()
1619
1580
                                new_basis_tree,
1620
1581
                                basis_tree,
1621
1582
                                this_tree=self,
1622
 
                                pb=None,
 
1583
                                pb=pb,
1623
1584
                                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)
 
1585
                    if (basis_tree.inventory.root is None and
 
1586
                        new_basis_tree.inventory.root is not None):
 
1587
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1588
                finally:
 
1589
                    pb.finished()
1629
1590
                    basis_tree.unlock()
1630
1591
                # TODO - dedup parents list with things merged by pull ?
1631
1592
                # reuse the revisiontree we merged against to set the new
1644
1605
            return count
1645
1606
        finally:
1646
1607
            source.unlock()
 
1608
            top_pb.finished()
1647
1609
 
1648
1610
    @needs_write_lock
1649
1611
    def put_file_bytes_non_atomic(self, file_id, bytes):
1675
1637
 
1676
1638
            fl = []
1677
1639
            for subf in os.listdir(dirabs):
1678
 
                if self.bzrdir.is_control_filename(subf):
 
1640
                if subf == '.bzr':
1679
1641
                    continue
1680
1642
                if subf not in dir_entry.children:
1681
1643
                    try:
1734
1696
        r"""Check whether the filename matches an ignore pattern.
1735
1697
 
1736
1698
        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.
 
1699
        others match against only the last component.
1740
1700
 
1741
1701
        If the file is ignored, returns the pattern which caused it to
1742
1702
        be ignored, otherwise None.  So this can simply be used as a
1743
1703
        boolean if desired."""
1744
1704
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1705
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1706
        return self._ignoreglobster.match(filename)
1747
1707
 
1748
1708
    def kind(self, file_id):
1839
1799
    def _reset_data(self):
1840
1800
        """Reset transient data that cannot be revalidated."""
1841
1801
        self._inventory_is_modified = False
1842
 
        f = self._transport.get('inventory')
1843
 
        try:
1844
 
            result = self._deserialize(f)
1845
 
        finally:
1846
 
            f.close()
 
1802
        result = self._deserialize(self._transport.get('inventory'))
1847
1803
        self._set_inventory(result, dirty=False)
1848
1804
 
1849
1805
    @needs_tree_write_lock
1896
1852
            # revision_id is set. We must check for this full string, because a
1897
1853
            # root node id can legitimately look like 'revision_id' but cannot
1898
1854
            # contain a '"'.
1899
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1855
            xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1856
            firstline = xml.split('\n', 1)[0]
1901
1857
            if (not 'revision_id="' in firstline or
1902
1858
                'format="7"' not in firstline):
1903
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1904
 
                    xml, new_revision)
 
1859
                inv = self.branch.repository.deserialise_inventory(
 
1860
                    new_revision, xml)
1905
1861
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1906
1862
            self._write_basis_inventory(xml)
1907
1863
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
1881
        # binary.
1926
1882
        if self._inventory_is_modified:
1927
1883
            raise errors.InventoryModified(self)
1928
 
        f = self._transport.get('inventory')
1929
 
        try:
1930
 
            result = self._deserialize(f)
1931
 
        finally:
1932
 
            f.close()
 
1884
        result = self._deserialize(self._transport.get('inventory'))
1933
1885
        self._set_inventory(result, dirty=False)
1934
1886
        return result
1935
1887
 
1950
1902
 
1951
1903
        new_files=set()
1952
1904
        unknown_nested_files=set()
1953
 
        if to_file is None:
1954
 
            to_file = sys.stdout
1955
1905
 
1956
1906
        def recurse_directory_to_add_files(directory):
1957
1907
            # Recurse directory and add all files
2013
1963
                        tree_delta.unversioned.extend((unknown_file,))
2014
1964
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2015
1965
 
2016
 
        # Build inv_delta and delete files where applicable,
 
1966
        # Build inv_delta and delete files where applicaple,
2017
1967
        # do this before any modifications to inventory.
2018
1968
        for f in files:
2019
1969
            fid = self.path2id(f)
2027
1977
                        new_status = 'I'
2028
1978
                    else:
2029
1979
                        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')
 
1980
                    textui.show_status(new_status, self.kind(fid), f,
 
1981
                                       to_file=to_file)
2033
1982
                # Unversion file
2034
1983
                inv_delta.append((f, None, fid, None))
2035
1984
                message = "removed %s" % (f,)
2058
2007
 
2059
2008
    @needs_tree_write_lock
2060
2009
    def revert(self, filenames=None, old_tree=None, backups=True,
2061
 
               pb=None, report_changes=False):
 
2010
               pb=DummyProgress(), report_changes=False):
2062
2011
        from bzrlib.conflicts import resolve
2063
2012
        if filenames == []:
2064
2013
            filenames = None
2077
2026
            if filenames is None and len(self.get_parent_ids()) > 1:
2078
2027
                parent_trees = []
2079
2028
                last_revision = self.last_revision()
2080
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2029
                if last_revision != NULL_REVISION:
2081
2030
                    if basis_tree is None:
2082
2031
                        basis_tree = self.basis_tree()
2083
2032
                        basis_tree.lock_read()
2121
2070
    def set_inventory(self, new_inventory_list):
2122
2071
        from bzrlib.inventory import (Inventory,
2123
2072
                                      InventoryDirectory,
 
2073
                                      InventoryEntry,
2124
2074
                                      InventoryFile,
2125
2075
                                      InventoryLink)
2126
2076
        inv = Inventory(self.get_root_id())
2186
2136
        """
2187
2137
        raise NotImplementedError(self.unlock)
2188
2138
 
2189
 
    _marker = object()
2190
 
 
2191
 
    def update(self, change_reporter=None, possible_transports=None,
2192
 
               revision=None, old_tip=_marker):
 
2139
    def update(self, change_reporter=None, possible_transports=None):
2193
2140
        """Update a working tree along its branch.
2194
2141
 
2195
2142
        This will update the branch if its bound too, which means we have
2213
2160
        - Merge current state -> basis tree of the master w.r.t. the old tree
2214
2161
          basis.
2215
2162
        - 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
2163
        """
2223
2164
        if self.branch.get_bound_location() is not None:
2224
2165
            self.lock_write()
2225
 
            update_branch = (old_tip is self._marker)
 
2166
            update_branch = True
2226
2167
        else:
2227
2168
            self.lock_tree_write()
2228
2169
            update_branch = False
2230
2171
            if update_branch:
2231
2172
                old_tip = self.branch.update(possible_transports)
2232
2173
            else:
2233
 
                if old_tip is self._marker:
2234
 
                    old_tip = None
2235
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2174
                old_tip = None
 
2175
            return self._update_tree(old_tip, change_reporter)
2236
2176
        finally:
2237
2177
            self.unlock()
2238
2178
 
2239
2179
    @needs_tree_write_lock
2240
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2180
    def _update_tree(self, old_tip=None, change_reporter=None):
2241
2181
        """Update a tree to the master branch.
2242
2182
 
2243
2183
        :param old_tip: if supplied, the previous tip revision the branch,
2253
2193
        # We MUST save it even if an error occurs, because otherwise the users
2254
2194
        # local work is unreferenced and will appear to have been lost.
2255
2195
        #
2256
 
        nb_conflicts = 0
 
2196
        result = 0
2257
2197
        try:
2258
2198
            last_rev = self.get_parent_ids()[0]
2259
2199
        except IndexError:
2260
2200
            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
 
 
 
2201
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2202
            # merge tree state up to new branch tip.
2285
2203
            basis = self.basis_tree()
2286
2204
            basis.lock_read()
2287
2205
            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)
 
2206
                to_tree = self.branch.basis_tree()
 
2207
                if basis.inventory.root is None:
 
2208
                    self.set_root_id(to_tree.get_root_id())
2291
2209
                    self.flush()
 
2210
                result += merge.merge_inner(
 
2211
                                      self.branch,
 
2212
                                      to_tree,
 
2213
                                      basis,
 
2214
                                      this_tree=self,
 
2215
                                      change_reporter=change_reporter)
2292
2216
            finally:
2293
2217
                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
2218
            # TODO - dedup parents list with things merged by pull ?
2306
2219
            # reuse the tree we've updated to to set the basis:
2307
 
            parent_trees = [(revision, to_tree)]
 
2220
            parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2221
            merges = self.get_parent_ids()[1:]
2309
2222
            # 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
 
2223
            # tree can decide whether to give us teh entire tree or give us a
2311
2224
            # lazy initialised tree. dirstate for instance will have the trees
2312
2225
            # in ram already, whereas a last-revision + basis-inventory tree
2313
2226
            # will not, but also does not need them when setting parents.
2314
2227
            for parent in merges:
2315
2228
                parent_trees.append(
2316
2229
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2230
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2231
                parent_trees.append(
2319
2232
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2233
            self.set_parent_trees(parent_trees)
2321
2234
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2235
        else:
 
2236
            # the working tree had the same last-revision as the master
 
2237
            # branch did. We may still have pivot local work from the local
 
2238
            # branch into old_tip:
 
2239
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2240
                self.add_parent_tree_id(old_tip)
 
2241
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2242
            and old_tip != last_rev):
 
2243
            # our last revision was not the prior branch last revision
 
2244
            # and we have converted that last revision to a pending merge.
 
2245
            # base is somewhere between the branch tip now
 
2246
            # and the now pending merge
 
2247
 
 
2248
            # Since we just modified the working tree and inventory, flush out
 
2249
            # the current state, before we modify it again.
 
2250
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2251
            #       requires it only because TreeTransform directly munges the
 
2252
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2253
            #       should be able to remove this extra flush.
 
2254
            self.flush()
 
2255
            graph = self.branch.repository.get_graph()
 
2256
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2257
                                                old_tip)
 
2258
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2259
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2260
            result += merge.merge_inner(
 
2261
                                  self.branch,
 
2262
                                  other_tree,
 
2263
                                  base_tree,
 
2264
                                  this_tree=self,
 
2265
                                  change_reporter=change_reporter)
 
2266
        return result
2323
2267
 
2324
2268
    def _write_hashcache_if_dirty(self):
2325
2269
        """Write out the hashcache if it is dirty."""
2425
2369
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2426
2370
                        ('.bzr', '.bzr'))
2427
2371
                    if (bzrdir_loc < len(cur_disk_dir_content)
2428
 
                        and self.bzrdir.is_control_filename(
2429
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2372
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2430
2373
                        # we dont yield the contents of, or, .bzr itself.
2431
2374
                        del cur_disk_dir_content[bzrdir_loc]
2432
2375
            if inv_finished:
2566
2509
        return un_resolved, resolved
2567
2510
 
2568
2511
    @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
 
        """
 
2512
    def _check(self):
2576
2513
        tree_basis = self.basis_tree()
2577
2514
        tree_basis.lock_read()
2578
2515
        try:
2579
 
            repo_basis = references[('trees', self.last_revision())]
 
2516
            repo_basis = self.branch.repository.revision_tree(
 
2517
                self.last_revision())
2580
2518
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
2519
                raise errors.BzrCheckError(
2582
2520
                    "Mismatched basis inventory content.")
2595
2533
        """
2596
2534
        return
2597
2535
 
 
2536
    @needs_read_lock
2598
2537
    def _get_rules_searcher(self, default_searcher):
2599
2538
        """See Tree._get_rules_searcher."""
2600
2539
        if self._rules_searcher is None:
2627
2566
        if self._inventory is None:
2628
2567
            self.read_working_inventory()
2629
2568
 
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
2569
    def lock_tree_write(self):
2635
2570
        """See WorkingTree.lock_tree_write().
2636
2571
 
2682
2617
 
2683
2618
    def _change_last_revision(self, revision_id):
2684
2619
        """See WorkingTree._change_last_revision."""
2685
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2620
        if revision_id is None or revision_id == NULL_REVISION:
2686
2621
            try:
2687
2622
                self._transport.delete('last-revision')
2688
2623
            except errors.NoSuchFile:
2693
2628
                mode=self.bzrdir._get_file_mode())
2694
2629
            return True
2695
2630
 
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
2631
    @needs_tree_write_lock
2701
2632
    def set_conflicts(self, conflicts):
2702
2633
        self._put_rio('conflicts', conflicts.to_stanzas(),
2779
2710
        """Return the format for the working tree object in a_bzrdir."""
2780
2711
        try:
2781
2712
            transport = a_bzrdir.get_workingtree_transport(None)
2782
 
            format_string = transport.get_bytes("format")
 
2713
            format_string = transport.get("format").read()
2783
2714
            return klass._formats[format_string]
2784
2715
        except errors.NoSuchFile:
2785
2716
            raise errors.NoWorkingTree(base=transport.base)
2856
2787
        no working tree.  (See bug #43064).
2857
2788
        """
2858
2789
        sio = StringIO()
2859
 
        inv = inventory.Inventory()
 
2790
        inv = Inventory()
2860
2791
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2861
2792
        sio.seek(0)
2862
2793
        transport.put_file('inventory', sio, file_mode)
2878
2809
            branch.generate_revision_history(revision_id)
2879
2810
        finally:
2880
2811
            branch.unlock()
2881
 
        inv = inventory.Inventory()
 
2812
        inv = Inventory()
2882
2813
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2883
2814
                         branch,
2884
2815
                         inv,
3001
2932
            # only set an explicit root id if there is one to set.
3002
2933
            if basis_tree.inventory.root is not None:
3003
2934
                wt.set_root_id(basis_tree.get_root_id())
3004
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2935
            if revision_id == NULL_REVISION:
3005
2936
                wt.set_parent_trees([])
3006
2937
            else:
3007
2938
                wt.set_parent_trees([(revision_id, basis_tree)])
3014
2945
        return wt
3015
2946
 
3016
2947
    def _initial_inventory(self):
3017
 
        return inventory.Inventory()
 
2948
        return Inventory()
3018
2949
 
3019
2950
    def __init__(self):
3020
2951
        super(WorkingTreeFormat3, self).__init__()
3049
2980
        return self.get_format_string()
3050
2981
 
3051
2982
 
3052
 
__default_format = WorkingTreeFormat6()
 
2983
__default_format = WorkingTreeFormat4()
3053
2984
WorkingTreeFormat.register_format(__default_format)
3054
2985
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
2986
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2987
WorkingTreeFormat.set_default_format(__default_format)
3058
2988
# formats which have no format string are not discoverable