/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: John Arbash Meinel
  • Date: 2009-07-08 14:28:04 UTC
  • mto: This revision was merged to the branch mainline in revision 4521.
  • Revision ID: john@arbash-meinel.com-20090708142804-i9rkpi9dmnu7v3x1
https://launchpad.net/bugs/396838
Fix bug #396838, Update LRUCache to maintain invariant even
if a cleanup function raises an exception.

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
52
58
    errors,
53
59
    generate_ids,
54
60
    globbing,
55
 
    graph as _mod_graph,
56
61
    hashcache,
57
62
    ignores,
58
63
    inventory,
59
64
    merge,
60
65
    revision as _mod_revision,
61
66
    revisiontree,
 
67
    textui,
62
68
    trace,
63
69
    transform,
64
70
    ui,
77
83
 
78
84
from bzrlib import symbol_versioning
79
85
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
 
from bzrlib.lock import LogicalLockResult
81
86
from bzrlib.lockable_files import LockableFiles
82
87
from bzrlib.lockdir import LockDir
83
88
import bzrlib.mutabletree
96
101
from bzrlib.filters import filtered_input_file
97
102
from bzrlib.trace import mutter, note
98
103
from bzrlib.transport.local import LocalTransport
 
104
from bzrlib.progress import DummyProgress, ProgressPhase
99
105
from bzrlib.revision import CURRENT_REVISION
100
106
from bzrlib.rio import RioReader, rio_file, Stanza
101
107
from bzrlib.symbol_versioning import (
105
111
 
106
112
 
107
113
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
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
115
 
113
116
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
171
        return ''
169
172
 
170
173
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
174
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
175
    """Working copy tree.
174
176
 
175
177
    The inventory is held in the `Branch` working-inventory, and the
248
250
        self._rules_searcher = None
249
251
        self.views = self._make_views()
250
252
 
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
253
    def _detect_case_handling(self):
260
254
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
255
        try:
286
280
        self._control_files.break_lock()
287
281
        self.branch.break_lock()
288
282
 
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
283
    def requires_rich_root(self):
300
284
        return self._format.requires_rich_root
301
285
 
463
447
        return (file_obj, stat_value)
464
448
 
465
449
    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()
 
450
        return self.get_file(file_id, path=path, filtered=filtered).read()
471
451
 
472
452
    def get_file_byname(self, filename, filtered=True):
473
453
        path = self.abspath(filename)
497
477
        incorrectly attributed to CURRENT_REVISION (but after committing, the
498
478
        attribution will be correct).
499
479
        """
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
 
480
        basis = self.basis_tree()
 
481
        basis.lock_read()
 
482
        try:
 
483
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
484
                require_versioned=True).next()
 
485
            changed_content, kind = changes[2], changes[6]
 
486
            if not changed_content:
 
487
                return basis.annotate_iter(file_id)
 
488
            if kind[1] is None:
 
489
                return None
 
490
            import annotate
 
491
            if kind[0] != 'file':
 
492
                old_lines = []
 
493
            else:
 
494
                old_lines = list(basis.annotate_iter(file_id))
 
495
            old = [old_lines]
 
496
            for tree in self.branch.repository.revision_trees(
 
497
                self.get_parent_ids()[1:]):
 
498
                if file_id not in tree:
 
499
                    continue
 
500
                old.append(list(tree.annotate_iter(file_id)))
 
501
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
502
                                       default_revision)
 
503
        finally:
 
504
            basis.unlock()
536
505
 
537
506
    def _get_ancestors(self, default_revision):
538
507
        ancestors = set([default_revision])
553
522
        else:
554
523
            parents = [last_rev]
555
524
        try:
556
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
525
            merges_file = self._transport.get('pending-merges')
557
526
        except errors.NoSuchFile:
558
527
            pass
559
528
        else:
560
 
            for l in osutils.split_lines(merges_bytes):
 
529
            for l in merges_file.readlines():
