/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2009-05-12 03:50:39 UTC
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090512035039-6x0pahpjpkdnm9zb
Note another possible error.

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:
451
456
 
452
457
    def get_file_with_stat(self, file_id, path=None, filtered=True,
453
458
        _fstat=os.fstat):
454
 
        """See Tree.get_file_with_stat."""
 
459
        """See MutableTree.get_file_with_stat."""
455
460
        if path is None:
456
461
            path = self.id2path(file_id)
457
462
        file_obj = self.get_file_byname(path, filtered=False)
458
463
        stat_value = _fstat(file_obj.fileno())
459
 
        if filtered and self.supports_content_filtering():
 
464
        if self.supports_content_filtering() and filtered:
460
465
            filters = self._content_filter_stack(path)
461
466
            file_obj = filtered_input_file(file_obj, filters)
462
467
        return (file_obj, stat_value)
467
472
    def get_file_byname(self, filename, filtered=True):
468
473
        path = self.abspath(filename)
469
474
        f = file(path, 'rb')
470
 
        if filtered and self.supports_content_filtering():
 
475
        if self.supports_content_filtering() and filtered:
471
476
            filters = self._content_filter_stack(filename)
472
477
            return filtered_input_file(f, filters)
473
478
        else:
492
497
        incorrectly attributed to CURRENT_REVISION (but after committing, the
493
498
        attribution will be correct).
494
499
        """
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
 
500
        basis = self.basis_tree()
 
501
        basis.lock_read()
 
502
        try:
 
503
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
504
                require_versioned=True).next()
 
505
            changed_content, kind = changes[2], changes[6]
 
506
            if not changed_content:
 
507
                return basis.annotate_iter(file_id)
 
508
            if kind[1] is None:
 
509
                return None
 
510
            import annotate
 
511
            if kind[0] != 'file':
 
512
                old_lines = []
 
513
            else:
 
514
                old_lines = list(basis.annotate_iter(file_id))
 
515
            old = [old_lines]
 
516
            for tree in self.branch.repository.revision_trees(
 
517
                self.get_parent_ids()[1:]):
 
518
                if file_id not in tree:
 
519
                    continue
 
520
                old.append(list(tree.annotate_iter(file_id)))
 
521
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
522
                                       default_revision)
 
523
        finally:
 
524
            basis.unlock()
531
525
 
532
526
    def _get_ancestors(self, default_revision):
533
527
        ancestors = set([default_revision])
548
542
        else:
549
543
            parents = [last_rev]
550
544
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
545
            merges_file = self._transport.get('pending-merges')
552
546
        except errors.NoSuchFile:
553
547
            pass
554
548
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
549
            for l in merges_file.readlines():
556
550
                revision_id = l.rstrip('\n')
557
551
                parents.append(revision_id)
558
552
        return parents
617
611
 
618
612
    def get_file_size(self, file_id):
619
613
        """See Tree.get_file_size"""
620
 
        # XXX: this returns the on-disk size; it should probably return the
621
 
        # canonical size
622
614
        try:
623
615
            return os.path.getsize(self.id2abspath(file_id))
624
616
        except OSError, e:
640
632
 
641
633
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
634
        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
635
        return self._inventory[file_id].executable
648
636
 
649
637
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
759
747
            raise
760
748
        kind = _mapper(stat_result.st_mode)
761
749
        if kind == 'file':
762
 
            return self._file_content_summary(path, stat_result)
 
750
            size = stat_result.st_size
 
751
            # try for a stat cache lookup
 
752
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
753
            return (kind, size, executable, self._sha_from_stat(
 
754
                path, stat_result))
763
755
        elif kind == 'directory':
764
756
            # perhaps it looks like a plain directory, but it's really a
765
757
            # reference.
772
764
        else:
773
765
            return (kind, None, None, None)
774
766
 
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
767
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
768
        """Common ghost checking functionality from set_parent_*.
784
769
 
904
889
 
