/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: Canonical.com Patch Queue Manager
  • Date: 2009-08-05 18:56:37 UTC
  • mfrom: (4580.5.16 1.18-win32-buildbot)
  • Revision ID: pqm@pqm.ubuntu.com-20090805185637-3f0y10upzcdw7e0g
Updates to buildout.cfg etc to have 'make installer-all' start being
        the preferred way to build win32 installer.

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, 2009 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
59
65
    merge,
60
66
    revision as _mod_revision,
61
67
    revisiontree,
 
68
    textui,
62
69
    trace,
63
70
    transform,
64
71
    ui,
77
84
 
78
85
from bzrlib import symbol_versioning
79
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
 
from bzrlib.lock import LogicalLockResult
81
87
from bzrlib.lockable_files import LockableFiles
82
88
from bzrlib.lockdir import LockDir
83
89
import bzrlib.mutabletree
96
102
from bzrlib.filters import filtered_input_file
97
103
from bzrlib.trace import mutter, note
98
104
from bzrlib.transport.local import LocalTransport
 
105
from bzrlib.progress import DummyProgress, ProgressPhase
99
106
from bzrlib.revision import CURRENT_REVISION
100
107
from bzrlib.rio import RioReader, rio_file, Stanza
101
108
from bzrlib.symbol_versioning import (
105
112
 
106
113
 
107
114
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
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
116
 
113
117
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
172
        return ''
169
173
 
170
174
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
175
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
176
    """Working copy tree.
174
177
 
175
178
    The inventory is held in the `Branch` working-inventory, and the
248
251
        self._rules_searcher = None
249
252
        self.views = self._make_views()
250
253
 
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
254
    def _detect_case_handling(self):
260
255
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
256
        try:
286
281
        self._control_files.break_lock()
287
282
        self.branch.break_lock()
288
283
 
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
284
    def requires_rich_root(self):
300
285
        return self._format.requires_rich_root
301
286
 
549
534
        else:
550
535
            parents = [last_rev]
551
536
        try:
552
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
537
            merges_file = self._transport.get('pending-merges')
553
538
        except errors.NoSuchFile:
554
539
            pass
555
540
        else:
556
 
            for l in osutils.split_lines(merges_bytes):
 
541
            for l in merges_file.readlines():
557
542
                revision_id = l.rstrip('\n')
558
543
                parents.append(revision_id)
559
544
        return parents
618
603
 
619
604
    def get_file_size(self, file_id):
620
605
        """See Tree.get_file_size"""
621
 
        # XXX: this returns the on-disk size; it should probably return the
622
 
        # canonical size
623
606
        try:
624
607
            return os.path.getsize(self.id2abspath(file_id))
625
608
        except OSError, e:
641
624
 
642
625
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
626
        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
627
        return self._inventory[file_id].executable
649
628
 
650
629
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
760
739
            raise
761
740
        kind = _mapper(stat_result.st_mode)
762
741
        if kind == 'file':
763
 
            return self._file_content_summary(path, stat_result)
 
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))
764
747
        elif kind == 'directory':
765
748
            # perhaps it looks like a plain directory, but it's really a
766
749
            # reference.
773
756
        else:
774
757
            return (kind, None, None, None)
775
758
 
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
759
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
760
        """Common ghost checking functionality from set_parent_*.
785
761
 
905
881
 
906
882
    @needs_write_lock # because merge pulls data into the branch.
907
883
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
 
                          merge_type=None, force=False):
 
884
        merge_type=None):
909
885
        """Merge from a branch into this working tree.
910
886
 
911
887
        :param branch: The branch to merge from.
915
891
            branch.last_revision().
916
892
        """
917
893
        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()
 
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()
948
931
        return conflicts
949
932
 
950
933
    @needs_read_lock
1097
1080
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1081
        if tree_transport.base != branch_transport.base:
1099
1082
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1083
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1084
        else:
1103
1085
            tree_bzrdir = branch_bzrdir
1104
1086
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1124
        This does not include files that have been deleted in this
1143
1125
        tree. Skips the control directory.
1144
1126
 
1145
 
        :param include_root: if True, return an entry for the root
 
1127
        :param include_root: if True, do not return an entry for the root