561
530
                revision_id = l.rstrip('\n')
562
531
                parents.append(revision_id)
563
532
        return parents
622
591
 
623
592
    def get_file_size(self, file_id):
624
593
        """See Tree.get_file_size"""
625
 
        # XXX: this returns the on-disk size; it should probably return the
626
 
        # canonical size
627
594
        try:
628
595
            return os.path.getsize(self.id2abspath(file_id))
629
596
        except OSError, e:
645
612
 
646
613
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
647
614
        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
615
        return self._inventory[file_id].executable
653
616
 
654
617
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
764
727
            raise
765
728
        kind = _mapper(stat_result.st_mode)
766
729
        if kind == 'file':
767
 
            return self._file_content_summary(path, stat_result)
 
730
            size = stat_result.st_size
 
731
            # try for a stat cache lookup
 
732
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
733
            return (kind, size, executable, self._sha_from_stat(
 
734
                path, stat_result))
768
735
        elif kind == 'directory':
769
736
            # perhaps it looks like a plain directory, but it's really a
770
737
            # reference.
777
744
        else:
778
745
            return (kind, None, None, None)
779
746
 
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
747
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
788
748
        """Common ghost checking functionality from set_parent_*.
789
749
 
909
869
 
910
870
    @needs_write_lock # because merge pulls data into the branch.
911
871
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
912
 
                          merge_type=None, force=False):
 
872
        merge_type=None):
913
873
        """Merge from a branch into this working tree.
914
874
 
915
875
        :param branch: The branch to merge from.
919
879
            branch.last_revision().
920
880
        """
921
881
        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()
 
882
        pb = ui.ui_factory.nested_progress_bar()
 
883
        try:
 
884
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
885
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
886
            merger.pp.next_phase()
 
887
            # check that there are no
 
888
            # local alterations
 
889
            merger.check_basis(check_clean=True, require_commits=False)
 
890
            if to_revision is None:
 
891
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
892
            merger.other_rev_id = to_revision
 
893
            if _mod_revision.is_null(merger.other_rev_id):
 
894
                raise errors.NoCommits(branch)
 
895
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
896
            merger.other_basis = merger.other_rev_id
 
897
            merger.other_tree = self.branch.repository.revision_tree(
 
898
                merger.other_rev_id)
 
899
            merger.other_branch = branch
 
900
            merger.pp.next_phase()
 
901
            if from_revision is None:
 
902
                merger.find_base()
 
903
            else:
 
904
                merger.set_base_revision(from_revision, branch)
 
905
            if merger.base_rev_id == merger.other_rev_id:
 
906
                raise errors.PointlessMerge
 
907
            merger.backup_files = False
 
908
            if merge_type is None:
 
909
                merger.merge_type = Merge3Merger
 
910
            else:
 
911
                merger.merge_type = merge_type
 
912
            merger.set_interesting_files(None)
 
913
            merger.show_base = False
 
914
            merger.reprocess = False
 
915
            conflicts = merger.do_merge()
 
916
            merger.set_pending()
 
917
        finally:
 
918
            pb.finished()
952
919
        return conflicts
953
920
 
954
921
    @needs_read_lock
1101
1068
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1102
1069
        if tree_transport.base != branch_transport.base:
1103
1070
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1104
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1105
 
                target_branch=new_branch)
 
1071
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1106
1072
        else:
1107
1073
            tree_bzrdir = branch_bzrdir
1108
1074
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1146
1112
        This does not include files that have been deleted in this
1147
1113
        tree. Skips the control directory.
1148
1114
 
1149
 
        :param include_root: if True, return an entry for the root
 
1115
        :param include_root: if True, do not return an entry for the root
1150
1116
        :param from_dir: start from this directory or None for the root
1151
1117
        :param recursive: whether to recurse into subdirectories or not
1152
1118
        """
1498
1464
        from_tail = splitpath(from_rel)[-1]
1499
1465
        from_id = inv.path2id(from_rel)
