~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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)
38
32
 
39
33
from cStringIO import StringIO
40
34
import os
65
59
    merge,
66
60
    revision as _mod_revision,
67
61
    revisiontree,
68
 
    textui,
69
62
    trace,
70
63
    transform,
71
64
    ui,
102
95
from bzrlib.filters import filtered_input_file
103
96
from bzrlib.trace import mutter, note
104
97
from bzrlib.transport.local import LocalTransport
105
 
from bzrlib.progress import DummyProgress, ProgressPhase
106
98
from bzrlib.revision import CURRENT_REVISION
107
99
from bzrlib.rio import RioReader, rio_file, Stanza
108
100
from bzrlib.symbol_versioning import (
112
104
 
113
105
 
114
106
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
 
107
# TODO: Modifying the conflict objects or their type is currently nearly
 
108
# impossible as there is no clear relationship between the working tree format
 
109
# and the conflict list file format.
115
110
CONFLICT_HEADER_1 = "BZR conflict list format 1"
116
111
 
117
112
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
172
167
        return ''
173
168
 
174
169
 
175
 
class WorkingTree(bzrlib.mutabletree.MutableTree):
 
170
class WorkingTree(bzrlib.mutabletree.MutableTree,
 
171
    bzrdir.ControlComponent):
176
172
    """Working copy tree.
177
173
 
178
174
    The inventory is held in the `Branch` working-inventory, and the
251
247
        self._rules_searcher = None
252
248
        self.views = self._make_views()
253
249
 
 
250
    @property
 
251
    def user_transport(self):
 
252
        return self.bzrdir.user_transport
 
253
 
 
254
    @property
 
255
    def control_transport(self):
 
256
        return self._transport
 
257
 
254
258
    def _detect_case_handling(self):
255
259
        wt_trans = self.bzrdir.get_workingtree_transport(None)
256
260
        try:
281
285
        self._control_files.break_lock()
282
286
        self.branch.break_lock()
283
287
 
 
288
    def _get_check_refs(self):
 
289
        """Return the references needed to perform a check of this tree.
 
290
        
 
291
        The default implementation returns no refs, and is only suitable for
 
292
        trees that have no local caching and can commit on ghosts at any time.
 
293
 
 
294
        :seealso: bzrlib.check for details about check_refs.
 
295
        """
 
296
        return []
 
297
 
284
298
    def requires_rich_root(self):
285
299
        return self._format.requires_rich_root
286
300
 
534
548
        else:
535
549
            parents = [last_rev]
536
550
        try:
537
 
            merges_file = self._transport.get('pending-merges')
 
551
            merges_bytes = self._transport.get_bytes('pending-merges')
538
552
        except errors.NoSuchFile:
539
553
            pass
540
554
        else:
541
 
            for l in merges_file.readlines():
 
555
            for l in osutils.split_lines(merges_bytes):
542
556
                revision_id = l.rstrip('\n')
543
557
                parents.append(revision_id)
544
558
        return parents
603
617
 
604
618
    def get_file_size(self, file_id):
605
619
        """See Tree.get_file_size"""
 
620
        # XXX: this returns the on-disk size; it should probably return the
 
621
        # canonical size
606
622
        try:
607
623
            return os.path.getsize(self.id2abspath(file_id))
608
624
        except OSError, e:
624
640
 
625
641
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
626
642
        file_id = self.path2id(path)
 
643
        if file_id is None:
 
644
            # For unversioned files on win32, we just assume they are not
 
645
            # executable
 
646
            return False
627
647
        return self._inventory[file_id].executable
628
648
 
629
649
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
739
759
            raise
740
760
        kind = _mapper(stat_result.st_mode)
741
761
        if kind == 'file':
742
 
            size = stat_result.st_size
743
 
            # try for a stat cache lookup
744
 
            executable = self._is_executable_from_path_and_stat(path, stat_result)
745
 
            return (kind, size, executable, self._sha_from_stat(
746
 
                path, stat_result))
 
762
            return self._file_content_summary(path, stat_result)
747
763
        elif kind == 'directory':
748
764
            # perhaps it looks like a plain directory, but it's really a
749
765
            # reference.
756
772
        else:
757
773
            return (kind, None, None, None)
758
774
 
 
775
    def _file_content_summary(self, path, stat_result):
 
776
        size = stat_result.st_size
 
777
        executable = self._is_executable_from_path_and_stat(path, stat_result)
 
778
        # try for a stat cache lookup
 
779
        return ('file', size, executable, self._sha_from_stat(
 
780
            path, stat_result))
 
781
 
759
782
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
760
783
        """Common ghost checking functionality from set_parent_*.
761
784
 
881
904
 
882
905
    @needs_write_lock # because merge pulls data into the branch.
883
906
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
884
 
        merge_type=None):
 
