/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: Vincent Ladeuil
  • Date: 2009-10-06 14:40:37 UTC
  • mto: (4728.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4731.
  • Revision ID: v.ladeuil+lp@free.fr-20091006144037-o76rgosv9hj3td0y
Simplify mutable_tree.has_changes() and update call sites.

* bzrlib/workingtree.py:
(WorkingTree.merge_from_branch): Add a force parameter. Replace
the check_basis() call by the corresponding code, taken the new
'force' parameter into account.

* bzrlib/tests/test_status.py:
(TestStatus.make_multiple_pending_tree): Add force=True on
supplementary merges.

* bzrlib/tests/test_reconfigure.py:
(TestReconfigure): Add a test for pending merges.

* bzrlib/tests/test_msgeditor.py:
(MsgEditorTest.make_multiple_pending_tree): Add force=True on
supplementary merges.

* bzrlib/tests/blackbox/test_uncommit.py:
(TestUncommit.test_uncommit_octopus_merge): Add force=True on
supplementary merges.

* bzrlib/send.py:
(send): Use the simplified has_changes(). Fix typo in comment too.

* bzrlib/reconfigure.py:
(Reconfigure._check): Use the simplified has_changes().

* bzrlib/mutabletree.py:
(MutableTree.has_changes): Make the tree parameter optional but
retain it for tests. Add a pending merges check.

* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.file_revisions,
Merger.check_basis, Merger.compare_basis): Deprecate.

* bzrlib/bundle/apply_bundle.py:
(merge_bundle): Replace the check_basis() call by the
corresponding code.

* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use the
simplified has_changes().
(cmd_merge.run): Replace the check_basis call() by the corresponding
code (minus the alredy done has_changes() check).

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:
549
544
        else:
550
545
            parents = [last_rev]
551
546
        try:
552
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
547
            merges_file = self._transport.get('pending-merges')
553
548
        except errors.NoSuchFile:
554
549
            pass
555
550
        else:
556
 
            for l in osutils.split_lines(merges_bytes):
 
551
            for l in merges_file.readlines():
557
552
                revision_id = l.rstrip('\n')
558
553
                parents.append(revision_id)
559
554
        return parents
641
636
 
642
637
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
638
        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
639
        return self._inventory[file_id].executable
649
640
 
650
641
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
915
906
            branch.last_revision().
916
907
        """
917
908
        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()
 
909
        pb = ui.ui_factory.nested_progress_bar()
 
910
        try:
 
911
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
912
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
913
            merger.pp.next_phase()
 
914
            # check that there are no local alterations
 
915
            if not force and self.has_changes():
 
916
                raise errors.UncommittedChanges(self)
 
917
            if to_revision is None:
 
918
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
919
            merger.other_rev_id = to_revision
 
920
            if _mod_revision.is_null(merger.other_rev_id):
 
921
                raise errors.NoCommits(branch)
 
922
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
923
            merger.other_basis = merger.other_rev_id
 
924
            merger.other_tree = self.branch.repository.revision_tree(
 
925
                merger.other_rev_id)
 
926
            merger.other_branch = branch
 
927
            merger.pp.next_phase()
 
928
            if from_revision is None:
 
929
                merger.find_base()
 
930
            else:
 
931
                merger.set_base_revision(from_revision, branch)
 
932
            if merger.base_rev_id == merger.other_rev_id:
 
933
                raise errors.PointlessMerge
 
934
            merger.backup_files = False
 
935
            if merge_type is None:
 
936
                merger.merge_type = Merge3Merger
 
937
            else:
 
938
                merger.merge_type = merge_type
 
939
            merger.set_interesting_files(None)
 
940
            merger.show_base = False
 
941
            merger.reprocess = False
 
942
            conflicts = merger.do_merge()
 
943
            merger.set_pending()
 
944
        finally:
 
945
            pb.finished()
948
946
        return conflicts
949
947
 
950
948
    @needs_read_lock
1097
1095
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1096
        if tree_transport.base != branch_transport.base:
1099
1097
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1098
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1099
        else:
1103
1100
            tree_bzrdir = branch_bzrdir
1104
1101
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1139
        This does not include files that have been deleted in this
1143
1140
        tree. Skips the control directory.
1144
1141
 
1145
 
        :param include_root: if True, return an entry for the root
 
1142
        :param include_root: if True, do not return an entry for the root
1146
1143
        :param from_dir: start from this directory or None for the root
1147
1144
        :param recursive: whether to recurse into subdirectories or not
1148
1145
        """
