/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: Martin Pool
  • Date: 2009-06-30 04:13:19 UTC
  • mto: This revision was merged to the branch mainline in revision 4491.
  • Revision ID: mbp@sourcefrog.net-20090630041319-luqqrjw1nn59chft
https://launchpad.net/bugs/218206
test and news for forcing readonly deletion

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
42
48
import itertools
43
49
import operator
44
50
import stat
 
51
from time import time
 
52
import warnings
45
53
import re
46
54
 
47
55
import bzrlib
49
57
    branch,
50
58
    bzrdir,
51
59
    conflicts as _mod_conflicts,
 
60
    dirstate,
52
61
    errors,
53
62
    generate_ids,
54
63
    globbing,
55
 
    graph as _mod_graph,
56
64
    hashcache,
57
65
    ignores,
58
 
    inventory,
59
66
    merge,
60
67
    revision as _mod_revision,
61
68
    revisiontree,
 
69
    repository,
 
70
    textui,
62
71
    trace,
63
72
    transform,
64
73
    ui,
 
74
    urlutils,
65
75
    views,
66
76
    xml5,
 
77
    xml6,
67
78
    xml7,
68
79
    )
69
80
import bzrlib.branch
70
81
from bzrlib.transport import get_transport
 
82
import bzrlib.ui
71
83
from bzrlib.workingtree_4 import (
72
84
    WorkingTreeFormat4,
73
85
    WorkingTreeFormat5,
77
89
 
78
90
from bzrlib import symbol_versioning
79
91
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
 
from bzrlib.lock import LogicalLockResult
 
92
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
81
93
from bzrlib.lockable_files import LockableFiles
82
94
from bzrlib.lockdir import LockDir
83
95
import bzrlib.mutabletree
84
96
from bzrlib.mutabletree import needs_tree_write_lock
85
97
from bzrlib import osutils
86
98
from bzrlib.osutils import (
 
99
    compact_date,
87
100
    file_kind,
88
101
    isdir,
89
102
    normpath,
90
103
    pathjoin,
 
104
    rand_chars,
91
105
    realpath,
92
106
    safe_unicode,
93
107
    splitpath,
96
110
from bzrlib.filters import filtered_input_file
97
111
from bzrlib.trace import mutter, note
98
112
from bzrlib.transport.local import LocalTransport
99
 
from bzrlib.revision import CURRENT_REVISION
 
113
from bzrlib.progress import DummyProgress, ProgressPhase
 
114
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
100
115
from bzrlib.rio import RioReader, rio_file, Stanza
101
 
from bzrlib.symbol_versioning import (
102
 
    deprecated_passed,
103
 
    DEPRECATED_PARAMETER,
104
 
    )
 
116
from bzrlib.symbol_versioning import (deprecated_passed,
 
117
        deprecated_method,
 
118
        deprecated_function,
 
119
        DEPRECATED_PARAMETER,
 
120
        )
105
121
 
106
122
 
107
123
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
 
# TODO: Modifying the conflict objects or their type is currently nearly
109
 
# impossible as there is no clear relationship between the working tree format
110
 
# and the conflict list file format.
111
124
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
125
 
113
126
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
181
        return ''
169
182
 
170
183
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
184
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
185
    """Working copy tree.
174
186
 
175
187
    The inventory is held in the `Branch` working-inventory, and the
248
260
        self._rules_searcher = None
249
261
        self.views = self._make_views()
250
262
 
251
 
    @property
252
 
    def user_transport(self):
253
 
        return self.bzrdir.user_transport
254
 
 
255
 
    @property
256
 
    def control_transport(self):
257
 
        return self._transport
258
 
 
259
263
    def _detect_case_handling(self):
260
264
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
265
        try:
286
290
        self._control_files.break_lock()
287
291
        self.branch.break_lock()
288
292
 
289
 
    def _get_check_refs(self):
290
 
        """Return the references needed to perform a check of this tree.
291
 
        
292
 
        The default implementation returns no refs, and is only suitable for
293
 
        trees that have no local caching and can commit on ghosts at any time.
294
 
 
295
 
        :seealso: bzrlib.check for details about check_refs.
296
 
        """
297
 
        return []
298
 
 
299
293
    def requires_rich_root(self):
300
294
        return self._format.requires_rich_root
301
295
 
463
457
        return (file_obj, stat_value)
464
458
 
465
459
    def get_file_text(self, file_id, path=None, filtered=True):
466
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
467
 
        try:
468
 
            return my_file.read()
469
 
        finally:
470
 
            my_file.close()
 
460
        return self.get_file(file_id, path=path, filtered=filtered).read()
471
461
 
472
462
    def get_file_byname(self, filename, filtered=True):
473
463
        path = self.abspath(filename)
497
487
        incorrectly attributed to CURRENT_REVISION (but after committing, the
498
488
        attribution will be correct).
499
489
        """
500
 
        maybe_file_parent_keys = []
501
 
        for parent_id in self.get_parent_ids():
502
 
            try:
503
 
                parent_tree = self.revision_tree(parent_id)
504
 
            except errors.NoSuchRevisionInTree:
505
 
                parent_tree = self.branch.repository.revision_tree(parent_id)
506
 
            parent_tree.lock_read()
507
 
            try:
508
 
                if file_id not in parent_tree:
509
 
                    continue
510
 
                ie = parent_tree.inventory[file_id]
511
 
                if ie.kind != 'file':
512
 
                    # Note: this is slightly unnecessary, because symlinks and
513
 
                    # directories have a "text" which is the empty text, and we
514
 
                    # know that won't mess up annotations. But it seems cleaner
515
 
                    continue
516
 
                parent_text_key = (file_id, ie.revision)
517
 
                if parent_text_key not in maybe_file_parent_keys:
518
 
                    maybe_file_parent_keys.append(parent_text_key)
519
 
            finally:
520
 
                parent_tree.unlock()
521
 
        graph = _mod_graph.Graph(self.branch.repository.texts)
522
 
        heads = graph.heads(maybe_file_parent_keys)
523
 
        file_parent_keys = []
524
 
        for key in maybe_file_parent_keys:
525
 
            if key in heads:
526
 
                file_parent_keys.append(key)
527
 
 
528
 
        # Now we have the parents of this content
529
 
        annotator = self.branch.repository.texts.get_annotator()
530
 
        text = self.get_file_text(file_id)
531
 
        this_key =(file_id, default_revision)
532
 
        annotator.add_special_text(this_key, file_parent_keys, text)
533
 
        annotations = [(key[-1], line)
534
 
                       for key, line in annotator.annotate_flat(this_key)]
535
 
        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()
536
515
 
537
516
    def _get_ancestors(self, default_revision):
538
517
        ancestors = set([default_revision])
553
532
        else:
554
533
            parents = [last_rev]
555
534
        try:
556
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
535
            merges_file = self._transport.get('pending-merges')
557
536
        except errors.NoSuchFile:
558
537
            pass
559
538
        else:
560
 
            for l in osutils.split_lines(merges_bytes):
 
539
            for l in merges_file.readlines():
561
540
                revision_id = l.rstrip('\n')
562
541
                parents.append(revision_id)
563
542
        return parents
622
601
 
623
602
    def get_file_size(self, file_id):
624
603
        """See Tree.get_file_size"""
625
 
        # XXX: this returns the on-disk size; it should probably return the
626
 
        # canonical size
627
604
        try:
628
605
            return os.path.getsize(self.id2abspath(file_id))
629
606
        except OSError, e:
645
622
 
646
623
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
647
624
        file_id = self.path2id(path)
648
 
        if file_id is None:
649
 
            # For unversioned files on win32, we just assume they are not
650
 
            # executable
651
 
            return False
652
625
        return self._inventory[file_id].executable
653
626
 
654
627
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
764
737
            raise
765
738
        kind = _mapper(stat_result.st_mode)
766
739
        if kind == 'file':
767
 
            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))