907
                          merge_type=None, force=False):
885
908
        """Merge from a branch into this working tree.
886
909
 
887
910
        :param branch: The branch to merge from.
891
914
            branch.last_revision().
892
915
        """
893
916
        from bzrlib.merge import Merger, Merge3Merger
894
 
        pb = ui.ui_factory.nested_progress_bar()
895
 
        try:
896
 
            merger = Merger(self.branch, this_tree=self, pb=pb)
897
 
            merger.pp = ProgressPhase("Merge phase", 5, pb)
898
 
            merger.pp.next_phase()
899
 
            # check that there are no
900
 
            # local alterations
901
 
            merger.check_basis(check_clean=True, require_commits=False)
902
 
            if to_revision is None:
903
 
                to_revision = _mod_revision.ensure_null(branch.last_revision())
904
 
            merger.other_rev_id = to_revision
905
 
            if _mod_revision.is_null(merger.other_rev_id):
906
 
                raise errors.NoCommits(branch)
907
 
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
908
 
            merger.other_basis = merger.other_rev_id
909
 
            merger.other_tree = self.branch.repository.revision_tree(
910
 
                merger.other_rev_id)
911
 
            merger.other_branch = branch
912
 
            merger.pp.next_phase()
913
 
            if from_revision is None:
914
 
                merger.find_base()
915
 
            else:
916
 
                merger.set_base_revision(from_revision, branch)
917
 
            if merger.base_rev_id == merger.other_rev_id:
918
 
                raise errors.PointlessMerge
919
 
            merger.backup_files = False
920
 
            if merge_type is None:
921
 
                merger.merge_type = Merge3Merger
922
 
            else:
923
 
                merger.merge_type = merge_type
924
 
            merger.set_interesting_files(None)
925
 
            merger.show_base = False
926
 
            merger.reprocess = False
927
 
            conflicts = merger.do_merge()
928
 
            merger.set_pending()
929
 
        finally:
930
 
            pb.finished()
 
917
        merger = Merger(self.branch, this_tree=self)
 
918
        # check that there are no local alterations
 
919
        if not force and self.has_changes():
 
920
            raise errors.UncommittedChanges(self)
 
921
        if to_revision is None:
 
922
            to_revision = _mod_revision.ensure_null(branch.last_revision())
 
923
        merger.other_rev_id = to_revision
 
924
        if _mod_revision.is_null(merger.other_rev_id):
 
925
            raise errors.NoCommits(branch)
 
926
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
927
        merger.other_basis = merger.other_rev_id
 
928
        merger.other_tree = self.branch.repository.revision_tree(
 
929
            merger.other_rev_id)
 
930
        merger.other_branch = branch
 
931
        if from_revision is None:
 
932
            merger.find_base()
 
933
        else:
 
934
            merger.set_base_revision(from_revision, branch)
 
935
        if merger.base_rev_id == merger.other_rev_id:
 
936
            raise errors.PointlessMerge
 
937
        merger.backup_files = False
 
938
        if merge_type is None:
 
939
            merger.merge_type = Merge3Merger
 
940
        else:
 
941
            merger.merge_type = merge_type
 
942
        merger.set_interesting_files(None)
 
943
        merger.show_base = False
 
944
        merger.reprocess = False
 
945
        conflicts = merger.do_merge()
 
946
        merger.set_pending()
931
947
        return conflicts
932
948
 
933
949
    @needs_read_lock
1080
1096
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1081
1097
        if tree_transport.base != branch_transport.base:
1082
1098
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1083
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
 
1099
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
 
1100
                target_branch=new_branch)
1084
1101
        else:
1085
1102
            tree_bzrdir = branch_bzrdir
1086
1103
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1124
1141
        This does not include files that have been deleted in this
1125
1142
        tree. Skips the control directory.
1126
1143
 
1127
 
        :param include_root: if True, do not return an entry for the root
 
1144
        :param include_root: if True, return an entry for the root
1128
1145
        :param from_dir: start from this directory or None for the root
1129
1146
        :param recursive: whether to recurse into subdirectories or not
1130
1147
        """
1476
1493
        from_tail = splitpath(from_rel)[-1]
1477
1494
        from_id = inv.path2id(from_rel)
1478
1495
        if from_id is None:
1479
 
            raise errors.BzrRenameFailedError(from_rel,to_rel,
1480
 
                errors.NotVersionedError(path=str(from_rel)))
1481
 
        from_entry = inv[from_id]
 
1496
            # if file is missing in the inventory maybe it's in the basis_tree
 
1497
            basis_tree = self.branch.basis_tree()
 
1498
            from_id = basis_tree.path2id(from_rel)
 
1499
            if from_id is None:
 
1500
                raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1501
                    errors.NotVersionedError(path=str(from_rel)))
 
1502
            # put entry back in the inventory so we can rename it
 
1503
            from_entry = basis_tree.inventory[from_id].copy()
 
1504
            inv.add(from_entry)
 
1505
        else:
 
1506
            from_entry = inv[from_id]
1482
1507
        from_parent_id = from_entry.parent_id
1483
1508
        to_dir, to_tail = os.path.split(to_rel)
1484
1509
        to_dir_id = inv.path2id(to_dir)
1576
1601
    @needs_write_lock
1577
1602
    def pull(self, source, overwrite=False, stop_revision=None,
1578
1603
             change_reporter=None, possible_transports=None, local=False):
1579
 
        top_pb = ui.ui_factory.nested_progress_bar()
1580
1604
        source.lock_read()
1581
1605
        try:
1582
 
            pp = ProgressPhase("Pull phase", 2, top_pb)
1583
 
            pp.next_phase()
1584
1606
            old_revision_info = self.branch.last_revision_info()
1585
1607
            basis_tree = self.basis_tree()
1586
1608
            count = self.branch.pull(source, overwrite, stop_revision,
1588
1610
                                     local=local)
1589
1611
            new_revision_info = self.branch.last_revision_info()
1590
1612
            if new_revision_info != old_revision_info:
1591
 
                pp.next_phase()
1592
1613
                repository = self.branch.repository
1593
 
                pb = ui.ui_factory.nested_progress_bar()
1594
1614
                basis_tree.lock_read()
1595
1615
                try:
1596
1616
                    new_basis_tree = self.branch.basis_tree()
1599
1619
                                new_basis_tree,
1600
1620
                                basis_tree,
1601
1621
                                this_tree=self,
1602
 
                                pb=pb,
 
1622
                                pb=None,
1603
1623
                                change_reporter=change_reporter)
1604
 
                    if (basis_tree.inventory.root is None and
1605
 
                        new_basis_tree.inventory.root is not None):
1606
 
                        self.set_root_id(new_basis_tree.get_root_id())
 
1624
                    basis_root_id = basis_tree.get_root_id()
 
1625
                    new_root_id = new_basis_tree.get_root_id()
 
1626
                    if basis_root_id != new_root_id:
 
1627
                        self.set_root_id(new_root_id)
1607
1628
                finally:
1608
 
                    pb.finished()
1609
1629
                    basis_tree.unlock()
1610
1630
                # TODO - dedup parents list with things merged by pull ?
1611
1631
                # reuse the revisiontree we merged against to set the new
1624
1644
            return count
1625
1645
        finally:
1626
1646
            source.unlock()
1627
 
            top_pb.finished()
1628
1647
 
1629
1648
    @needs_write_lock
1630
1649
    def put_file_bytes_non_atomic(self, file_id, bytes):
1715
1734
        r"""Check whether the filename matches an ignore pattern.
1716
1735
 