1602
1599
    @needs_write_lock
1603
1600
    def pull(self, source, overwrite=False, stop_revision=None,
1604
1601
             change_reporter=None, possible_transports=None, local=False):
 
1602
        top_pb = ui.ui_factory.nested_progress_bar()
1605
1603
        source.lock_read()
1606
1604
        try:
 
1605
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1606
            pp.next_phase()
1607
1607
            old_revision_info = self.branch.last_revision_info()
1608
1608
            basis_tree = self.basis_tree()
1609
1609
            count = self.branch.pull(source, overwrite, stop_revision,
1611
1611
                                     local=local)
1612
1612
            new_revision_info = self.branch.last_revision_info()
1613
1613
            if new_revision_info != old_revision_info:
 
1614
                pp.next_phase()
1614
1615
                repository = self.branch.repository
 
1616
                pb = ui.ui_factory.nested_progress_bar()
1615
1617
                basis_tree.lock_read()
1616
1618
                try:
1617
1619
                    new_basis_tree = self.branch.basis_tree()
1620
1622
                                new_basis_tree,
1621
1623
                                basis_tree,
1622
1624
                                this_tree=self,
1623
 
                                pb=None,
 
1625
                                pb=pb,
1624
1626
                                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)
 
1627
                    if (basis_tree.inventory.root is None and
 
1628
                        new_basis_tree.inventory.root is not None):
 
1629
                        self.set_root_id(new_basis_tree.get_root_id())
1629
1630
                finally:
 
1631
                    pb.finished()
1630
1632
                    basis_tree.unlock()
1631
1633
                # TODO - dedup parents list with things merged by pull ?
1632
1634
                # reuse the revisiontree we merged against to set the new
1645
1647
            return count
1646
1648
        finally:
1647
1649
            source.unlock()
 
1650
            top_pb.finished()
1648
1651
 
1649
1652
    @needs_write_lock
1650
1653
    def put_file_bytes_non_atomic(self, file_id, bytes):
1735
1738
        r"""Check whether the filename matches an ignore pattern.
1736
1739
 
1737
1740
        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.
 
1741
        others match against only the last component.
1741
1742
 
1742
1743
        If the file is ignored, returns the pattern which caused it to
1743
1744
        be ignored, otherwise None.  So this can simply be used as a
1744
1745
        boolean if desired."""
1745
1746
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1747
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1748
        return self._ignoreglobster.match(filename)
1748
1749
 
1749
1750
    def kind(self, file_id):
1799
1800
            raise errors.ObjectNotLocked(self)
1800
1801
 