768
745
        elif kind == 'directory':
769
746
            # perhaps it looks like a plain directory, but it's really a
770
747
            # reference.
777
754
        else:
778
755
            return (kind, None, None, None)
779
756
 
780
 
    def _file_content_summary(self, path, stat_result):
781
 
        size = stat_result.st_size
782
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
783
 
        # try for a stat cache lookup
784
 
        return ('file', size, executable, self._sha_from_stat(
785
 
            path, stat_result))
786
 
 
787
757
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
788
758
        """Common ghost checking functionality from set_parent_*.
789
759
 
909
879
 
910
880
    @needs_write_lock # because merge pulls data into the branch.
911
881
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
912
 
                          merge_type=None, force=False):
 
882
        merge_type=None):
913
883
        """Merge from a branch into this working tree.
914
884
 
915
885
        :param branch: The branch to merge from.
919
889
            branch.last_revision().
920
890
        """
921
891
        from bzrlib.merge import Merger, Merge3Merger
922
 
        merger = Merger(self.branch, this_tree=self)
923
 
        # check that there are no local alterations
924
 
        if not force and self.has_changes():
925
 
            raise errors.UncommittedChanges(self)
926
 
        if to_revision is None:
927
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
928
 
        merger.other_rev_id = to_revision
929
 
        if _mod_revision.is_null(merger.other_rev_id):
930
 
            raise errors.NoCommits(branch)
931
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
932
 
        merger.other_basis = merger.other_rev_id
933
 
        merger.other_tree = self.branch.repository.revision_tree(
934
 
            merger.other_rev_id)
935
 
        merger.other_branch = branch
936
 
        if from_revision is None:
937
 
            merger.find_base()
938
 
        else:
939
 
            merger.set_base_revision(from_revision, branch)
940
 
        if merger.base_rev_id == merger.other_rev_id:
941
 
            raise errors.PointlessMerge
942
 
        merger.backup_files = False
943
 
        if merge_type is None:
944
 
            merger.merge_type = Merge3Merger
945
 
        else:
946
 
            merger.merge_type = merge_type
947
 
        merger.set_interesting_files(None)
948
 
        merger.show_base = False
949
 
        merger.reprocess = False
950
 
        conflicts = merger.do_merge()
951
 
        merger.set_pending()
 
892
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
893
        try:
 
894
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
895
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
896
            merger.pp.next_phase()
 
897
            # check that there are no
 
898
            # local alterations
 
899
            merger.check_basis(check_clean=True, require_commits=False)
 
900
            if to_revision is None:
 
901
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
902
            merger.other_rev_id = to_revision
 
903
            if _mod_revision.is_null(merger.other_rev_id):
 
904
                raise errors.NoCommits(branch)
 
905
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
906
            merger.other_basis = merger.other_rev_id
 
907
            merger.other_tree = self.branch.repository.revision_tree(
 
908
                merger.other_rev_id)
 
909
            merger.other_branch = branch
 
910
            merger.pp.next_phase()
 
911
            if from_revision is None:
 
912
                merger.find_base()
 
913
            else:
 
914
                merger.set_base_revision(from_revision, branch)
 
915
            if merger.base_rev_id == merger.other_rev_id:
 
916
                raise errors.PointlessMerge
 
917
            merger.backup_files = False
 
918
            if merge_type is None:
 
919
                merger.merge_type = Merge3Merger
 
920
            else:
 
921
                merger.merge_type = merge_type
 
922
            merger.set_interesting_files(None)
 
923
            merger.show_base = False
 
924
            merger.reprocess = False
 
925
            conflicts = merger.do_merge()
 
926
            merger.set_pending()
 
927
        finally:
 
928
            pb.finished()
952
929
        return conflicts
953
930
 
954
931
    @needs_read_lock
1101
1078
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1102
1079
        if tree_transport.base != branch_transport.base:
1103
1080
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1104
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1105
 
                target_branch=new_branch)
 
1081
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1106
1082
        else:
1107
1083
            tree_bzrdir = branch_bzrdir
1108
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1084
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1109
1085
        wt.set_parent_ids(self.get_parent_ids())
1110
1086
        my_inv = self.inventory
1111
 
        child_inv = inventory.Inventory(root_id=None)
 
1087
        child_inv = Inventory(root_id=None)
1112
1088
        new_root = my_inv[file_id]
1113
1089
        my_inv.remove_recursive_id(file_id)
1114
1090
        new_root.parent_id = None
1146
1122
        This does not include files that have been deleted in this
1147
1123
        tree. Skips the control directory.
1148
1124
 
1149
 
        :param include_root: if True, return an entry for the root
 
1125
        :param include_root: if True, do not return an entry for the root
1150
1126
        :param from_dir: start from this directory or None for the root
1151
1127
        :param recursive: whether to recurse into subdirectories or not
1152
1128
        """