1500
1466
        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]
 
1467
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1468
                errors.NotVersionedError(path=str(from_rel)))
 
1469
        from_entry = inv[from_id]
1512
1470
        from_parent_id = from_entry.parent_id
1513
1471
        to_dir, to_tail = os.path.split(to_rel)
1514
1472
        to_dir_id = inv.path2id(to_dir)
1606
1564
    @needs_write_lock
1607
1565
    def pull(self, source, overwrite=False, stop_revision=None,
1608
1566
             change_reporter=None, possible_transports=None, local=False):
 
1567
        top_pb = ui.ui_factory.nested_progress_bar()
1609
1568
        source.lock_read()
1610
1569
        try:
 
1570
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1571
            pp.next_phase()
1611
1572
            old_revision_info = self.branch.last_revision_info()
1612
1573
            basis_tree = self.basis_tree()
1613
1574
            count = self.branch.pull(source, overwrite, stop_revision,
1615
1576
                                     local=local)
1616
1577
            new_revision_info = self.branch.last_revision_info()
1617
1578
            if new_revision_info != old_revision_info:
 
1579
                pp.next_phase()
1618
1580
                repository = self.branch.repository
 
1581
                pb = ui.ui_factory.nested_progress_bar()
1619
1582
                basis_tree.lock_read()
1620
1583
                try:
1621
1584
                    new_basis_tree = self.branch.basis_tree()
1624
1587
                                new_basis_tree,
1625
1588
                                basis_tree,
1626
1589
                                this_tree=self,
1627
 
                                pb=None,
 
1590
                                pb=pb,
1628
1591
                                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)
 
1592
                    if (basis_tree.inventory.root is None and
 
1593
                        new_basis_tree.inventory.root is not None):
 
1594
                        self.set_root_id(new_basis_tree.get_root_id())
1633
1595
                finally:
 
1596
                    pb.finished()
1634
1597
                    basis_tree.unlock()
1635
1598
                # TODO - dedup parents list with things merged by pull ?
1636
1599
                # reuse the revisiontree we merged against to set the new
1649
1612
            return count
1650
1613
        finally:
1651
1614
            source.unlock()
 
1615
            top_pb.finished()
1652
1616
 
1653
1617
    @needs_write_lock
1654
1618
    def put_file_bytes_non_atomic(self, file_id, bytes):
1739
1703
        r"""Check whether the filename matches an ignore pattern.
1740
1704
 
1741
1705
        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.
 
1706
        others match against only the last component.
1745
1707
 
1746
1708
        If the file is ignored, returns the pattern which caused it to
1747
1709
        be ignored, otherwise None.  So this can simply be used as a
1748
1710
        boolean if desired."""
1749
1711
        if getattr(self, '_ignoreglobster', None) is None:
1750
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1712
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1751
1713
        return self._ignoreglobster.match(filename)
1752
1714
 
1753
1715
    def kind(self, file_id):
1803
1765
            raise errors.ObjectNotLocked(self)
1804
1766
 
1805
1767
    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
 
        """
 
1768
        """See Branch.lock_read, and WorkingTree.unlock."""
1812
1769
        if not self.is_locked():
1813
1770
            self._reset_data()
1814
1771
        self.branch.lock_read()
1815
1772
        try:
1816
 
            self._control_files.lock_read()
1817
 
            return LogicalLockResult(self.unlock)
 
1773
            return self._control_files.lock_read()
1818
1774
        except:
1819
1775
            self.branch.unlock()
1820
1776
            raise
1821
1777
 
1822
1778
    def lock_tree_write(self):
1823
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1824
 
 
1825
 
        :return: A bzrlib.lock.LogicalLockResult.
1826
 
        """
 
1779
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1827
1780
        if not self.is_locked():
1828
1781
            self._reset_data()
1829
1782
        self.branch.lock_read()
1830
1783
        try:
1831
 
            self._control_files.lock_write()
1832
 
            return LogicalLockResult(self.unlock)
 
