/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
 
493
477
        incorrectly attributed to CURRENT_REVISION (but after committing, the
494
478
        attribution will be correct).
495
479
        """
496
 
        maybe_file_parent_keys = []
497
 
        for parent_id in self.get_parent_ids():
498
 
            try:
499
 
                parent_tree = self.revision_tree(parent_id)
500
 
            except errors.NoSuchRevisionInTree:
501
 
                parent_tree = self.branch.repository.revision_tree(parent_id)
502
 
            parent_tree.lock_read()
503
 
            try:
504
 
                if file_id not in parent_tree:
505
 
                    continue
506
 
                ie = parent_tree.inventory[file_id]
507
 
                if ie.kind != 'file':
508
 
                    # Note: this is slightly unnecessary, because symlinks and
509
 
                    # directories have a "text" which is the empty text, and we
510
 
                    # know that won't mess up annotations. But it seems cleaner
511
 
                    continue
512
 
                parent_text_key = (file_id, ie.revision)
513
 
                if parent_text_key not in maybe_file_parent_keys:
514
 
                    maybe_file_parent_keys.append(parent_text_key)
515
 
            finally:
516
 
                parent_tree.unlock()
517
 
        graph = _mod_graph.Graph(self.branch.repository.texts)
518
 
        heads = graph.heads(maybe_file_parent_keys)
519
 
        file_parent_keys = []
520
 
        for key in maybe_file_parent_keys:
521
 
            if key in heads:
522
 
                file_parent_keys.append(key)
523
 
 
524
 
        # Now we have the parents of this content
525
 
        annotator = self.branch.repository.texts.get_annotator()
526
 
        text = self.get_file(file_id).read()
527
 
        this_key =(file_id, default_revision)
528
 
        annotator.add_special_text(this_key, file_parent_keys, text)
529
 
        annotations = [(key[-1], line)
530
 
                       for key, line in annotator.annotate_flat(this_key)]
531
 
        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()
532
505
 
533
506
    def _get_ancestors(self, default_revision):
534
507
        ancestors = set([default_revision])
549
522
        else:
550
523
            parents = [last_rev]
551
524
        try:
552
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
525
            merges_file = self._transport.get('pending-merges')
553
526
        except errors.NoSuchFile:
554
527
            pass
555
528
        else:
556
 
            for l in osutils.split_lines(merges_bytes):
 
529
            for l in merges_file.readlines():
557
530
                revision_id = l.rstrip('\n')
558
531
                parents.append(revision_id)
559
532
        return parents
618
591
 
619
592
    def get_file_size(self, file_id):
620
593
        """See Tree.get_file_size"""
621
 
        # XXX: this returns the on-disk size; it should probably return the
622
 
        # canonical size
623
594
        try:
624
595
            return os.path.getsize(self.id2abspath(file_id))
625
596
        except OSError, e:
641
612
 
642
613
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
614
        file_id = self.path2id(path)
644
 
        if file_id is None:
645
 
            # For unversioned files on win32, we just assume they are not
646
 
            # executable
647
 
            return False
648
615
        return self._inventory[file_id].executable
649
616
 
650
617
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
760
727
            raise
761
728
        kind = _mapper(stat_result.st_mode)
762
729
        if kind == 'file':
763
 
            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))
764
735
        elif kind == 'directory':
765
736
            # perhaps it looks like a plain directory, but it's really a
766
737
            # reference.
773
744
        else:
774
745
            return (kind, None, None, None)
775
746
 
776
 
    def _file_content_summary(self, path, stat_result):
777
 
        size = stat_result.st_size
778
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
779
 
        # try for a stat cache lookup
780
 
        return ('file', size, executable, self._sha_from_stat(
781
 
            path, stat_result))
782
 
 
783
747
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
748
        """Common ghost checking functionality from set_parent_*.
785
749
 
905
869
 
906
870
    @needs_write_lock # because merge pulls data into the branch.
907
871
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
 
                          merge_type=None, force=False):
 
872
        merge_type=None):
909
873
        """Merge from a branch into this working tree.
910
874
 
911
875
        :param branch: The branch to merge from.
915
879
            branch.last_revision().
916
880
        """
917
881
        from bzrlib.merge import Merger, Merge3Merger
918
 
        merger = Merger(self.branch, this_tree=self)
919
 
        # check that there are no local alterations
920
 
        if not force and self.has_changes():
921
 
            raise errors.UncommittedChanges(self)
922
 
        if to_revision is None:
923
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
924
 
        merger.other_rev_id = to_revision
925
 
        if _mod_revision.is_null(merger.other_rev_id):
926
 
            raise errors.NoCommits(branch)