1440
1416
        inv = self.inventory
1441
1417
        for entry in moved:
1442
1418
            try:
1443
 
                self._move_entry(WorkingTree._RenameEntry(
1444
 
                    entry.to_rel, entry.from_id,
 
1419
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1445
1420
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1446
1421
                    entry.from_tail, entry.from_parent_id,
1447
1422
                    entry.only_change_inv))
1498
1473
        from_tail = splitpath(from_rel)[-1]
1499
1474
        from_id = inv.path2id(from_rel)
1500
1475
        if from_id is None:
1501
 
            # if file is missing in the inventory maybe it's in the basis_tree
1502
 
            basis_tree = self.branch.basis_tree()
1503
 
            from_id = basis_tree.path2id(from_rel)
1504
 
            if from_id is None:
1505
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1506
 
                    errors.NotVersionedError(path=str(from_rel)))
1507
 
            # put entry back in the inventory so we can rename it
1508
 
            from_entry = basis_tree.inventory[from_id].copy()
1509
 
            inv.add(from_entry)
1510
 
        else:
1511
 
            from_entry = inv[from_id]
 
1476
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1477
                errors.NotVersionedError(path=str(from_rel)))
 
1478
        from_entry = inv[from_id]
1512
1479
        from_parent_id = from_entry.parent_id