1784
            return self._control_files.lock_write()
1833
1785
        except:
1834
1786
            self.branch.unlock()
1835
1787
            raise
1836
1788
 
1837
1789
    def lock_write(self):
1838
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1839
 
 
1840
 
        :return: A bzrlib.lock.LogicalLockResult.
1841
 
        """
 
1790
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1842
1791
        if not self.is_locked():
1843
1792
            self._reset_data()
1844
1793
        self.branch.lock_write()
1845
1794
        try:
1846
 
            self._control_files.lock_write()
1847
 
            return LogicalLockResult(self.unlock)
 
1795
            return self._control_files.lock_write()
1848
1796
        except:
1849
1797
            self.branch.unlock()
1850
1798
            raise
1858
1806
    def _reset_data(self):
1859
1807
        """Reset transient data that cannot be revalidated."""
1860
1808
        self._inventory_is_modified = False
1861
 
        f = self._transport.get('inventory')
1862
 
        try:
1863
 
            result = self._deserialize(f)
1864
 
        finally:
1865
 
            f.close()
 
1809
        result = self._deserialize(self._transport.get('inventory'))
1866
1810
        self._set_inventory(result, dirty=False)
1867
1811
 
1868
1812
    @needs_tree_write_lock
1915
1859
            # revision_id is set. We must check for this full string, because a
1916
1860
            # root node id can legitimately look like 'revision_id' but cannot
1917
1861
            # contain a '"'.
1918
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1862
            xml = self.branch.repository.get_inventory_xml(new_revision)
1919
1863
            firstline = xml.split('\n', 1)[0]
1920
1864
            if (not 'revision_id="' in firstline or
1921
1865
                'format="7"' not in firstline):
1922
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1923
 
                    xml, new_revision)
 
1866
                inv = self.branch.repository.deserialise_inventory(
 
1867
                    new_revision, xml)
1924
1868
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1925
1869
            self._write_basis_inventory(xml)
1926
1870
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1944
1888
        # binary.
1945
1889
        if self._inventory_is_modified:
1946
1890
            raise errors.InventoryModified(self)
1947
 
        f = self._transport.get('inventory')
1948
 
        try:
1949
 
            result = self._deserialize(f)
1950
 
        finally:
1951
 
            f.close()
 
1891
        result = self._deserialize(self._transport.get('inventory'))
1952
1892
        self._set_inventory(result, dirty=False)
1953
1893
        return result
1954
1894
 
1969
1909
 
1970
1910
        new_files=set()
1971
1911
        unknown_nested_files=set()
1972
 
        if to_file is None:
1973
 
            to_file = sys.stdout
1974
1912
 
1975
1913
        def recurse_directory_to_add_files(directory):
1976
1914
            # Recurse directory and add all files
1977
1915
            # so we can check if they have changed.
1978
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1916
            for parent_info, file_infos in\
 
1917
                self.walkdirs(directory):
1979
1918
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1980
1919
                    # Is it versioned or ignored?
1981
1920
                    if self.path2id(relpath) or self.is_ignored(relpath):
2016
1955
                            # ... but not ignored
2017
1956
                            has_changed_files = True
2018
1957
                            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.
 
1958
                    elif content_change and (kind[1] is not None):
 
1959
                        # Versioned and changed, but not deleted
2023
1960
                        has_changed_files = True
2024
1961
                        break
2025
1962
 
2047
1984
                        new_status = 'I'
2048
1985
                    else:
2049
1986
                        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')
 
1987
                    textui.show_status(new_status, self.kind(fid), f,
 
1988
                                       to_file=to_file)
2053
1989
                # Unversion file
2054
1990
                inv_delta.append((f, None, fid, None))
2055
1991
                message = "removed %s" % (f,)
2078
2014
 
2079
2015
    @needs_tree_write_lock
2080
2016
    def revert(self, filenames=None, old_tree=None, backups=True,
2081
 
               pb=None, report_changes=False):
 
2017
               pb=DummyProgress(), report_changes=False):
2082
2018
        from bzrlib.conflicts import resolve
2083
2019
        if filenames == []:
2084
2020
            filenames = None
2206
2142
        """