927
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
928
 
        merger.other_basis = merger.other_rev_id
929
 
        merger.other_tree = self.branch.repository.revision_tree(
930
 
            merger.other_rev_id)
931
 
        merger.other_branch = branch
932
 
        if from_revision is None:
933
 
            merger.find_base()
934
 
        else:
935
 
            merger.set_base_revision(from_revision, branch)
936
 
        if merger.base_rev_id == merger.other_rev_id:
937
 
            raise errors.PointlessMerge
938
 
        merger.backup_files = False
939
 
        if merge_type is None:
940
 
            merger.merge_type = Merge3Merger
941
 
        else:
942
 
            merger.merge_type = merge_type
943
 
        merger.set_interesting_files(None)
944
 
        merger.show_base = False
945
 
        merger.reprocess = False
946
 
        conflicts = merger.do_merge()
947
 
        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()
948
919
        return conflicts
949
920
 
950
921
    @needs_read_lock
1097
1068
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1069
        if tree_transport.base != branch_transport.base:
1099
1070
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1071
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1072
        else:
1103
1073
            tree_bzrdir = branch_bzrdir
1104
1074
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1112
        This does not include files that have been deleted in this
1143
1113
        tree. Skips the control directory.
1144
1114
 
1145
 
        :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
1146
1116
        :param from_dir: start from this directory or None for the root
1147
1117
        :param recursive: whether to recurse into subdirectories or not
1148
1118
        """
1494
1464
        from_tail = splitpath(from_rel)[-1]
1495
1465
        from_id = inv.path2id(from_rel)
1496
1466
        if from_id is None:
1497
 
            # if file is missing in the inventory maybe it's in the basis_tree
1498
 
            basis_tree = self.branch.basis_tree()
1499
 
            from_id = basis_tree.path2id(from_rel)
1500
 
            if from_id is None:
1501
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1502
 
                    errors.NotVersionedError(path=str(from_rel)))
1503
 
            # put entry back in the inventory so we can rename it
1504
 
            from_entry = basis_tree.inventory[from_id].copy()
1505
 
            inv.add(from_entry)
1506
 
        else:
1507
 
            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]
1508
1470
        from_parent_id = from_entry.parent_id
1509
1471
        to_dir, to_tail = os.path.split(to_rel)
1510
1472
        to_dir_id = inv.path2id(to_dir)
1602
1564
    @needs_write_lock
1603
1565
    def pull(self, source, overwrite=False, stop_revision=None,
1604
1566
             change_reporter=None, possible_transports=None, local=False):
 
1567
        top_pb = ui.ui_factory.nested_progress_bar()
1605
1568
        source.lock_read()
1606
1569
        try:
 
1570
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1571
            pp.next_phase()
1607
1572
            old_revision_info = self.branch.last_revision_info()
1608
1573
            basis_tree = self.basis_tree()
1609
1574
            count = self.branch.pull(source, overwrite, stop_revision,
1611
1576
                                     local=local)
1612
1577
            new_revision_info = self.branch.last_revision_info()
1613
1578
            if new_revision_info != old_revision_info:
 
1579
                pp.next_phase()
1614
1580
                repository = self.branch.repository
 
1581
                pb = ui.ui_factory.nested_progress_bar()
1615
1582
                basis_tree.lock_read()
1616
1583
                try:
1617
1584
                    new_basis_tree = self.branch.basis_tree()
1620
1587
                                new_basis_tree,
1621
1588
                                basis_tree,
1622
1589
                                this_tree=self,
1623
 
                                pb=None,
 
1590
                                pb=pb,
1624
1591
                                change_reporter=change_reporter)
1625
 
                    basis_root_id = basis_tree.get_root_id()
1626
 
                    new_root_id = new_basis_tree.get_root_id()
1627
 
                    if basis_root_id != new_root_id:
1628
 
                        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())
1629
1595
                finally:
 
1596
                    pb.finished()
1630
1597
                    basis_tree.unlock()
1631
1598
                # TODO - dedup parents list with things merged by pull ?
1632
1599
                # reuse the revisiontree we merged against to set the new
1645
1612
            return count
1646
1613
        finally:
1647
1614
            source.unlock()
 
1615
            top_pb.finished()
1648
1616
 
1649
1617
    @needs_write_lock
1650
1618
    def put_file_bytes_non_atomic(self, file_id, bytes):
1735
1703
        r"""Check whether the filename matches an ignore pattern.
1736
1704
 
1737
1705
        Patterns containing '/' or '\' need to match the whole path;
1738
 
        others match against only the last component.  Patterns starting
1739
 
        with '!' are ignore exceptions.  Exceptions take precedence