905
890
    @needs_write_lock # because merge pulls data into the branch.
906
891
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
892
        merge_type=None):
908
893
        """Merge from a branch into this working tree.
909
894
 
910
895
        :param branch: The branch to merge from.
914
899
            branch.last_revision().
915
900
        """
916
901
        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()
 
902
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
903
        try:
 
904
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
905
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
906
            merger.pp.next_phase()
 
907
            # check that there are no
 
908
            # local alterations
 
909
            merger.check_basis(check_clean=True, require_commits=False)
 
910
            if to_revision is None:
 
911
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
912
            merger.other_rev_id = to_revision
 
913
            if _mod_revision.is_null(merger.other_rev_id):
 
914
                raise errors.NoCommits(branch)
 
915
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
916
            merger.other_basis = merger.other_rev_id
 
917
            merger.other_tree = self.branch.repository.revision_tree(
 
918
                merger.other_rev_id)
 
919
            merger.other_branch = branch
 
920
            merger.pp.next_phase()
 
921
            if from_revision is None:
 
922
                merger.find_base()
 
923
            else:
 
924
                merger.set_base_revision(from_revision, branch)
 
925
            if merger.base_rev_id == merger.other_rev_id:
 
926
                raise errors.PointlessMerge
 
927
            merger.backup_files = False
 
928
            if merge_type is None:
 
929
                merger.merge_type = Merge3Merger
 
930
            else:
 
931
                merger.merge_type = merge_type
 
932
            merger.set_interesting_files(None)
 
933
            merger.show_base = False
 
934
            merger.reprocess = False
 
935
            conflicts = merger.do_merge()
 
936
            merger.set_pending()
 
937
        finally:
 
938
            pb.finished()
947
939
        return conflicts
948
940
 
949
941
    @needs_read_lock
1096
1088
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1089
        if tree_transport.base != branch_transport.base:
1098
1090
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1091
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1092
        else:
1102
1093
            tree_bzrdir = branch_bzrdir
1103
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1094
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1104
1095
        wt.set_parent_ids(self.get_parent_ids())
1105
1096
        my_inv = self.inventory
1106
 
        child_inv = inventory.Inventory(root_id=None)
 
1097
        child_inv = Inventory(root_id=None)
1107
1098
        new_root = my_inv[file_id]
1108
1099
        my_inv.remove_recursive_id(file_id)
1109
1100
        new_root.parent_id = None
1134
1125
    def _kind(self, relpath):
1135
1126
        return osutils.file_kind(self.abspath(relpath))
1136
1127
 
1137
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1138
 
        """List all files as (path, class, kind, id, entry).
 
1128
    def list_files(self, include_root=False):
 
1129
        """Recursively list all files as (path, class, kind, id, entry).
1139
1130
 
1140
1131
        Lists, but does not descend into unversioned directories.
 
1132
 
1141
1133
        This does not include files that have been deleted in this
1142
 
        tree. Skips the control directory.
 
1134
        tree.
1143
1135
 
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
 
1136
        Skips the control directory.