1717
1736
        Patterns containing '/' or '\' need to match the whole path;
1718
 
        others match against only the last component.
 
1737
        others match against only the last component.  Patterns starting
 
1738
        with '!' are ignore exceptions.  Exceptions take precedence
 
1739
        over regular patterns and cause the filename to not be ignored.
1719
1740
 
1720
1741
        If the file is ignored, returns the pattern which caused it to
1721
1742
        be ignored, otherwise None.  So this can simply be used as a
1722
1743
        boolean if desired."""
1723
1744
        if getattr(self, '_ignoreglobster', None) is None:
1724
 
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
 
1745
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1725
1746
        return self._ignoreglobster.match(filename)
1726
1747
 
1727
1748
    def kind(self, file_id):
1777
1798
            raise errors.ObjectNotLocked(self)
1778
1799
 
1779
1800
    def lock_read(self):
1780
 
        """See Branch.lock_read, and WorkingTree.unlock."""
 
1801
        """Lock the tree for reading.
 
1802
 
 
1803
        This also locks the branch, and can be unlocked via self.unlock().
 
1804
 
 
1805
        :return: An object with an unlock method which will release the lock
 
1806
            obtained.
 
1807
        """
1781
1808
        if not self.is_locked():
1782
1809
            self._reset_data()
1783
1810
        self.branch.lock_read()
1784
1811
        try:
1785
 
            return self._control_files.lock_read()
 
1812
            self._control_files.lock_read()
 
1813
            return self
1786
1814
        except:
1787
1815
            self.branch.unlock()
1788
1816
            raise
1789
1817
 
1790
1818
    def lock_tree_write(self):
1791
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
 
1819
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
 
1820
 
 
1821
        :return: An object with an unlock method which will release the lock
 
1822
            obtained.
 
1823
        """
1792
1824
        if not self.is_locked():
1793
1825
            self._reset_data()
1794
1826
        self.branch.lock_read()
1795
1827
        try:
1796
 
            return self._control_files.lock_write()
 
1828
            self._control_files.lock_write()
 
1829
            return self
1797
1830
        except:
1798
1831
            self.branch.unlock()
1799
1832
            raise
1800
1833
 
1801
1834
    def lock_write(self):
1802
 
        """See MutableTree.lock_write, and WorkingTree.unlock."""
 
1835
        """See MutableTree.lock_write, and WorkingTree.unlock.
 
1836
 
 
1837
        :return: An object with an unlock method which will release the lock
 
1838
            obtained.
 
1839
        """
1803
1840
        if not self.is_locked():
1804
1841
            self._reset_data()
1805
1842
        self.branch.lock_write()
1806
1843
        try:
1807
 
            return self._control_files.lock_write()
 
1844
            self._control_files.lock_write()
 
1845
            return self
1808
1846
        except:
1809
1847
            self.branch.unlock()
1810
1848
            raise
1818
1856
    def _reset_data(self):
1819
1857
        """Reset transient data that cannot be revalidated."""
1820
1858
        self._inventory_is_modified = False
1821
 
        result = self._deserialize(self._transport.get('inventory'))
 
1859
        f = self._transport.get('inventory')
 
1860
        try:
 
1861
            result = self._deserialize(f)
 
1862
        finally:
 
1863
            f.close()
1822
1864
        self._set_inventory(result, dirty=False)
1823
1865
 
1824
1866
    @needs_tree_write_lock
1871
1913
            # revision_id is set. We must check for this full string, because a
1872
1914
            # root node id can legitimately look like 'revision_id' but cannot
1873
1915
            # contain a '"'.
1874
 
            xml = self.branch.repository.get_inventory_xml(new_revision)
 
1916
            xml = self.branch.repository._get_inventory_xml(new_revision)
1875
1917
            firstline = xml.split('\n', 1)[0]
1876
1918
            if (not 'revision_id="' in firstline or
1877
1919
                'format="7"' not in firstline):
1878
 
                inv = self.branch.repository.deserialise_inventory(
1879
 
                    new_revision, xml)
 
1920
                inv = self.branch.repository._serializer.read_inventory_from_string(
 
1921
                    xml, new_revision)
