← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-01 15:14:38 UTC
  • mfrom: (4202.3.2 bzr-send-tweak)
  • Revision ID: pqm@pqm.ubuntu.com-20090401151438-hqulqoazddtacbls
(andrew) Don't use get_revision_xml when writing a bundle,
        instead get all the revisions together.

Show diffs side-by-side

added added

removed removed

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