1513
1480
        to_dir, to_tail = os.path.split(to_rel)
1514
1481
        to_dir_id = inv.path2id(to_dir)
1606
1573
    @needs_write_lock
1607
1574
    def pull(self, source, overwrite=False, stop_revision=None,
1608
1575
             change_reporter=None, possible_transports=None, local=False):
 
1576
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1609
1577
        source.lock_read()
1610
1578
        try:
 
1579
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1580
            pp.next_phase()
1611
1581
            old_revision_info = self.branch.last_revision_info()
1612
1582
            basis_tree = self.basis_tree()
1613
1583
            count = self.branch.pull(source, overwrite, stop_revision,
1615
1585
                                     local=local)
1616
1586
            new_revision_info = self.branch.last_revision_info()
1617
1587
            if new_revision_info != old_revision_info:
 
1588
                pp.next_phase()
1618
1589
                repository = self.branch.repository
 
1590
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1619
1591
                basis_tree.lock_read()
1620
1592
                try:
1621
1593
                    new_basis_tree = self.branch.basis_tree()
1624
1596
                                new_basis_tree,
1625
1597
                                basis_tree,
1626
1598
                                this_tree=self,
1627
 
                                pb=None,
 
1599
                                pb=pb,
1628
1600
                                change_reporter=change_reporter)
1629
 
                    basis_root_id = basis_tree.get_root_id()
1630
 
                    new_root_id = new_basis_tree.get_root_id()
1631
 
                    if basis_root_id != new_root_id:
1632
 
                        self.set_root_id(new_root_id)
 
1601
                    if (basis_tree.inventory.root is None and
 
1602
                        new_basis_tree.inventory.root is not None):
 
1603
                        self.set_root_id(new_basis_tree.get_root_id())
1633
1604
                finally:
 
1605
                    pb.finished()
1634
1606
                    basis_tree.unlock()
1635
1607
                # TODO - dedup parents list with things merged by pull ?
1636
1608
                # reuse the revisiontree we merged against to set the new
1649
1621
            return count
1650
1622
        finally:
1651
1623
            source.unlock()
 
1624
            top_pb.finished()
1652
1625
 
1653
1626
    @needs_write_lock
1654
1627
    def put_file_bytes_non_atomic(self, file_id, bytes):
1739
1712
        r"""Check whether the filename matches an ignore pattern.
1740
1713
 
1741
1714
        Patterns containing '/' or '\' need to match the whole path;
1742
 
        others match against only the last component.  Patterns starting
1743
 
        with '!' are ignore exceptions.  Exceptions take precedence
1744
 
        over regular patterns and cause the filename to not be ignored.
 
1715
        others match against only the last component.
1745
1716
 
1746
1717
        If the file is ignored, returns the pattern which caused it to
1747
1718
        be ignored, otherwise None.  So this can simply be used as a
1748
1719
        boolean if desired."""
1749
1720
        if getattr(self, '_ignoreglobster', None) is None:
1750
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1721
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1751
1722
        return self._ignoreglobster.match(filename)
1752
1723
 
1753
1724
    def kind(self, file_id):
1803
1774
            raise errors.ObjectNotLocked(self)
1804
1775
 
1805
1776
    def lock_read(self):
1806
 
        """Lock the tree for reading.
1807
 
 
1808
 
        This also locks the branch, and can be unlocked via self.unlock().
1809
 
 
1810
 
        :return: A bzrlib.lock.LogicalLockResult.
1811
 
        """
 
1777
        """See Branch.lock_read, and WorkingTree.unlock."""
1812
1778
        if not self.is_locked():
1813
1779
            self._reset_data()
1814
1780
        self.branch.lock_read()
1815
1781
        try:
1816
 
            self._control_files.lock_read()