1880
1922
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1881
1923
            self._write_basis_inventory(xml)
1882
1924
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1900
1942
        # binary.
1901
1943
        if self._inventory_is_modified:
1902
1944
            raise errors.InventoryModified(self)
1903
 
        result = self._deserialize(self._transport.get('inventory'))
 
1945
        f = self._transport.get('inventory')
 
1946
        try:
 
1947
            result = self._deserialize(f)
 
1948
        finally:
 
1949
            f.close()
1904
1950
        self._set_inventory(result, dirty=False)
1905
1951
        return result
1906
1952
 
1921
1967
 
1922
1968
        new_files=set()
1923
1969
        unknown_nested_files=set()
 
1970
        if to_file is None:
 
1971
            to_file = sys.stdout
1924
1972
 
1925
1973
        def recurse_directory_to_add_files(directory):
1926
1974
            # Recurse directory and add all files
1996
2044
                        new_status = 'I'
1997
2045
                    else:
1998
2046
                        new_status = '?'
1999
 
                    textui.show_status(new_status, self.kind(fid), f,
2000
 
                                       to_file=to_file)
 
2047
                    # XXX: Really should be a more abstract reporter interface
 
2048
                    kind_ch = osutils.kind_marker(self.kind(fid))
 
2049
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
2001
2050
                # Unversion file
2002
2051
                inv_delta.append((f, None, fid, None))
2003
2052
                message = "removed %s" % (f,)
2026
2075
 
2027
2076
    @needs_tree_write_lock
2028
2077
    def revert(self, filenames=None, old_tree=None, backups=True,
2029
 
               pb=DummyProgress(), report_changes=False):
 
2078
               pb=None, report_changes=False):
2030
2079
        from bzrlib.conflicts import resolve
2031
2080
        if filenames == []:
2032
2081
            filenames = None
2154
2203
        """
2155
2204
        raise NotImplementedError(self.unlock)
2156
2205
 
2157
 
    def update(self, change_reporter=None, possible_transports=None):
 
2206
    _marker = object()
 
2207
 
 
2208
    def update(self, change_reporter=None, possible_transports=None,
 
2209
               revision=None, old_tip=_marker):
2158
2210
        """Update a working tree along its branch.
2159
2211
 
2160
2212
        This will update the branch if its bound too, which means we have
2178
2230
        - Merge current state -> basis tree of the master w.r.t. the old tree
2179
2231
          basis.
2180
2232
        - Do a 'normal' merge of the old branch basis if it is relevant.
 
2233
 
 
2234
        :param revision: The target revision to update to. Must be in the
 
2235
            revision history.
 
2236
        :param old_tip: If branch.update() has already been run, the value it
 
2237
            returned (old tip of the branch or None). _marker is used
 
2238
            otherwise.
2181
2239
        """
2182
2240
        if self.branch.get_bound_location() is not None:
2183
2241
            self.lock_write()
2184
 
            update_branch = True
 
2242
            update_branch = (old_tip is self._marker)
2185
2243
        else:
2186
2244
            self.lock_tree_write()
2187
2245
            update_branch = False
2189
2247
            if update_branch:
2190
2248
                old_tip = self.branch.update(possible_transports)
2191
2249
            else:
2192
 
                old_tip = None
2193
 
            return self._update_tree(old_tip, change_reporter)
 
2250
                if old_tip is self._marker:
 
2251
                    old_tip = None
 
2252
            return self._update_tree(old_tip, change_reporter, revision)
2194
2253
        finally:
2195
2254
            self.unlock()
2196
2255
 
2197
2256
    @needs_tree_write_lock
2198
 
    def _update_tree(self, old_tip=None, change_reporter=None):
 
2257
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2199
2258
        """Update a tree to the master branch.
2200
2259
 
2201
2260
        :param old_tip: if supplied, the previous tip revision the branch,
2211
2270
        # We MUST save it even if an error occurs, because otherwise the users
2212
2271
        # local work is unreferenced and will appear to have been lost.
2213
2272
        #
2214
 
        result = 0
 
2273
        nb_conflicts = 0
2215
2274
        try:
2216
2275
            last_rev = self.get_parent_ids()[0]