1801
1802
    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
 
        """
 
1803
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1804
        if not self.is_locked():
1809
1805
            self._reset_data()
1810
1806
        self.branch.lock_read()
1811
1807
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1808
            return self._control_files.lock_read()
1814
1809
        except:
1815
1810
            self.branch.unlock()
1816
1811
            raise
1817
1812
 
1818
1813
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1814
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1815
        if not self.is_locked():
1824
1816
            self._reset_data()
1825
1817
        self.branch.lock_read()
1826
1818
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1819
            return self._control_files.lock_write()
1829
1820
        except:
1830
1821
            self.branch.unlock()
1831
1822
            raise
1832
1823
 
1833
1824
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1825
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1826
        if not self.is_locked():
1839
1827
            self._reset_data()
1840
1828
        self.branch.lock_write()
1841
1829
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1830
            return self._control_files.lock_write()
1844
1831
        except:
1845
1832
            self.branch.unlock()
1846
1833
            raise
1854
1841
    def _reset_data(self):
1855
1842
        """Reset transient data that cannot be revalidated."""
1856
1843
        self._inventory_is_modified = False
1857
 
        f = self._transport.get('inventory')
1858
 
        try:
1859
 
            result = self._deserialize(f)
1860
 
        finally:
1861
 
            f.close()
 
1844
        result = self._deserialize(self._transport.get('inventory'))
1862
1845
        self._set_inventory(result, dirty=False)
1863
1846
 
1864
1847
    @needs_tree_write_lock
1911
1894
            # revision_id is set. We must check for this full string, because a
1912
1895
            # root node id can legitimately look like 'revision_id' but cannot
1913
1896
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1897
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1898
            firstline = xml.split('\n', 1)[0]
1916
1899
            if (not 'revision_id="' in firstline or
1917
1900
                'format="7"' not in firstline):
1940
1923
        # binary.
1941
1924
        if self._inventory_is_modified:
1942
1925
            raise errors.InventoryModified(self)
1943
 
        f = self._transport.get('inventory')
1944
 
        try:
1945
 
            result = self._deserialize(f)
1946
 
        finally:
1947
 
            f.close()
 
1926
        result = self._deserialize(self._transport.get('inventory'))
1948
1927
        self._set_inventory(result, dirty=False)
1949
1928
        return result
1950
1929
 
1965
1944
 
1966
1945
        new_files=set()
1967
1946
        unknown_nested_files=set()
1968
 
        if to_file is None:
1969
 
            to_file = sys.stdout
1970
1947
 
1971
1948
        def recurse_directory_to_add_files(directory):
1972
1949
            # Recurse directory and add all files
1973
1950
            # so we can check if they have changed.
1974
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1951
            for parent_info, file_infos in\
 
1952
                self.walkdirs(directory):
1975
1953
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1976
1954
                    # Is it versioned or ignored?
1977
1955
                    if self.path2id(relpath) or self.is_ignored(relpath):
2012
1990
                            # ... but not ignored
2013
1991
                            has_changed_files = True
2014
1992
                            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.
 
1993
                    elif content_change and (kind[1] is not None):
 
1994
                        # Versioned and changed, but not deleted
2019
1995
                        has_changed_files = True
2020
1996
                        break
2021
1997
 
2043
2019
                        new_status = 'I'
2044
2020
                    else:
2045
2021
                        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')
 
2022
                    textui.show_status(new_status, self.kind(fid), f,
 
2023
                                       to_file=to_file)
2049
2024
                # Unversion file
2050
2025
                inv_delta.append((f, None, fid, None))
2051
2026
                message = "removed %s" % (f,)
2074
2049
 
2075
2050
    @needs_tree_write_lock
2076
2051
    def revert(self, filenames=None, old_tree=None, backups=True,
2077
 
               pb=None, report_changes=False):
 
2052
               pb=DummyProgress(), report_changes=False):
2078
2053
        from bzrlib.conflicts import resolve
2079
2054
        if filenames == []:
2080
2055
            filenames = None
2202
2177
        """
2203
2178
        raise NotImplementedError(self.unlock)
2204
2179
 
2205
 
    _marker = object()
2206
 
 
2207
 
    def update(self, change_reporter=None, possible_transports=None,
2208
 
               revision=None, old_tip=_marker):
 
2180
    def update(self, change_reporter=None, possible_transports=None):
2209
2181
        """Update a working tree along its branch.
2210
2182
 
2211
2183
        This will update the branch if its bound too, which means we have
2229
2201
        - Merge current state -> basis tree of the master w.r.t. the old tree
2230
2202
          basis.
2231
2203
        - 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
2204
        """
2239
2205
        if self.branch.get_bound_location() is not None:
2240
2206
            self.lock_write()
2241
 
            update_branch = (old_tip is self._marker)
 
2207
            update_branch = True
2242
2208
        else:
2243
2209
            self.lock_tree_write()
2244
2210
            update_branch = False
2246
2212
            if update_branch:
2247
2213
                old_tip = self.branch.update(possible_transports)
2248
2214
            else:
2249
 
                if old_tip is self._marker:
2250
 
                    old_tip = None
2251
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2215
                old_tip = None
 
2216
            return self._update_tree(old_tip, change_reporter)
2252
2217
        finally:
2253
2218
            self.unlock()
2254
2219
 
2255
2220
    @needs_tree_write_lock
2256
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2221
    def _update_tree(self, old_tip=None, change_reporter=None):