1147
1137
        """
1148
1138
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1149
1139
        # with it. So callers should be careful to always read_lock the tree.
1151
1141
            raise errors.ObjectNotLocked(self)
1152
1142
 
1153
1143
        inv = self.inventory
1154
 
        if from_dir is None and include_root is True:
 
1144
        if include_root is True:
1155
1145
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1156
1146
        # Convert these into local objects to save lookup times
1157
1147
        pathjoin = osutils.pathjoin
1164
1154
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1165
1155
 
1166
1156
        # 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)
 
1157
        children = os.listdir(self.basedir)
1177
1158
        children.sort()
1178
1159
        # jam 20060527 The kernel sized tree seems equivalent whether we
1179
1160
        # use a deque and popleft to keep them sorted, or if we use a plain
1180
1161
        # list and just reverse() them.
1181
1162
        children = collections.deque(children)
1182
 
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
 
1163
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1183
1164
        while stack:
1184
1165
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1185
1166
 
1243
1224
                if fk != 'directory':
1244
1225
                    continue
1245
1226
 
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
 
1227
                # But do this child first
 
1228
                new_children = os.listdir(fap)
 
1229
                new_children.sort()
 
1230
                new_children = collections.deque(new_children)
 
1231
                stack.append((f_ie.file_id, fp, fap, new_children))
 
1232
                # Break out of inner loop,
 
1233
                # so that we start outer loop with child
 
1234
                break
1255
1235
            else:
1256
1236
                # if we finished all children, pop it off the stack
1257
1237
                stack.pop()
1435
1415
        inv = self.inventory
1436
1416
        for entry in moved:
1437
1417
            try:
1438
 
                self._move_entry(WorkingTree._RenameEntry(
1439
 
                    entry.to_rel, entry.from_id,
 
1418
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1440
1419
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
1420
                    entry.from_tail, entry.from_parent_id,
1442
1421
                    entry.only_change_inv))
1493
1472
        from_tail = splitpath(from_rel)[-1]
1494
1473
        from_id = inv.path2id(from_rel)
1495
1474
        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]
 
1475
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1476
                errors.NotVersionedError(path=str(from_rel)))
 
1477
        from_entry = inv[from_id]
1507
1478
        from_parent_id = from_entry.parent_id
1508
1479
        to_dir, to_tail = os.path.split(to_rel)
1509
1480
        to_dir_id = inv.path2id(to_dir)
1600
1571
 
1601
1572
    @needs_write_lock
1602
1573
    def pull(self, source, overwrite=False, stop_revision=None,
1603
 
             change_reporter=None, possible_transports=None, local=False):
 
1574
             change_reporter=None, possible_transports=None):
 
1575
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1604
1576
        source.lock_read()
1605
1577
        try:
 
1578
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1579
            pp.next_phase()
1606
1580
            old_revision_info = self.branch.last_revision_info()
1607
1581
            basis_tree = self.basis_tree()
1608
1582
            count = self.branch.pull(source, overwrite, stop_revision,
1609
 
                                     possible_transports=possible_transports,
1610
 
                                     local=local)
 
1583
                                     possible_transports=possible_transports)
1611
1584
            new_revision_info = self.branch.last_revision_info()
1612
1585
            if new_revision_info != old_revision_info:
 
1586
                pp.next_phase()
1613
1587
                repository = self.branch.repository
 
1588
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1614
1589
                basis_tree.lock_read()
1615
1590
                try:
1616
1591
                    new_basis_tree = self.branch.basis_tree()
1619
1594
                                new_basis_tree,
1620
1595
                                basis_tree,
1621
1596
                                this_tree=self,
1622
 
                                pb=None,
 
1597
                                pb=pb,
1623
1598
                                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)
 
1599
                    if (basis_tree.inventory.root is None and
 
1600
                        new_basis_tree.inventory.root is not None):
 
1601
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1602
                finally:
 
1603
                    pb.finished()
1629
1604
                    basis_tree.unlock()
1630
1605
                # TODO - dedup parents list with things merged by pull ?
1631
1606
                # reuse the revisiontree we merged against to set the new
1644
1619
            return count
1645
1620
        finally:
1646
1621
            source.unlock()
 
1622
            top_pb.finished()
1647
1623
 
1648
1624
    @needs_write_lock
1649
1625
    def put_file_bytes_non_atomic(self, file_id, bytes):
1675
1651
 
1676
1652
            fl = []
1677
1653
            for subf in os.listdir(dirabs):
1678
 
                if self.bzrdir.is_control_filename(subf):
 
1654
                if subf == '.bzr':
1679
1655
                    continue
1680
1656
                if subf not in dir_entry.children:
1681
1657
                    try:
1734
1710
        r"""Check whether the filename matches an ignore pattern.
1735
1711
 
1736
1712
        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.
 
1713
        others match against only the last component.