2217
2276
        except IndexError:
2218
2277
            last_rev = _mod_revision.NULL_REVISION
2219
 
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2220
 
            # merge tree state up to new branch tip.
 
2278
        if revision is None:
 
2279
            revision = self.branch.last_revision()
 
2280
 
 
2281
        old_tip = old_tip or _mod_revision.NULL_REVISION
 
2282
 
 
2283
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
 
2284
            # the branch we are bound to was updated
 
2285
            # merge those changes in first
 
2286
            base_tree  = self.basis_tree()
 
2287
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2288
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
 
2289
                                             base_tree, this_tree=self,
 
2290
                                             change_reporter=change_reporter)
 
2291
            if nb_conflicts:
 
2292
                self.add_parent_tree((old_tip, other_tree))
 
2293
                trace.note('Rerun update after fixing the conflicts.')
 
2294
                return nb_conflicts
 
2295
 
 
2296
        if last_rev != _mod_revision.ensure_null(revision):
 
2297
            # the working tree is up to date with the branch
 
2298
            # we can merge the specified revision from master
 
2299
            to_tree = self.branch.repository.revision_tree(revision)
 
2300
            to_root_id = to_tree.get_root_id()
 
2301
 
2221
2302
            basis = self.basis_tree()
2222
2303
            basis.lock_read()
2223
2304
            try:
2224
 
                to_tree = self.branch.basis_tree()
2225
 
                if basis.inventory.root is None:
2226
 
                    self.set_root_id(to_tree.get_root_id())
 
2305
                if (basis.inventory.root is None
 
2306
                    or basis.inventory.root.file_id != to_root_id):
 
2307
                    self.set_root_id(to_root_id)
2227
2308
                    self.flush()
2228
 
                result += merge.merge_inner(
2229
 
                                      self.branch,
2230
 
                                      to_tree,
2231
 
                                      basis,
2232
 
                                      this_tree=self,
2233
 
                                      change_reporter=change_reporter)
2234
2309
            finally:
2235
2310
                basis.unlock()
 
2311
 
 
2312
            # determine the branch point
 
2313
            graph = self.branch.repository.get_graph()
 
2314
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2315
                                                last_rev)
 
2316
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2317
 
 
2318
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
 
2319
                                             this_tree=self,
 
2320
                                             change_reporter=change_reporter)
 
2321
            self.set_last_revision(revision)
2236
2322
            # TODO - dedup parents list with things merged by pull ?
2237
2323
            # reuse the tree we've updated to to set the basis:
2238
 
            parent_trees = [(self.branch.last_revision(), to_tree)]
 
2324
            parent_trees = [(revision, to_tree)]
2239
2325
            merges = self.get_parent_ids()[1:]
2240
2326
            # Ideally we ask the tree for the trees here, that way the working
2241
2327
            # tree can decide whether to give us the entire tree or give us a
2245
2331
            for parent in merges:
2246
2332
                parent_trees.append(
2247
2333
                    (parent, self.branch.repository.revision_tree(parent)))
2248
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2334
            if not _mod_revision.is_null(old_tip):
2249
2335
                parent_trees.append(
2250
2336
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2251
2337
            self.set_parent_trees(parent_trees)
2252
2338
            last_rev = parent_trees[0][0]
2253
 
        else:
2254
 
            # the working tree had the same last-revision as the master
2255
 
            # branch did. We may still have pivot local work from the local
2256
 
            # branch into old_tip:
2257
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2258
 
                self.add_parent_tree_id(old_tip)
2259
 
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
2260
 
            and old_tip != last_rev):
2261
 
            # our last revision was not the prior branch last revision
2262
 
            # and we have converted that last revision to a pending merge.
2263
 
            # base is somewhere between the branch tip now
2264
 
            # and the now pending merge
2265
 
 
2266
 
            # Since we just modified the working tree and inventory, flush out
2267
 
            # the current state, before we modify it again.
2268
 
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2269
 
            #       requires it only because TreeTransform directly munges the
2270
 
            #       inventory and calls tree._write_inventory(). Ultimately we
2271
 
            #       should be able to remove this extra flush.
2272
 
            self.flush()