1146
1128
        :param from_dir: start from this directory or None for the root
1147
1129
        :param recursive: whether to recurse into subdirectories or not
1148
1130
        """
1602
1584
    @needs_write_lock
1603
1585
    def pull(self, source, overwrite=False, stop_revision=None,
1604
1586
             change_reporter=None, possible_transports=None, local=False):
 
1587
        top_pb = ui.ui_factory.nested_progress_bar()
1605
1588
        source.lock_read()
1606
1589
        try:
 
1590
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1591
            pp.next_phase()
1607
1592
            old_revision_info = self.branch.last_revision_info()
1608
1593
            basis_tree = self.basis_tree()
1609
1594
            count = self.branch.pull(source, overwrite, stop_revision,
1611
1596
                                     local=local)
1612
1597
            new_revision_info = self.branch.last_revision_info()
1613
1598
            if new_revision_info != old_revision_info:
 
1599
                pp.next_phase()
1614
1600
                repository = self.branch.repository
 
1601
                pb = ui.ui_factory.nested_progress_bar()
1615
1602
                basis_tree.lock_read()
1616
1603
                try:
1617
1604
                    new_basis_tree = self.branch.basis_tree()
1620
1607
                                new_basis_tree,
1621
1608
                                basis_tree,
1622
1609
                                this_tree=self,
1623
 
                                pb=None,
 
1610
                                pb=pb,
1624
1611
                                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)
 
1612
                    if (basis_tree.inventory.root is None and
 
1613
                        new_basis_tree.inventory.root is not None):
 
1614
                        self.set_root_id(new_basis_tree.get_root_id())
1629
1615
                finally:
 
1616
                    pb.finished()
1630
1617
                    basis_tree.unlock()
1631
1618
                # TODO - dedup parents list with things merged by pull ?
1632
1619
                # reuse the revisiontree we merged against to set the new
1645
1632
            return count
1646
1633
        finally:
1647
1634
            source.unlock()
 
1635
            top_pb.finished()
1648
1636
 
1649
1637
    @needs_write_lock
1650
1638
    def put_file_bytes_non_atomic(self, file_id, bytes):
1735
1723
        r"""Check whether the filename matches an ignore pattern.
1736
1724
 
1737
1725
        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.
 
1726
        others match against only the last component.
1741
1727
 
1742
1728
        If the file is ignored, returns the pattern which caused it to
1743
1729
        be ignored, otherwise None.  So this can simply be used as a
1744
1730
        boolean if desired."""
1745
1731
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1732
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1733
        return self._ignoreglobster.match(filename)
1748
1734
 
1749
1735
    def kind(self, file_id):
1799
1785
            raise errors.ObjectNotLocked(self)
1800
1786
 
1801
1787
    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
 
        """
 
1788
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1789
        if not self.is_locked():
1809
1790
            self._reset_data()
1810
1791
        self.branch.lock_read()
1811
1792
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1793
            return self._control_files.lock_read()
1814
1794
        except:
1815
1795
            self.branch.unlock()
1816
1796
            raise
1817
1797
 
1818
1798
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1799
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1800
        if not self.is_locked():
1824
1801
            self._reset_data()
1825
1802
        self.branch.lock_read()
1826
1803
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1804
            return self._control_files.lock_write()
1829
1805
        except:
1830
1806
            self.branch.unlock()
1831
1807
            raise
1832
1808
 
1833
1809
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1810
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1811
        if not self.is_locked():
1839
1812
            self._reset_data()
1840
1813
        self.branch.lock_write()
1841
1814
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1815
            return self._control_files.lock_write()
1844
1816
        except:
1845
1817
            self.branch.unlock()
1846
1818
            raise
1854
1826
    def _reset_data(self):
1855
1827
        """Reset transient data that cannot be revalidated."""
1856
1828
        self._inventory_is_modified = False
1857
 
        f = self._transport.get('inventory')
1858
 
        try:
1859
 
            result = self._deserialize(f)
1860
 
        finally:
1861
 
            f.close()
 
1829
        result = self._deserialize(self._transport.get('inventory'))
1862
1830
        self._set_inventory(result, dirty=False)
1863
1831
 
1864
1832
    @needs_tree_write_lock