1817
 
            return LogicalLockResult(self.unlock)
 
1782
            return self._control_files.lock_read()
1818
1783
        except:
1819
1784
            self.branch.unlock()
1820
1785
            raise
1821
1786
 
1822
1787
    def lock_tree_write(self):
1823
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1824
 
 
1825
 
        :return: A bzrlib.lock.LogicalLockResult.
1826
 
        """
 
1788
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1827
1789
        if not self.is_locked():
1828
1790
            self._reset_data()
1829
1791
        self.branch.lock_read()
1830
1792
        try:
1831
 
            self._control_files.lock_write()
1832
 
            return LogicalLockResult(self.unlock)
 
1793
            return self._control_files.lock_write()
1833
1794
        except:
1834
1795
            self.branch.unlock()
1835
1796
            raise
1836
1797
 
1837
1798
    def lock_write(self):
1838
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1839
 
 
1840
 
        :return: A bzrlib.lock.LogicalLockResult.
1841
 
        """
 
1799
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1842
1800
        if not self.is_locked():
1843
1801
            self._reset_data()
1844
1802
        self.branch.lock_write()
1845
1803
        try:
1846
 
            self._control_files.lock_write()
1847
 
            return LogicalLockResult(self.unlock)
 
1804
            return self._control_files.lock_write()
1848
1805
        except:
1849
1806
            self.branch.unlock()
1850
1807
            raise
1858
1815
    def _reset_data(self):
1859
1816
        """Reset transient data that cannot be revalidated."""
1860
1817
        self._inventory_is_modified = False
1861
 
        f = self._transport.get('inventory')
1862
 
        try:
1863
 
            result = self._deserialize(f)
1864
 
        finally:
1865
 
            f.close()
 
1818
        result = self._deserialize(self._transport.get('inventory'))
1866
1819
        self._set_inventory(result, dirty=False)
1867
1820
 
1868
1821
    @needs_tree_write_lock
1915
1868
            # revision_id is set. We must check for this full string, because a
1916
1869
            # root node id can legitimately look like 'revision_id' but cannot
1917
1870
            # contain a '"'.
1918
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1871
            xml = self.branch.repository.get_inventory_xml(new_revision)
1919
1872
            firstline = xml.split('\n', 1)[0]
1920
1873
            if (not 'revision_id="' in firstline or
1921
1874
                'format="7"' not in firstline):
1922
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1923
 
                    xml, new_revision)
 
1875
                inv = self.branch.repository.deserialise_inventory(
 
1876
                    new_revision, xml)
1924
1877
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1925
1878
            self._write_basis_inventory(xml)
1926
1879
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1944
1897
        # binary.
1945
1898
        if self._inventory_is_modified:
1946
1899
            raise errors.InventoryModified(self)
1947
 
        f = self._transport.get('inventory')
1948
 
        try:
1949
 
            result = self._deserialize(f)
1950
 
        finally:
1951
 
            f.close()
 
1900
        result = self._deserialize(self._transport.get('inventory'))
1952
1901
        self._set_inventory(result, dirty=False)
1953
1902
        return result
1954
1903
 
1969
1918
 
1970
1919
        new_files=set()
1971
1920
        unknown_nested_files=set()
1972
 
        if to_file is None:
1973
 
            to_file = sys.stdout
1974
1921
 
1975
1922
        def recurse_directory_to_add_files(directory):
1976
1923
            # Recurse directory and add all files
1977
1924
            # so we can check if they have changed.
1978
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1925
            for parent_info, file_infos in\
 
1926
                self.walkdirs(directory):
1979
1927
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1980
1928
                    # Is it versioned or ignored?
1981
1929
                    if self.path2id(relpath) or self.is_ignored(relpath):
2016
1964
                            # ... but not ignored
2017
1965
                            has_changed_files = True
2018
1966
                            break
2019
 
                    elif (content_change and (kind[1] is not None) and
2020
 
                            osutils.is_inside_any(files, path[1])):
2021
 
                        # Versioned and changed, but not deleted, and still
2022
 
                        # in one of the dirs to be deleted.
 
1967
                    elif content_change and (kind[1] is not None):
 
1968
                        # Versioned and changed, but not deleted
2023
1969
                        has_changed_files = True
2024
1970
                        break
2025
1971
 
2047
1993
                        new_status = 'I'
2048
1994
                    else:
2049
1995
                        new_status = '?'
2050
 
                    # XXX: Really should be a more abstract reporter interface