1740
1714
 
1741
1715
        If the file is ignored, returns the pattern which caused it to
1742
1716
        be ignored, otherwise None.  So this can simply be used as a
1743
1717
        boolean if desired."""
1744
1718
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1719
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1720
        return self._ignoreglobster.match(filename)
1747
1721
 
1748
1722
    def kind(self, file_id):
1839
1813
    def _reset_data(self):
1840
1814
        """Reset transient data that cannot be revalidated."""
1841
1815
        self._inventory_is_modified = False
1842
 
        f = self._transport.get('inventory')
1843
 
        try:
1844
 
            result = self._deserialize(f)
1845
 
        finally:
1846
 
            f.close()
 
1816
        result = self._deserialize(self._transport.get('inventory'))
1847
1817
        self._set_inventory(result, dirty=False)
1848
1818
 
1849
1819
    @needs_tree_write_lock
1896
1866
            # revision_id is set. We must check for this full string, because a
1897
1867
            # root node id can legitimately look like 'revision_id' but cannot
1898
1868
            # contain a '"'.
1899
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1869
            xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1870
            firstline = xml.split('\n', 1)[0]
1901
1871
            if (not 'revision_id="' in firstline or
1902
1872
                'format="7"' not in firstline):
1903
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1904
 
                    xml, new_revision)
 
1873
                inv = self.branch.repository.deserialise_inventory(
 
1874
                    new_revision, xml)
1905
1875
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1906
1876
            self._write_basis_inventory(xml)
1907
1877
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
1895
        # binary.
1926
1896
        if self._inventory_is_modified:
1927
1897
            raise errors.InventoryModified(self)
1928
 
        f = self._transport.get('inventory')
1929
 
        try:
1930
 
            result = self._deserialize(f)
1931
 
        finally:
1932
 
            f.close()
 
1898
        result = self._deserialize(self._transport.get('inventory'))
1933
1899
        self._set_inventory(result, dirty=False)
1934
1900
        return result
1935
1901
 
1950
1916
 
1951
1917
        new_files=set()
1952
1918
        unknown_nested_files=set()
1953
 
        if to_file is None:
1954
 
            to_file = sys.stdout
1955
1919
 
1956
1920
        def recurse_directory_to_add_files(directory):
1957
1921
            # Recurse directory and add all files
2027
1991
                        new_status = 'I'
2028
1992
                    else:
2029
1993
                        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')
 
1994
                    textui.show_status(new_status, self.kind(fid), f,
 
1995
                                       to_file=to_file)
2033
1996
                # Unversion file
2034
1997
                inv_delta.append((f, None, fid, None))
2035
1998
                message = "removed %s" % (f,)
2058
2021
 
2059
2022
    @needs_tree_write_lock
2060
2023
    def revert(self, filenames=None, old_tree=None, backups=True,
2061
 
               pb=None, report_changes=False):
 
2024
               pb=DummyProgress(), report_changes=False):
2062
2025
        from bzrlib.conflicts import resolve
2063
2026
        if filenames == []:
2064
2027
            filenames = None
2077
2040
            if filenames is None and len(self.get_parent_ids()) > 1:
2078
2041
                parent_trees = []
2079
2042
                last_revision = self.last_revision()
2080
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2043
                if last_revision != NULL_REVISION:
2081
2044
                    if basis_tree is None:
2082
2045
                        basis_tree = self.basis_tree()
2083
2046
                        basis_tree.lock_read()
2121
2084
    def set_inventory(self, new_inventory_list):
2122
2085
        from bzrlib.inventory import (Inventory,
2123
2086
                                      InventoryDirectory,
 
2087
                                      InventoryEntry,
2124
2088
                                      InventoryFile,
2125
2089
                                      InventoryLink)
2126
2090
        inv = Inventory(self.get_root_id())
2186
2150
        """
2187
2151
        raise NotImplementedError(self.unlock)
2188
2152
 
2189
 
    _marker = object()