2207
2143
        raise NotImplementedError(self.unlock)
2208
2144
 
2209
 
    _marker = object()
2210
 
 
2211
 
    def update(self, change_reporter=None, possible_transports=None,
2212
 
               revision=None, old_tip=_marker):
 
2145
    def update(self, change_reporter=None, possible_transports=None):
2213
2146
        """Update a working tree along its branch.
2214
2147
 
2215
2148
        This will update the branch if its bound too, which means we have
2233
2166
        - Merge current state -> basis tree of the master w.r.t. the old tree
2234
2167
          basis.
2235
2168
        - 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
2169
        """
2243
2170
        if self.branch.get_bound_location() is not None:
2244
2171
            self.lock_write()
2245
 
            update_branch = (old_tip is self._marker)
 
2172
            update_branch = True
2246
2173
        else:
2247
2174
            self.lock_tree_write()
2248
2175
            update_branch = False
2250
2177
            if update_branch:
2251
2178
                old_tip = self.branch.update(possible_transports)
2252
2179
            else:
2253
 
                if old_tip is self._marker:
2254
 
                    old_tip = None
2255
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2180
                old_tip = None
 
2181
            return self._update_tree(old_tip, change_reporter)
2256
2182
        finally:
2257
2183
            self.unlock()
2258
2184
 
2259
2185
    @needs_tree_write_lock
2260
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2186
    def _update_tree(self, old_tip=None, change_reporter=None):
2261
2187
        """Update a tree to the master branch.
2262
2188
 
2263
2189
        :param old_tip: if supplied, the previous tip revision the branch,
2273
2199
        # We MUST save it even if an error occurs, because otherwise the users
2274
2200
        # local work is unreferenced and will appear to have been lost.
2275
2201
        #
2276
 
        nb_conflicts = 0
 
2202
        result = 0
2277
2203
        try:
2278
2204
            last_rev = self.get_parent_ids()[0]
2279
2205
        except IndexError:
2280
2206
            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
 
 
 
2207
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2208
            # merge tree state up to new branch tip.
2305
2209
            basis = self.basis_tree()
2306
2210
            basis.lock_read()
2307
2211
            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)
 
2212
                to_tree = self.branch.basis_tree()
 
2213
                if basis.inventory.root is None:
 
2214
                    self.set_root_id(to_tree.get_root_id())
2311
2215
                    self.flush()
 
2216
                result += merge.merge_inner(
 
2217
                                      self.branch,
 
2218
                                      to_tree,
 
2219
                                      basis,
 
2220
                                      this_tree=self,
 
2221
                                      change_reporter=change_reporter)
2312
2222
            finally:
2313
2223
                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
2224
            # TODO - dedup parents list with things merged by pull ?
2326
2225
            # reuse the tree we've updated to to set the basis:
2327
 
            parent_trees = [(revision, to_tree)]
 
2226
            parent_trees = [(self.branch.last_revision(), to_tree)]
2328
2227
            merges = self.get_parent_ids()[1:]
2329
2228
            # Ideally we ask the tree for the trees here, that way the working
2330
2229
            # tree can decide whether to give us the entire tree or give us a
2334
2233
            for parent in merges:
2335
2234
                parent_trees.append(
2336
2235
                    (parent, self.branch.repository.revision_tree(parent)))
2337
 
            if not _mod_revision.is_null(old_tip):
 
2236
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2338
2237
                parent_trees.append(
2339
2238
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2340
2239
            self.set_parent_trees(parent_trees)
2341
2240
            last_rev = parent_trees[0][0]
2342
 
        return nb_conflicts
 
2241
        else:
 
2242
            # the working tree had the same last-revision as the master
 
2243
            # branch did. We may still have pivot local work from the local
 
2244
            # branch into old_tip:
 
2245
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2246
                self.add_parent_tree_id(old_tip)
 
2247
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2248
            and old_tip != last_rev):
 
2249
            # our last revision was not the prior branch last revision
 
2250
            # and we have converted that last revision to a pending merge.
 
2251
            # base is somewhere between the branch tip now
 
2252
            # and the now pending merge
 
2253
 
 
2254
            # Since we just modified the working tree and inventory, flush out
 
2255
            # the current state, before we modify it again.
 
2256
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2257
            #       requires it only because TreeTransform directly munges the
 
2258
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2259
            #       should be able to remove this extra flush.
 
2260
            self.flush()
 
2261
            graph = self.branch.repository.get_graph()
 
2262
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2263
                                                old_tip)
 
2264
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2265
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2266
            result += merge.merge_inner(
 
2267
                                  self.branch,
 
2268
                                  other_tree,
 
2269
                                  base_tree,
 
2270
                                  this_tree=self,
 
2271
                                  change_reporter=change_reporter)
 
2272
        return result
2343
2273
 
2344
2274
    def _write_hashcache_if_dirty(self):
2345
2275
        """Write out the hashcache if it is dirty."""
2586
2516
        return un_resolved, resolved
2587
2517
 
2588
2518
    @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
 
        """
 