1911
1879
            # revision_id is set. We must check for this full string, because a
1912
1880
            # root node id can legitimately look like 'revision_id' but cannot
1913
1881
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1882
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1883
            firstline = xml.split('\n', 1)[0]
1916
1884
            if (not 'revision_id="' in firstline or
1917
1885
                'format="7"' not in firstline):
1918
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1919
 
                    xml, new_revision)
 
1886
                inv = self.branch.repository.deserialise_inventory(
 
1887
                    new_revision, xml)
1920
1888
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1921
1889
            self._write_basis_inventory(xml)
1922
1890
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1940
1908
        # binary.
1941
1909
        if self._inventory_is_modified:
1942
1910
            raise errors.InventoryModified(self)
1943
 
        f = self._transport.get('inventory')
1944
 
        try:
1945
 
            result = self._deserialize(f)
1946
 
        finally:
1947
 
            f.close()
 
1911
        result = self._deserialize(self._transport.get('inventory'))
1948
1912
        self._set_inventory(result, dirty=False)
1949
1913
        return result
1950
1914
 
1965
1929
 
1966
1930
        new_files=set()
1967
1931
        unknown_nested_files=set()
1968
 
        if to_file is None:
1969
 
            to_file = sys.stdout
1970
1932
 
1971
1933
        def recurse_directory_to_add_files(directory):
1972
1934
            # Recurse directory and add all files
2042
2004
                        new_status = 'I'
2043
2005
                    else:
2044
2006
                        new_status = '?'
2045
 
                    # XXX: Really should be a more abstract reporter interface
2046
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2047
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2007
                    textui.show_status(new_status, self.kind(fid), f,
 
2008
                                       to_file=to_file)
2048
2009
                # Unversion file
2049
2010
                inv_delta.append((f, None, fid, None))
2050
2011
                message = "removed %s" % (f,)
2073
2034
 
2074
2035
    @needs_tree_write_lock
2075
2036
    def revert(self, filenames=None, old_tree=None, backups=True,
2076
 
               pb=None, report_changes=False):
 
2037
               pb=DummyProgress(), report_changes=False):
2077
2038
        from bzrlib.conflicts import resolve
2078
2039
        if filenames == []:
2079
2040
            filenames = None
2201
2162
        """
2202
2163
        raise NotImplementedError(self.unlock)
2203
2164
 
2204
 
    _marker = object()
2205
 
 
2206
 
    def update(self, change_reporter=None, possible_transports=None,
2207
 
               revision=None, old_tip=_marker):
 
2165
    def update(self, change_reporter=None, possible_transports=None):
2208
2166
        """Update a working tree along its branch.
2209
2167
 
2210
2168
        This will update the branch if its bound too, which means we have
2228
2186
        - Merge current state -> basis tree of the master w.r.t. the old tree
2229
2187
          basis.
2230
2188
        - Do a 'normal' merge of the old branch basis if it is relevant.
2231
 
 
2232
 
        :param revision: The target revision to update to. Must be in the
2233
 
            revision history.
2234
 
        :param old_tip: If branch.update() has already been run, the value it
2235
 
            returned (old tip of the branch or None). _marker is used
2236
 
            otherwise.
2237
2189
        """
2238
2190
        if self.branch.get_bound_location() is not None:
2239
2191
            self.lock_write()
2240
 
            update_branch = (old_tip is self._marker)
 
2192
            update_branch = True
2241
2193
        else:
2242
2194
            self.lock_tree_write()
2243
2195
            update_branch = False
2245
2197
            if update_branch:
2246
2198
                old_tip = self.branch.update(possible_transports)
2247
2199
            else:
2248
 
                if old_tip is self._marker:
2249
 
                    old_tip = None
2250
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2200
                old_tip = None
 
2201
            return self._update_tree(old_tip, change_reporter)
2251
2202
        finally:
2252
2203
            self.unlock()
2253
2204
 
2254
2205
    @needs_tree_write_lock
2255
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2206
    def _update_tree(self, old_tip=None, change_reporter=None):
2256
2207
        """Update a tree to the master branch.
2257
2208
 
2258
2209
        :param old_tip: if supplied, the previous tip revision the branch,