1740
 
        over regular patterns and cause the filename to not be ignored.
 
1706
        others match against only the last component.
1741
1707
 
1742
1708
        If the file is ignored, returns the pattern which caused it to
1743
1709
        be ignored, otherwise None.  So this can simply be used as a
1744
1710
        boolean if desired."""
1745
1711
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1712
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1713
        return self._ignoreglobster.match(filename)
1748
1714
 
1749
1715
    def kind(self, file_id):
1799
1765
            raise errors.ObjectNotLocked(self)
1800
1766
 
1801
1767
    def lock_read(self):
1802
 
        """Lock the tree for reading.
1803
 
 
1804
 
        This also locks the branch, and can be unlocked via self.unlock().
1805
 
 
1806
 
        :return: A bzrlib.lock.LogicalLockResult.
1807
 
        """
 
1768
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1769
        if not self.is_locked():
1809
1770
            self._reset_data()
1810
1771
        self.branch.lock_read()
1811
1772
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1773
            return self._control_files.lock_read()
1814
1774
        except:
1815
1775
            self.branch.unlock()
1816
1776
            raise
1817
1777
 
1818
1778
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1779
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1780
        if not self.is_locked():
1824
1781
            self._reset_data()
1825
1782
        self.branch.lock_read()
1826
1783
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1784
            return self._control_files.lock_write()
1829
1785
        except:
1830
1786
            self.branch.unlock()
1831
1787
            raise
1832
1788
 
1833
1789
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1790
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1791
        if not self.is_locked():
1839
1792
            self._reset_data()
1840
1793
        self.branch.lock_write()
1841
1794
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1795
            return self._control_files.lock_write()
1844
1796
        except:
1845
1797
            self.branch.unlock()
1846
1798
            raise
1854
1806
    def _reset_data(self):
1855
1807
        """Reset transient data that cannot be revalidated."""
1856
1808
        self._inventory_is_modified = False
1857
 
        f = self._transport.get('inventory')
1858
 
        try:
1859
 
            result = self._deserialize(f)
1860
 
        finally:
1861
 
            f.close()
 
1809
        result = self._deserialize(self._transport.get('inventory'))
1862
1810
        self._set_inventory(result, dirty=False)
1863
1811
 
1864
1812
    @needs_tree_write_lock
1911
1859
            # revision_id is set. We must check for this full string, because a
1912
1860
            # root node id can legitimately look like 'revision_id' but cannot
1913
1861
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1862
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1863
            firstline = xml.split('\n', 1)[0]
1916
1864
            if (not 'revision_id="' in firstline or
1917
1865
                'format="7"' not in firstline):
1918
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1919
 
                    xml, new_revision)
 
1866
                inv = self.branch.repository.deserialise_inventory(
 
1867
                    new_revision, xml)
1920
1868
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1921
1869
            self._write_basis_inventory(xml)
1922
1870
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1940
1888
        # binary.
1941
1889
        if self._inventory_is_modified:
1942
1890
            raise errors.InventoryModified(self)
1943
 
        f = self._transport.get('inventory')
1944
 
        try:
1945
 
            result = self._deserialize(f)
1946
 
        finally:
1947
 
            f.close()
 
1891
        result = self._deserialize(self._transport.get('inventory'))
1948
1892
        self._set_inventory(result, dirty=False)
1949
1893
        return result
1950
1894
 
1965
1909
 
1966
1910
        new_files=set()
1967
1911
        unknown_nested_files=set()
1968
 
        if to_file is None:
1969
 
            to_file = sys.stdout
1970
1912
 
1971
1913
        def recurse_directory_to_add_files(directory):
1972
1914
            # Recurse directory and add all files
1973
1915
            # so we can check if they have changed.
1974
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1916
            for parent_info, file_infos in\
 
1917
                self.walkdirs(directory):
1975
1918
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1976
1919
                    # Is it versioned or ignored?
1977
1920
                    if self.path2id(relpath) or self.is_ignored(relpath):
2012
1955
                            # ... but not ignored
2013
1956
                            has_changed_files = True
2014
1957
                            break
2015
 
                    elif (content_change and (kind[1] is not None) and
2016
 
                            osutils.is_inside_any(files, path[1])):
2017
 
                        # Versioned and changed, but not deleted, and still
2018
 
                        # 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
2019
1960
                        has_changed_files = True
2020
1961
                        break
2021
1962
 
2043
1984
                        new_status = 'I'
2044
1985
                    else:
2045
1986
                        new_status = '?'
2046
 
                    # XXX: Really should be a more abstract reporter interface
2047
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2048
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1987
                    textui.show_status(new_status, self.kind(fid), f,
 
1988
                                       to_file=to_file)
2049
1989
                # Unversion file
2050
1990
                inv_delta.append((f, None, fid, None))
2051
1991
                message = "removed %s" % (f,)
2074
2014
 
2075
2015
    @needs_tree_write_lock
2076
2016
    def revert(self, filenames=None, old_tree=None, backups=True,
2077
 
               pb=None, report_changes=False):
 
2017
               pb=DummyProgress(), report_changes=False):
2078
2018
        from bzrlib.conflicts import resolve
2079
2019
        if filenames == []:
2080
2020
            filenames = None
2202
2142
        """