2519
    def _check(self):
2596
2520
        tree_basis = self.basis_tree()
2597
2521
        tree_basis.lock_read()
2598
2522
        try:
2599
 
            repo_basis = references[('trees', self.last_revision())]
 
2523
            repo_basis = self.branch.repository.revision_tree(
 
2524
                self.last_revision())
2600
2525
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2601
2526
                raise errors.BzrCheckError(
2602
2527
                    "Mismatched basis inventory content.")
2615
2540
        """
2616
2541
        return
2617
2542
 
 
2543
    @needs_read_lock
2618
2544
    def _get_rules_searcher(self, default_searcher):
2619
2545
        """See Tree._get_rules_searcher."""
2620
2546
        if self._rules_searcher is None:
2647
2573
        if self._inventory is None:
2648
2574
            self.read_working_inventory()
2649
2575
 
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
2576
    def lock_tree_write(self):
2655
2577
        """See WorkingTree.lock_tree_write().
2656
2578
 
2657
2579
        In Format2 WorkingTrees we have a single lock for the branch and tree
2658
2580
        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
2581
        """
2663
2582
        self.branch.lock_write()
2664
2583
        try:
2665
 
            self._control_files.lock_write()
2666
 
            return self
 
2584
            return self._control_files.lock_write()
2667
2585
        except:
2668
2586
            self.branch.unlock()
2669
2587
            raise
2717
2635
                mode=self.bzrdir._get_file_mode())
2718
2636
            return True
2719
2637
 
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
2638
    @needs_tree_write_lock
2725
2639
    def set_conflicts(self, conflicts):
2726
2640
        self._put_rio('conflicts', conflicts.to_stanzas(),
2803
2717
        """Return the format for the working tree object in a_bzrdir."""
2804
2718
        try:
2805
2719
            transport = a_bzrdir.get_workingtree_transport(None)
2806
 
            format_string = transport.get_bytes("format")
 
2720
            format_string = transport.get("format").read()
2807
2721
            return klass._formats[format_string]
2808
2722
        except errors.NoSuchFile:
2809
2723
            raise errors.NoWorkingTree(base=transport.base)
3073
2987
        return self.get_format_string()
3074
2988
 
3075
2989
 
3076
 
__default_format = WorkingTreeFormat6()
 
2990
__default_format = WorkingTreeFormat4()
3077
2991
WorkingTreeFormat.register_format(__default_format)
 
2992
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3078
2993
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3079
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3080
2994
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3081
2995
WorkingTreeFormat.set_default_format(__default_format)
3082
2996
# formats which have no format string are not discoverable