2268
2219
        # We MUST save it even if an error occurs, because otherwise the users
2269
2220
        # local work is unreferenced and will appear to have been lost.
2270
2221
        #
2271
 
        nb_conflicts = 0
 
2222
        result = 0
2272
2223
        try:
2273
2224
            last_rev = self.get_parent_ids()[0]
2274
2225
        except IndexError:
2275
2226
            last_rev = _mod_revision.NULL_REVISION
2276
 
        if revision is None:
2277
 
            revision = self.branch.last_revision()
2278
 
 
2279
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2280
 
 
2281
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2282
 
            # the branch we are bound to was updated
2283
 
            # merge those changes in first
2284
 
            base_tree  = self.basis_tree()
2285
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2286
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2287
 
                                             base_tree, this_tree=self,
2288
 
                                             change_reporter=change_reporter)
2289
 
            if nb_conflicts:
2290
 
                self.add_parent_tree((old_tip, other_tree))
2291
 
                trace.note('Rerun update after fixing the conflicts.')
2292
 
                return nb_conflicts
2293
 
 
2294
 
        if last_rev != _mod_revision.ensure_null(revision):
2295
 
            # the working tree is up to date with the branch
2296
 
            # we can merge the specified revision from master
2297
 
            to_tree = self.branch.repository.revision_tree(revision)
2298
 
            to_root_id = to_tree.get_root_id()
2299
 
 
 
2227
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2228
            # merge tree state up to new branch tip.
2300
2229
            basis = self.basis_tree()
2301
2230
            basis.lock_read()
2302
2231
            try:
2303
 
                if (basis.inventory.root is None
2304
 
                    or basis.inventory.root.file_id != to_root_id):
2305
 
                    self.set_root_id(to_root_id)
 
2232
                to_tree = self.branch.basis_tree()
 
2233
                if basis.inventory.root is None:
 
2234
                    self.set_root_id(to_tree.get_root_id())
2306
2235
                    self.flush()
 
2236
                result += merge.merge_inner(
 
2237
                                      self.branch,
 
2238
                                      to_tree,
 
2239
                                      basis,
 
2240
                                      this_tree=self,
 
2241
                                      change_reporter=change_reporter)
2307
2242
            finally:
2308
2243
                basis.unlock()
2309
 
 
2310
 
            # determine the branch point
2311
 
            graph = self.branch.repository.get_graph()
2312
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2313
 
                                                last_rev)
2314
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2315
 
 
2316
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2317
 
                                             this_tree=self,
2318
 
                                             change_reporter=change_reporter)
2319
 
            self.set_last_revision(revision)
2320
2244
            # TODO - dedup parents list with things merged by pull ?
2321
2245
            # reuse the tree we've updated to to set the basis:
2322
 
            parent_trees = [(revision, to_tree)]
 
2246
            parent_trees = [(self.branch.last_revision(), to_tree)]
2323
2247
            merges = self.get_parent_ids()[1:]
2324
2248
            # Ideally we ask the tree for the trees here, that way the working
2325
2249
            # tree can decide whether to give us the entire tree or give us a
2329
2253
            for parent in merges:
2330
2254
                parent_trees.append(
2331
2255
                    (parent, self.branch.repository.revision_tree(parent)))
2332
 
            if not _mod_revision.is_null(old_tip):
 
2256
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2333
2257
                parent_trees.append(
2334
2258
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2335
2259
            self.set_parent_trees(parent_trees)
2336
2260
            last_rev = parent_trees[0][0]
2337
 
        return nb_conflicts
 
2261
        else:
 
2262
            # the working tree had the same last-revision as the master
 
2263
            # branch did. We may still have pivot local work from the local
 
2264
            # branch into old_tip:
 
2265
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2266
                self.add_parent_tree_id(old_tip)
 
2267
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2268
            and old_tip != last_rev):
 
2269
            # our last revision was not the prior branch last revision
 
2270
            # and we have converted that last revision to a pending merge.
 
2271
            # base is somewhere between the branch tip now
 
2272
            # and the now pending merge
 
2273
 
 
2274
            # Since we just modified the working tree and inventory, flush out
 
2275
            # the current state, before we modify it again.
 