2257
2222
        """Update a tree to the master branch.
2258
2223
 
2259
2224
        :param old_tip: if supplied, the previous tip revision the branch,
2269
2234
        # We MUST save it even if an error occurs, because otherwise the users
2270
2235
        # local work is unreferenced and will appear to have been lost.
2271
2236
        #
2272
 
        nb_conflicts = 0
 
2237
        result = 0
2273
2238
        try:
2274
2239
            last_rev = self.get_parent_ids()[0]
2275
2240
        except IndexError:
2276
2241
            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
 
 
 
2242
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2243
            # merge tree state up to new branch tip.
2301
2244
            basis = self.basis_tree()
2302
2245
            basis.lock_read()
2303
2246
            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)
 
2247
                to_tree = self.branch.basis_tree()
 
2248
                if basis.inventory.root is None:
 
2249
                    self.set_root_id(to_tree.get_root_id())
2307
2250
                    self.flush()
 
2251
                result += merge.merge_inner(
 
2252
                                      self.branch,
 
2253
                                      to_tree,
 
2254
                                      basis,
 
2255
                                      this_tree=self,
 
2256
                                      change_reporter=change_reporter)
2308
2257
            finally:
2309
2258
                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
2259
            # TODO - dedup parents list with things merged by pull ?
2322
2260
            # reuse the tree we've updated to to set the basis:
2323
 
            parent_trees = [(revision, to_tree)]
 
2261
            parent_trees = [(self.branch.last_revision(), to_tree)]
2324
2262
            merges = self.get_parent_ids()[1:]
2325
2263
            # Ideally we ask the tree for the trees here, that way the working
2326
2264
            # tree can decide whether to give us the entire tree or give us a
2330
2268
            for parent in merges:
2331
2269
                parent_trees.append(
2332
2270
                    (parent, self.branch.repository.revision_tree(parent)))
2333
 
            if not _mod_revision.is_null(old_tip):
 
2271
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2334
2272
                parent_trees.append(
2335
2273
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2336
2274
            self.set_parent_trees(parent_trees)
2337
2275
            last_rev = parent_trees[0][0]
2338
 
        return nb_conflicts
 
2276
        else:
 
2277
            # the working tree had the same last-revision as the master
 
2278
            # branch did. We may still have pivot local work from the local
 
2279
            # branch into old_tip:
 
2280
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2281
                self.add_parent_tree_id(old_tip)
 
2282
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2283
            and old_tip != last_rev):
 
2284
            # our last revision was not the prior branch last revision
 
2285
            # and we have converted that last revision to a pending merge.
 
2286
            # base is somewhere between the branch tip now
 
2287
            # and the now pending merge
 
2288
 
 
2289
            # Since we just modified the working tree and inventory, flush out
 
2290
            # the current state, before we modify it again.
 
2291
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2292
            #       requires it only because TreeTransform directly munges the
 
2293
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2294
            #       should be able to remove this extra flush.
 
2295
            self.flush()
 
2296
            graph = self.branch.repository.get_graph()
 
2297
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2298
                                                old_tip)
 
2299
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2300
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2301
            result += merge.merge_inner(
 
2302
                                  self.branch,
 
2303
                                  other_tree,
 
2304
                                  base_tree,
 
2305
                                  this_tree=self,
 
2306
                                  change_reporter=change_reporter)
 
2307
        return result
2339
2308
 
2340
2309
    def _write_hashcache_if_dirty(self):
2341
2310
        """Write out the hashcache if it is dirty."""
2611
2580
        """
2612
2581
        return
2613
2582
 
 
2583
    @needs_read_lock
2614
2584
    def _get_rules_searcher(self, default_searcher):
2615
2585
        """See Tree._get_rules_searcher."""
2616
2586
        if self._rules_searcher is None:
2652
2622
 
2653
2623
        In Format2 WorkingTrees we have a single lock for the branch and tree
2654
2624
        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
2625
        """
2659
2626
        self.branch.lock_write()
2660
2627
        try:
2661
 
            self._control_files.lock_write()
2662
 
            return self
 
2628
            return self._control_files.lock_write()
2663
2629
        except:
2664
2630
            self.branch.unlock()
2665
2631
            raise
2799
2765
        """Return the format for the working tree object in a_bzrdir."""
2800
2766
        try:
2801
2767
            transport = a_bzrdir.get_workingtree_transport(None)
2802
 
            format_string = transport.get_bytes("format")
 
2768
            format_string = transport.get("format").read()
2803
2769
            return klass._formats[format_string]
2804
2770
        except errors.NoSuchFile:
2805
2771
            raise errors.NoWorkingTree(base=transport.base)