2203
2143
        raise NotImplementedError(self.unlock)
2204
2144
 
2205
 
    _marker = object()
2206
 
 
2207
 
    def update(self, change_reporter=None, possible_transports=None,
2208
 
               revision=None, old_tip=_marker):
 
2145
    def update(self, change_reporter=None, possible_transports=None):
2209
2146
        """Update a working tree along its branch.
2210
2147
 
2211
2148
        This will update the branch if its bound too, which means we have
2229
2166
        - Merge current state -> basis tree of the master w.r.t. the old tree
2230
2167
          basis.
2231
2168
        - Do a 'normal' merge of the old branch basis if it is relevant.
2232
 
 
2233
 
        :param revision: The target revision to update to. Must be in the
2234
 
            revision history.
2235
 
        :param old_tip: If branch.update() has already been run, the value it
2236
 
            returned (old tip of the branch or None). _marker is used
2237
 
            otherwise.
2238
2169
        """
2239
2170
        if self.branch.get_bound_location() is not None:
2240
2171
            self.lock_write()
2241
 
            update_branch = (old_tip is self._marker)
 
2172
            update_branch = True
2242
2173
        else:
2243
2174
            self.lock_tree_write()
2244
2175
            update_branch = False
2246
2177
            if update_branch:
2247
2178
                old_tip = self.branch.update(possible_transports)
2248
2179
            else:
2249
 
                if old_tip is self._marker:
2250
 
                    old_tip = None
2251
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2180
                old_tip = None
 
2181
            return self._update_tree(old_tip, change_reporter)
2252
2182
        finally:
2253
2183
            self.unlock()
2254
2184
 
2255
2185
    @needs_tree_write_lock
2256
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2186
    def _update_tree(self, old_tip=None, change_reporter=None):
2257
2187
        """Update a tree to the master branch.
2258
2188
 
2259
2189
        :param old_tip: if supplied, the previous tip revision the branch,
2269
2199
        # We MUST save it even if an error occurs, because otherwise the users
2270
2200
        # local work is unreferenced and will appear to have been lost.
2271
2201
        #
2272
 
        nb_conflicts = 0
 
2202
        result = 0
2273
2203
        try:
2274
2204
            last_rev = self.get_parent_ids()[0]
2275
2205
        except IndexError:
2276
2206
            last_rev = _mod_revision.NULL_REVISION
2277
 
        if revision is None:
2278
 
            revision = self.branch.last_revision()
2279
 
 
2280
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2281
 
 
2282
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2283
 
            # the branch we are bound to was updated
2284
 
            # merge those changes in first
2285
 
            base_tree  = self.basis_tree()
2286
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2287
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2288
 
                                             base_tree, this_tree=self,
2289
 
                                             change_reporter=change_reporter)
2290
 
            if nb_conflicts:
2291
 
                self.add_parent_tree((old_tip, other_tree))
2292
 
                trace.note('Rerun update after fixing the conflicts.')
2293
 
                return nb_conflicts
2294
 
 
2295
 
        if last_rev != _mod_revision.ensure_null(revision):
2296
 
            # the working tree is up to date with the branch
2297
 
            # we can merge the specified revision from master
2298
 
            to_tree = self.branch.repository.revision_tree(revision)
2299
 
            to_root_id = to_tree.get_root_id()
2300
 
 
 
2207
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2208
            # merge tree state up to new branch tip.
2301
2209
            basis = self.basis_tree()
2302
2210
            basis.lock_read()
2303
2211
            try:
2304
 
                if (basis.inventory.root is None
2305
 
                    or basis.inventory.root.file_id != to_root_id):
2306
 
                    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())
2307
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)
2308
2222
            finally:
2309
2223
                basis.unlock()
2310
 
 
2311
 
            # determine the branch point
2312
 
            graph = self.branch.repository.get_graph()
2313
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2314
 
                                                last_rev)
2315
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2316
 
 
2317
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2318
 
                                             this_tree=self,
2319
 
                                             change_reporter=change_reporter)
2320
 
            self.set_last_revision(revision)
2321
2224
            # TODO - dedup parents list with things merged by pull ?
2322
2225
            # reuse the tree we've updated to to set the basis:
2323
 
            parent_trees = [(revision, to_tree)]
 
2226
            parent_trees = [(self.branch.last_revision(), to_tree)]
2324
2227
            merges = self.get_parent_ids()[1:]
2325
2228
            # Ideally we ask the tree for the trees here, that way the working
2326
2229
            # tree can decide whether to give us the entire tree or give us a
2330
2233
            for parent in merges:
2331
2234
                parent_trees.append(
2332
2235
                    (parent, self.branch.repository.revision_tree(parent)))
2333
 
            if not _mod_revision.is_null(old_tip):
 
2236
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2334
2237
                parent_trees.append(
2335
2238
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2336
2239
            self.set_parent_trees(parent_trees)
2337
2240
            last_rev = parent_trees[0][0]
2338
 
        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
2339
2273
 
2340
2274
    def _write_hashcache_if_dirty(self):
2341
2275
        """Write out the hashcache if it is dirty."""
2582
2516
        return un_resolved, resolved
2583
2517
 
2584
2518
    @needs_read_lock
2585
 
    def _check(self, references):
2586
 
        """Check the tree for consistency.