2051
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2052
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1996
                    textui.show_status(new_status, self.kind(fid), f,
 
1997
                                       to_file=to_file)
2053
1998
                # Unversion file
2054
1999
                inv_delta.append((f, None, fid, None))
2055
2000
                message = "removed %s" % (f,)
2078
2023
 
2079
2024
    @needs_tree_write_lock
2080
2025
    def revert(self, filenames=None, old_tree=None, backups=True,
2081
 
               pb=None, report_changes=False):
 
2026
               pb=DummyProgress(), report_changes=False):
2082
2027
        from bzrlib.conflicts import resolve
2083
2028
        if filenames == []:
2084
2029
            filenames = None
2097
2042
            if filenames is None and len(self.get_parent_ids()) > 1:
2098
2043
                parent_trees = []
2099
2044
                last_revision = self.last_revision()
2100
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2045
                if last_revision != NULL_REVISION:
2101
2046
                    if basis_tree is None:
2102
2047
                        basis_tree = self.basis_tree()
2103
2048
                        basis_tree.lock_read()
2141
2086
    def set_inventory(self, new_inventory_list):
2142
2087
        from bzrlib.inventory import (Inventory,
2143
2088
                                      InventoryDirectory,
 
2089
                                      InventoryEntry,
2144
2090
                                      InventoryFile,
2145
2091
                                      InventoryLink)
2146
2092
        inv = Inventory(self.get_root_id())
2206
2152
        """
2207
2153
        raise NotImplementedError(self.unlock)
2208
2154
 
2209
 
    _marker = object()
2210
 
 
2211
 
    def update(self, change_reporter=None, possible_transports=None,
2212
 
               revision=None, old_tip=_marker):
 
2155
    def update(self, change_reporter=None, possible_transports=None):
2213
2156
        """Update a working tree along its branch.
2214
2157
 
2215
2158
        This will update the branch if its bound too, which means we have
2233
2176
        - Merge current state -> basis tree of the master w.r.t. the old tree
2234
2177
          basis.
2235
2178
        - Do a 'normal' merge of the old branch basis if it is relevant.
2236
 
 
2237
 
        :param revision: The target revision to update to. Must be in the
2238
 
            revision history.
2239
 
        :param old_tip: If branch.update() has already been run, the value it
2240
 
            returned (old tip of the branch or None). _marker is used
2241
 
            otherwise.
2242
2179
        """
2243
2180
        if self.branch.get_bound_location() is not None:
2244
2181
            self.lock_write()
2245
 
            update_branch = (old_tip is self._marker)
 
2182
            update_branch = True
2246
2183
        else:
2247
2184
            self.lock_tree_write()
2248
2185
            update_branch = False
2250
2187
            if update_branch:
2251
2188
                old_tip = self.branch.update(possible_transports)
2252
2189
            else:
2253
 
                if old_tip is self._marker:
2254
 
                    old_tip = None
2255
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2190
                old_tip = None
 
2191
            return self._update_tree(old_tip, change_reporter)
2256
2192
        finally:
2257
2193
            self.unlock()
2258
2194
 
2259
2195
    @needs_tree_write_lock
2260
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2196
    def _update_tree(self, old_tip=None, change_reporter=None):
2261
2197
        """Update a tree to the master branch.
2262
2198
 
2263
2199
        :param old_tip: if supplied, the previous tip revision the branch,
2273
2209
        # We MUST save it even if an error occurs, because otherwise the users
2274
2210
        # local work is unreferenced and will appear to have been lost.
2275
2211
        #
2276
 
        nb_conflicts = 0
 
2212
        result = 0
2277
2213
        try:
2278
2214
            last_rev = self.get_parent_ids()[0]
2279
2215
        except IndexError:
2280
2216
            last_rev = _mod_revision.NULL_REVISION
2281
 
        if revision is None:
2282
 
            revision = self.branch.last_revision()
2283
 
 
2284
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2285
 
 
2286
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2287
 
            # the branch we are bound to was updated
2288
 
            # merge those changes in first
2289
 
            base_tree  = self.basis_tree()
2290
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2291
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2292
 
                                             base_tree, this_tree=self,
2293
 
                                             change_reporter=change_reporter)
2294
 
            if nb_conflicts:
2295
 
                self.add_parent_tree((old_tip, other_tree))
2296
 
                trace.note('Rerun update after fixing the conflicts.')
2297
 
                return nb_conflicts
2298
 
 
2299
 
        if last_rev != _mod_revision.ensure_null(revision):