2276
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2277
            #       requires it only because TreeTransform directly munges the
 
2278
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2279
            #       should be able to remove this extra flush.
 
2280
            self.flush()
 
2281
            graph = self.branch.repository.get_graph()
 
2282
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2283
                                                old_tip)
 
2284
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2285
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2286
            result += merge.merge_inner(
 
2287
                                  self.branch,
 
2288
                                  other_tree,
 
2289
                                  base_tree,
 
2290
                                  this_tree=self,
 
2291
                                  change_reporter=change_reporter)
 
2292
        return result
2338
2293
 
2339
2294
    def _write_hashcache_if_dirty(self):
2340
2295
        """Write out the hashcache if it is dirty."""
2581
2536
        return un_resolved, resolved
2582
2537
 
2583
2538
    @needs_read_lock
2584
 
    def _check(self, references):
2585
 
        """Check the tree for consistency.
2586
 
 
2587
 
        :param references: A dict with keys matching the items returned by
2588
 
            self._get_check_refs(), and values from looking those keys up in
2589
 
            the repository.
2590
 
        """
 
2539
    def _check(self):
2591
2540
        tree_basis = self.basis_tree()
2592
2541
        tree_basis.lock_read()
2593
2542
        try:
2594
 
            repo_basis = references[('trees', self.last_revision())]
 
2543
            repo_basis = self.branch.repository.revision_tree(
 
2544
                self.last_revision())
2595
2545
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2596
2546
                raise errors.BzrCheckError(
2597
2547
                    "Mismatched basis inventory content.")
2610
2560
        """
2611
2561
        return
2612
2562
 
 
2563
    @needs_read_lock
2613
2564
    def _get_rules_searcher(self, default_searcher):
2614
2565
        """See Tree._get_rules_searcher."""
2615
2566
        if self._rules_searcher is None:
2642
2593
        if self._inventory is None:
2643
2594
            self.read_working_inventory()
2644
2595
 
2645
 
    def _get_check_refs(self):
2646
 
        """Return the references needed to perform a check of this tree."""
2647
 
        return [('trees', self.last_revision())]
2648
 
 
2649
2596
    def lock_tree_write(self):
2650
2597
        """See WorkingTree.lock_tree_write().
2651
2598
 
2652
2599
        In Format2 WorkingTrees we have a single lock for the branch and tree
2653
2600
        so lock_tree_write() degrades to lock_write().
2654
 
 
2655
 
        :return: An object with an unlock method which will release the lock
2656
 
            obtained.
2657
2601
        """
2658
2602
        self.branch.lock_write()
2659
2603
        try:
2660
 
            self._control_files.lock_write()
2661
 
            return self
 
2604
            return self._control_files.lock_write()
2662
2605
        except:
2663
2606
            self.branch.unlock()
2664
2607
            raise
2712
2655
                mode=self.bzrdir._get_file_mode())
2713
2656
            return True
2714
2657
 
2715
 
    def _get_check_refs(self):
2716
 
        """Return the references needed to perform a check of this tree."""
2717
 
        return [('trees', self.last_revision())]
2718
 
 
2719
2658
    @needs_tree_write_lock
2720
2659
    def set_conflicts(self, conflicts):
2721
2660
        self._put_rio('conflicts', conflicts.to_stanzas(),
2798
2737
        """Return the format for the working tree object in a_bzrdir."""
2799
2738
        try:
2800
2739
            transport = a_bzrdir.get_workingtree_transport(None)
2801
 
            format_string = transport.get_bytes("format")
 
2740
            format_string = transport.get("format").read()
2802
2741
            return klass._formats[format_string]
2803
2742
        except errors.NoSuchFile:
2804
2743
            raise errors.NoWorkingTree(base=transport.base)
3068
3007
        return self.get_format_string()
3069
3008
 
3070
3009
 
3071
 
__default_format = WorkingTreeFormat6()
 
3010
__default_format = WorkingTreeFormat4()
3072
3011
WorkingTreeFormat.register_format(__default_format)
 
3012
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3073
3013
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3074
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3075
3014
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3076
3015
WorkingTreeFormat.set_default_format(__default_format)
3077
3016
# formats which have no format string are not discoverable