2587
 
 
2588
 
        :param references: A dict with keys matching the items returned by
2589
 
            self._get_check_refs(), and values from looking those keys up in
2590
 
            the repository.
2591
 
        """
 
2519
    def _check(self):
2592
2520
        tree_basis = self.basis_tree()
2593
2521
        tree_basis.lock_read()
2594
2522
        try:
2595
 
            repo_basis = references[('trees', self.last_revision())]
 
2523
            repo_basis = self.branch.repository.revision_tree(
 
2524
                self.last_revision())
2596
2525
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2597
2526
                raise errors.BzrCheckError(
2598
2527
                    "Mismatched basis inventory content.")
2611
2540
        """
2612
2541
        return
2613
2542
 
 
2543
    @needs_read_lock
2614
2544
    def _get_rules_searcher(self, default_searcher):
2615
2545
        """See Tree._get_rules_searcher."""
2616
2546
        if self._rules_searcher is None:
2643
2573
        if self._inventory is None:
2644
2574
            self.read_working_inventory()
2645
2575
 
2646
 
    def _get_check_refs(self):
2647
 
        """Return the references needed to perform a check of this tree."""
2648
 
        return [('trees', self.last_revision())]
2649
 
 
2650
2576
    def lock_tree_write(self):
2651
2577
        """See WorkingTree.lock_tree_write().
2652
2578
 
2653
2579
        In Format2 WorkingTrees we have a single lock for the branch and tree
2654
2580
        so lock_tree_write() degrades to lock_write().
2655
 
 
2656
 
        :return: An object with an unlock method which will release the lock
2657
 
            obtained.
2658
2581
        """
2659
2582
        self.branch.lock_write()
2660
2583
        try:
2661
 
            self._control_files.lock_write()
2662
 
            return self
 
2584
            return self._control_files.lock_write()
2663
2585
        except:
2664
2586
            self.branch.unlock()
2665
2587
            raise
2713
2635
                mode=self.bzrdir._get_file_mode())
2714
2636
            return True
2715
2637
 
2716
 
    def _get_check_refs(self):
2717
 
        """Return the references needed to perform a check of this tree."""
2718
 
        return [('trees', self.last_revision())]
2719
 
 
2720
2638
    @needs_tree_write_lock
2721
2639
    def set_conflicts(self, conflicts):
2722
2640
        self._put_rio('conflicts', conflicts.to_stanzas(),
2799
2717
        """Return the format for the working tree object in a_bzrdir."""
2800
2718
        try:
2801
2719
            transport = a_bzrdir.get_workingtree_transport(None)
2802
 
            format_string = transport.get_bytes("format")
 
2720
            format_string = transport.get("format").read()
2803
2721
            return klass._formats[format_string]
2804
2722
        except errors.NoSuchFile:
2805
2723
            raise errors.NoWorkingTree(base=transport.base)
3069
2987
        return self.get_format_string()
3070
2988
 
3071
2989
 
3072
 
__default_format = WorkingTreeFormat6()
 
2990
__default_format = WorkingTreeFormat4()
3073
2991
WorkingTreeFormat.register_format(__default_format)
 
2992
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3074
2993
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3075
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3076
2994
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3077
2995
WorkingTreeFormat.set_default_format(__default_format)
3078
2996
# formats which have no format string are not discoverable