2190
 
 
2191
 
    def update(self, change_reporter=None, possible_transports=None,
2192
 
               revision=None, old_tip=_marker):
 
2153
    def update(self, change_reporter=None, possible_transports=None):
2193
2154
        """Update a working tree along its branch.
2194
2155
 
2195
2156
        This will update the branch if its bound too, which means we have
2213
2174
        - Merge current state -> basis tree of the master w.r.t. the old tree
2214
2175
          basis.
2215
2176
        - 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
2177
        """
2223
2178
        if self.branch.get_bound_location() is not None:
2224
2179
            self.lock_write()
2225
 
            update_branch = (old_tip is self._marker)
 
2180
            update_branch = True
2226
2181
        else:
2227
2182
            self.lock_tree_write()
2228
2183
            update_branch = False
2230
2185
            if update_branch:
2231
2186
                old_tip = self.branch.update(possible_transports)
2232
2187
            else:
2233
 
                if old_tip is self._marker:
2234
 
                    old_tip = None
2235
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2188
                old_tip = None
 
2189
            return self._update_tree(old_tip, change_reporter)
2236
2190
        finally:
2237
2191
            self.unlock()
2238
2192
 
2239
2193
    @needs_tree_write_lock
2240
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2194
    def _update_tree(self, old_tip=None, change_reporter=None):
2241
2195
        """Update a tree to the master branch.
2242
2196
 
2243
2197
        :param old_tip: if supplied, the previous tip revision the branch,
2253
2207
        # We MUST save it even if an error occurs, because otherwise the users
2254
2208
        # local work is unreferenced and will appear to have been lost.
2255
2209
        #
2256
 
        nb_conflicts = 0
 
2210
        result = 0
2257
2211
        try:
2258
2212
            last_rev = self.get_parent_ids()[0]
2259
2213
        except IndexError:
2260
2214
            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
 
 
 
2215
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2216
            # merge tree state up to new branch tip.
2285
2217
            basis = self.basis_tree()
2286
2218
            basis.lock_read()
2287
2219
            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)
 
2220
                to_tree = self.branch.basis_tree()
 
2221
                if basis.inventory.root is None:
 
2222
                    self.set_root_id(to_tree.get_root_id())
2291
2223
                    self.flush()
 
2224
                result += merge.merge_inner(
 
2225
                                      self.branch,
 
2226
                                      to_tree,
 
2227
                                      basis,
 
2228
                                      this_tree=self,
 
2229
                                      change_reporter=change_reporter)
2292
2230
            finally:
2293
2231
                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
2232
            # TODO - dedup parents list with things merged by pull ?
2306
2233
            # reuse the tree we've updated to to set the basis:
2307
 
            parent_trees = [(revision, to_tree)]
 
2234
            parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2235
            merges = self.get_parent_ids()[1:]
2309
2236
            # Ideally we ask the tree for the trees here, that way the working
2310
2237
            # tree can decide whether to give us the entire tree or give us a
2314
2241
            for parent in merges:
2315
2242
                parent_trees.append(
2316
2243
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2244
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2245
                parent_trees.append(
2319
2246
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2247
            self.set_parent_trees(parent_trees)
2321
2248
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2249
        else:
 
2250
            # the working tree had the same last-revision as the master
 
2251
            # branch did. We may still have pivot local work from the local
 
2252
            # branch into old_tip:
 
2253
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2254
                self.add_parent_tree_id(old_tip)
 
2255
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2256
            and old_tip != last_rev):
 
2257
            # our last revision was not the prior branch last revision
 
2258
            # and we have converted that last revision to a pending merge.
 
2259
            # base is somewhere between the branch tip now
 
2260
            # and the now pending merge
 
2261
 
 
2262
            # Since we just modified the working tree and inventory, flush out
 
2263
            # the current state, before we modify it again.
 
2264
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2265
            #       requires it only because TreeTransform directly munges the
 
2266
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2267
            #       should be able to remove this extra flush.
 
2268
            self.flush()
 
2269
            graph = self.branch.repository.get_graph()
 
2270
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2271
                                                old_tip)
 
2272
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2273
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2274
            result += merge.merge_inner(
 
2275
                                  self.branch,
 
2276
                                  other_tree,
 
2277
                                  base_tree,
 
2278
                                  this_tree=self,
 
2279
                                  change_reporter=change_reporter)
 
2280
        return result
2323
2281
 
2324
2282
    def _write_hashcache_if_dirty(self):
2325
2283
        """Write out the hashcache if it is dirty."""
2425
2383
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2426
2384
                        ('.bzr', '.bzr'))
2427
2385
                    if (bzrdir_loc < len(cur_disk_dir_content)
2428
 
                        and self.bzrdir.is_control_filename(
2429
 
                            cur_disk_dir_content[bzrdir_loc][0])):
 
2386
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
2430
2387
                        # we dont yield the contents of, or, .bzr itself.
2431
2388
                        del cur_disk_dir_content[bzrdir_loc]
2432
2389
            if inv_finished:
2595
2552
        """