2300
 
            # the working tree is up to date with the branch
2301
 
            # we can merge the specified revision from master
2302
 
            to_tree = self.branch.repository.revision_tree(revision)
2303
 
            to_root_id = to_tree.get_root_id()
2304
 
 
 
2217
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2218
            # merge tree state up to new branch tip.
2305
2219
            basis = self.basis_tree()
2306
2220
            basis.lock_read()
2307
2221
            try:
2308
 
                if (basis.inventory.root is None
2309
 
                    or basis.inventory.root.file_id != to_root_id):
2310
 
                    self.set_root_id(to_root_id)
 
2222
                to_tree = self.branch.basis_tree()
 
2223
                if basis.inventory.root is None:
 
2224
                    self.set_root_id(to_tree.get_root_id())
2311
2225
                    self.flush()
 
2226
                result += merge.merge_inner(
 
2227
                                      self.branch,
 
2228
                                      to_tree,
 
2229
                                      basis,
 
2230
                                      this_tree=self,
 
2231
                                      change_reporter=change_reporter)
2312
2232
            finally:
2313
2233
                basis.unlock()
2314
 
 
2315
 
            # determine the branch point
2316
 
            graph = self.branch.repository.get_graph()
2317
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2318
 
                                                last_rev)
2319
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2320
 
 
2321
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2322
 
                                             this_tree=self,
2323
 
                                             change_reporter=change_reporter)
2324
 
            self.set_last_revision(revision)
2325
2234
            # TODO - dedup parents list with things merged by pull ?
2326
2235
            # reuse the tree we've updated to to set the basis:
2327
 
            parent_trees = [(revision, to_tree)]
 
2236
            parent_trees = [(self.branch.last_revision(), to_tree)]
2328
2237
            merges = self.get_parent_ids()[1:]
2329
2238
            # Ideally we ask the tree for the trees here, that way the working
2330
2239
            # tree can decide whether to give us the entire tree or give us a
2334
2243
            for parent in merges:
2335
2244
                parent_trees.append(
2336
2245
                    (parent, self.branch.repository.revision_tree(parent)))
2337
 
            if not _mod_revision.is_null(old_tip):
 
2246
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2338
2247
                parent_trees.append(
2339
2248
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2340
2249
            self.set_parent_trees(parent_trees)
2341
2250
            last_rev = parent_trees[0][0]
2342
 
        return nb_conflicts
 
2251
        else:
 
2252
            # the working tree had the same last-revision as the master
 
2253
            # branch did. We may still have pivot local work from the local
 
2254
            # branch into old_tip:
 
2255
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2256
                self.add_parent_tree_id(old_tip)
 
2257
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2258
            and old_tip != last_rev):
 
2259
            # our last revision was not the prior branch last revision
 
2260
            # and we have converted that last revision to a pending merge.
 
2261
            # base is somewhere between the branch tip now
 
2262
            # and the now pending merge
 
2263
 
 
2264
            # Since we just modified the working tree and inventory, flush out
 
2265
            # the current state, before we modify it again.
 
2266
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2267
            #       requires it only because TreeTransform directly munges the
 
2268
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2269
            #       should be able to remove this extra flush.
 
2270
            self.flush()
 
2271
            graph = self.branch.repository.get_graph()
 
2272
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2273
                                                old_tip)
 
2274
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2275
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2276
            result += merge.merge_inner(
 
2277
                                  self.branch,
 
2278
                                  other_tree,
 
2279
                                  base_tree,
 
2280
                                  this_tree=self,
 
2281
                                  change_reporter=change_reporter)
 
2282
        return result
2343
2283
 
2344
2284
    def _write_hashcache_if_dirty(self):
2345
2285
        """Write out the hashcache if it is dirty."""
2586
2526
        return un_resolved, resolved
2587
2527
 
2588
2528
    @needs_read_lock
2589
 
    def _check(self, references):
2590
 
        """Check the tree for consistency.
2591
 
 
2592
 
        :param references: A dict with keys matching the items returned by
2593
 
            self._get_check_refs(), and values from looking those keys up in
2594
 
            the repository.
2595
 
        """
 
2529
    def _check(self):
2596
2530
        tree_basis = self.basis_tree()
2597
2531
        tree_basis.lock_read()
2598
2532
        try:
2599
 
            repo_basis = references[('trees', self.last_revision())]
 
2533
            repo_basis = self.branch.repository.revision_tree(
 
2534
                self.last_revision())