2273
 
            graph = self.branch.repository.get_graph()
2274
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2275
 
                                                old_tip)
2276
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2277
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2278
 
            result += merge.merge_inner(
2279
 
                                  self.branch,
2280
 
                                  other_tree,
2281
 
                                  base_tree,
2282
 
                                  this_tree=self,
2283
 
                                  change_reporter=change_reporter)
2284
 
        return result
 
2339
        return nb_conflicts
2285
2340
 
2286
2341
    def _write_hashcache_if_dirty(self):
2287
2342
        """Write out the hashcache if it is dirty."""
2528
2583
        return un_resolved, resolved
2529
2584
 
2530
2585
    @needs_read_lock
2531
 
    def _check(self):
 
2586
    def _check(self, references):
 
2587
        """Check the tree for consistency.
 
2588
 
 
2589
        :param references: A dict with keys matching the items returned by
 
2590
            self._get_check_refs(), and values from looking those keys up in
 
2591
            the repository.
 
2592
        """
2532
2593
        tree_basis = self.basis_tree()
2533
2594
        tree_basis.lock_read()
2534
2595
        try:
2535
 
            repo_basis = self.branch.repository.revision_tree(
2536
 
                self.last_revision())
 
2596
            repo_basis = references[('trees', self.last_revision())]
2537
2597
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2538
2598
                raise errors.BzrCheckError(
2539
2599
                    "Mismatched basis inventory content.")
2552
2612
        """
2553
2613
        return
2554
2614
 
2555
 
    @needs_read_lock
2556
2615
    def _get_rules_searcher(self, default_searcher):
2557
2616
        """See Tree._get_rules_searcher."""
2558
2617
        if self._rules_searcher is None:
2585
2644
        if self._inventory is None:
2586
2645
            self.read_working_inventory()
2587
2646
 
 
2647
    def _get_check_refs(self):
 
2648
        """Return the references needed to perform a check of this tree."""
 
2649
        return [('trees', self.last_revision())]
 
2650
 
2588
2651
    def lock_tree_write(self):
2589
2652
        """See WorkingTree.lock_tree_write().
2590
2653
 
2591
2654
        In Format2 WorkingTrees we have a single lock for the branch and tree
2592
2655
        so lock_tree_write() degrades to lock_write().
 
2656
 
 
2657
        :return: An object with an unlock method which will release the lock
 
2658
            obtained.
2593
2659
        """
2594
2660
        self.branch.lock_write()
2595
2661
        try:
2596
 
            return self._control_files.lock_write()
 
2662
            self._control_files.lock_write()
 
2663
            return self
2597
2664
        except:
2598
2665
            self.branch.unlock()
2599
2666
            raise
2647
2714
                mode=self.bzrdir._get_file_mode())
2648
2715
            return True
2649
2716
 
 
2717
    def _get_check_refs(self):
 
2718
        """Return the references needed to perform a check of this tree."""
 
2719
        return [('trees', self.last_revision())]
 
2720
 
2650
2721
    @needs_tree_write_lock
2651
2722
    def set_conflicts(self, conflicts):
2652
2723
        self._put_rio('conflicts', conflicts.to_stanzas(),
2729
2800
        """Return the format for the working tree object in a_bzrdir."""
2730
2801
        try:
2731
2802
            transport = a_bzrdir.get_workingtree_transport(None)
2732
 
            format_string = transport.get("format").read()
 
2803
            format_string = transport.get_bytes("format")
2733
2804
            return klass._formats[format_string]
2734
2805
        except errors.NoSuchFile:
2735
2806
            raise errors.NoWorkingTree(base=transport.base)
2999
3070
        return self.get_format_string()
3000
3071
 
3001
3072
 
3002
 
__default_format = WorkingTreeFormat4()
 
3073
__default_format = WorkingTreeFormat6()
3003
3074
WorkingTreeFormat.register_format(__default_format)
3004
 
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3005
3075
WorkingTreeFormat.register_format(WorkingTreeFormat5())
 
3076
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3006
3077
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3007
3078
WorkingTreeFormat.set_default_format(__default_format)
3008
3079
# formats which have no format string are not discoverable