2596
2553
        return
2597
2554
 
 
2555
    @needs_read_lock
2598
2556
    def _get_rules_searcher(self, default_searcher):
2599
2557
        """See Tree._get_rules_searcher."""
2600
2558
        if self._rules_searcher is None:
2682
2640
 
2683
2641
    def _change_last_revision(self, revision_id):
2684
2642
        """See WorkingTree._change_last_revision."""
2685
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2643
        if revision_id is None or revision_id == NULL_REVISION:
2686
2644
            try:
2687
2645
                self._transport.delete('last-revision')
2688
2646
            except errors.NoSuchFile:
2779
2737
        """Return the format for the working tree object in a_bzrdir."""
2780
2738
        try:
2781
2739
            transport = a_bzrdir.get_workingtree_transport(None)
2782
 
            format_string = transport.get_bytes("format")
 
2740
            format_string = transport.get("format").read()
2783
2741
            return klass._formats[format_string]
2784
2742
        except errors.NoSuchFile:
2785
2743
            raise errors.NoWorkingTree(base=transport.base)
2856
2814
        no working tree.  (See bug #43064).
2857
2815
        """
2858
2816
        sio = StringIO()
2859
 
        inv = inventory.Inventory()
 
2817
        inv = Inventory()
2860
2818
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2861
2819
        sio.seek(0)
2862
2820
        transport.put_file('inventory', sio, file_mode)
2878
2836
            branch.generate_revision_history(revision_id)
2879
2837
        finally:
2880
2838
            branch.unlock()
2881
 
        inv = inventory.Inventory()
 
2839
        inv = Inventory()
2882
2840
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2883
2841
                         branch,
2884
2842
                         inv,
3001
2959
            # only set an explicit root id if there is one to set.
3002
2960
            if basis_tree.inventory.root is not None:
3003
2961
                wt.set_root_id(basis_tree.get_root_id())
3004
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2962
            if revision_id == NULL_REVISION:
3005
2963
                wt.set_parent_trees([])
3006
2964
            else:
3007
2965
                wt.set_parent_trees([(revision_id, basis_tree)])
3014
2972
        return wt
3015
2973
 
3016
2974
    def _initial_inventory(self):
3017
 
        return inventory.Inventory()
 
2975
        return Inventory()
3018
2976
 
3019
2977
    def __init__(self):
3020
2978
        super(WorkingTreeFormat3, self).__init__()
3049
3007
        return self.get_format_string()
3050
3008
 
3051
3009
 
3052
 
__default_format = WorkingTreeFormat6()
 
3010
__default_format = WorkingTreeFormat4()
3053
3011
WorkingTreeFormat.register_format(__default_format)
 
3012
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3054
3013
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
3014
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
3015
WorkingTreeFormat.set_default_format(__default_format)
3058
3016
# formats which have no format string are not discoverable