2600
2535
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2601
2536
                raise errors.BzrCheckError(
2602
2537
                    "Mismatched basis inventory content.")
2615
2550
        """
2616
2551
        return
2617
2552
 
 
2553
    @needs_read_lock
2618
2554
    def _get_rules_searcher(self, default_searcher):
2619
2555
        """See Tree._get_rules_searcher."""
2620
2556
        if self._rules_searcher is None:
2647
2583
        if self._inventory is None:
2648
2584
            self.read_working_inventory()
2649
2585
 
2650
 
    def _get_check_refs(self):
2651
 
        """Return the references needed to perform a check of this tree."""
2652
 
        return [('trees', self.last_revision())]
2653
 
 
2654
2586
    def lock_tree_write(self):
2655
2587
        """See WorkingTree.lock_tree_write().
2656
2588
 
2657
2589
        In Format2 WorkingTrees we have a single lock for the branch and tree
2658
2590
        so lock_tree_write() degrades to lock_write().
2659
 
 
2660
 
        :return: An object with an unlock method which will release the lock
2661
 
            obtained.
2662
2591
        """
2663
2592
        self.branch.lock_write()
2664
2593
        try:
2665
 
            self._control_files.lock_write()
2666
 
            return self
 
2594
            return self._control_files.lock_write()
2667
2595
        except:
2668
2596
            self.branch.unlock()
2669
2597
            raise
2706
2634
 
2707
2635
    def _change_last_revision(self, revision_id):
2708
2636
        """See WorkingTree._change_last_revision."""
2709
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2637
        if revision_id is None or revision_id == NULL_REVISION:
2710
2638
            try:
2711
2639
                self._transport.delete('last-revision')
2712
2640
            except errors.NoSuchFile:
2717
2645
                mode=self.bzrdir._get_file_mode())
2718
2646
            return True
2719
2647
 
2720
 
    def _get_check_refs(self):
2721
 
        """Return the references needed to perform a check of this tree."""
2722
 
        return [('trees', self.last_revision())]
2723
 
 
2724
2648
    @needs_tree_write_lock
2725
2649
    def set_conflicts(self, conflicts):
2726
2650
        self._put_rio('conflicts', conflicts.to_stanzas(),
2803
2727
        """Return the format for the working tree object in a_bzrdir."""
2804
2728
        try:
2805
2729
            transport = a_bzrdir.get_workingtree_transport(None)
2806
 
            format_string = transport.get_bytes("format")
 
2730
            format_string = transport.get("format").read()
2807
2731
            return klass._formats[format_string]
2808
2732
        except errors.NoSuchFile:
2809
2733
            raise errors.NoWorkingTree(base=transport.base)
2880
2804
        no working tree.  (See bug #43064).
2881
2805
        """
2882
2806
        sio = StringIO()
2883
 
        inv = inventory.Inventory()
 
2807
        inv = Inventory()
2884
2808
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2885
2809
        sio.seek(0)
2886
2810
        transport.put_file('inventory', sio, file_mode)
2902
2826
            branch.generate_revision_history(revision_id)
2903
2827
        finally:
2904
2828
            branch.unlock()
2905
 
        inv = inventory.Inventory()
 
2829
        inv = Inventory()
2906
2830
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2907
2831
                         branch,
2908
2832
                         inv,
3025
2949
            # only set an explicit root id if there is one to set.
3026
2950
            if basis_tree.inventory.root is not None:
3027
2951
                wt.set_root_id(basis_tree.get_root_id())
3028
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2952
            if revision_id == NULL_REVISION:
3029
2953
                wt.set_parent_trees([])
3030
2954
            else:
3031
2955
                wt.set_parent_trees([(revision_id, basis_tree)])
3038
2962
        return wt
3039
2963
 
3040
2964
    def _initial_inventory(self):
3041
 
        return inventory.Inventory()
 
2965
        return Inventory()
3042
2966
 
3043
2967
    def __init__(self):
3044
2968
        super(WorkingTreeFormat3, self).__init__()
3073
2997
        return self.get_format_string()
3074
2998
 
3075
2999
 
3076
 
__default_format = WorkingTreeFormat6()
 
3000
__default_format = WorkingTreeFormat4()
3077
3001
WorkingTreeFormat.register_format(__default_format)
 
3002
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3078
3003
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3079
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3080
3004
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3081
3005
WorkingTreeFormat.set_default_format(__default_format)
3082
3006
# formats which have no format string are not discoverable