/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2009-08-26 16:03:59 UTC
  • mto: (4634.6.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: john@arbash-meinel.com-20090826160359-ge4mai928bi3a5g2
https://launchpad.net/bugs/419241
Fix bug #419241. If a graph had a mainline ghost
we could get a segfault during KnownGraph.merge_sort().

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
 
    transport,
65
71
    ui,
66
72
    views,
67
73
    xml5,
68
74
    xml7,
69
75
    )
 
76
import bzrlib.branch
 
77
from bzrlib.transport import get_transport
70
78
from bzrlib.workingtree_4 import (
71
79
    WorkingTreeFormat4,
72
80
    WorkingTreeFormat5,
76
84
 
77
85
from bzrlib import symbol_versioning
78
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
79
 
from bzrlib.lock import LogicalLockResult
80
87
from bzrlib.lockable_files import LockableFiles
81
88
from bzrlib.lockdir import LockDir
82
89
import bzrlib.mutabletree
95
102
from bzrlib.filters import filtered_input_file
96
103
from bzrlib.trace import mutter, note
97
104
from bzrlib.transport.local import LocalTransport
 
105
from bzrlib.progress import DummyProgress, ProgressPhase
98
106
from bzrlib.revision import CURRENT_REVISION
99
107
from bzrlib.rio import RioReader, rio_file, Stanza
100
108
from bzrlib.symbol_versioning import (
104
112
 
105
113
 
106
114
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.
110
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
116
 
112
117
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
172
        return ''
168
173
 
169
174
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
175
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
176
    """Working copy tree.
173
177
 
174
178
    The inventory is held in the `Branch` working-inventory, and the
176
180
 
177
181
    It is possible for a `WorkingTree` to have a filename which is
178
182
    not listed in the Inventory and vice versa.
179
 
 
180
 
    :ivar basedir: The root of the tree on disk. This is a unicode path object
181
 
        (as opposed to a URL).
182
183
    """
183
184
 
184
185
    # override this to set the strategy for storing views
250
251
        self._rules_searcher = None
251
252
        self.views = self._make_views()
252
253
 
253
 
    @property
254
 
    def user_transport(self):
255
 
        return self.bzrdir.user_transport
256
 
 
257
 
    @property
258
 
    def control_transport(self):
259
 
        return self._transport
260
 
 
261
254
    def _detect_case_handling(self):
262
255
        wt_trans = self.bzrdir.get_workingtree_transport(None)
263
256
        try:
371
364
                return True, None
372
365
            else:
373
366
                return True, tree
374
 
        t = transport.get_transport(location)
375
 
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
 
367
        transport = get_transport(location)
 
368
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
376
369
                                              list_current=list_current)
377
 
        return [tr for tr in iterator if tr is not None]
 
370
        return [t for t in iterator if t is not None]
378
371
 
379
372
    # should be deprecated - this is slow and in any case treating them as a
380
373
    # container is (we now know) bad style -- mbp 20070302
465
458
        return (file_obj, stat_value)
466
459
 
467
460
    def get_file_text(self, file_id, path=None, filtered=True):
468
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
469
 
        try:
470
 
            return my_file.read()
471
 
        finally:
472
 
            my_file.close()
 
461
        return self.get_file(file_id, path=path, filtered=filtered).read()
473
462
 
474
463
    def get_file_byname(self, filename, filtered=True):
475
464
        path = self.abspath(filename)
529
518
 
530
519
        # Now we have the parents of this content
531
520
        annotator = self.branch.repository.texts.get_annotator()
532
 
        text = self.get_file_text(file_id)
 
521
        text = self.get_file(file_id).read()
533
522
        this_key =(file_id, default_revision)
534
523
        annotator.add_special_text(this_key, file_parent_keys, text)
535
524
        annotations = [(key[-1], line)
555
544
        else:
556
545
            parents = [last_rev]
557
546
        try:
558
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
547
            merges_file = self._transport.get('pending-merges')
559
548
        except errors.NoSuchFile:
560
549
            pass
561
550
        else:
562
 
            for l in osutils.split_lines(merges_bytes):
 
551
            for l in merges_file.readlines():
563
552
                revision_id = l.rstrip('\n')
564
553
                parents.append(revision_id)
565
554
        return parents
647
636
 
648
637
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
649
638
        file_id = self.path2id(path)
650
 
        if file_id is None:
651
 
            # For unversioned files on win32, we just assume they are not
652
 
            # executable
653
 
            return False
654
639
        return self._inventory[file_id].executable
655
640
 
656
641
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
911
896
 
912
897
    @needs_write_lock # because merge pulls data into the branch.
913
898
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
914
 
                          merge_type=None, force=False):
 
899
        merge_type=None):
915
900
        """Merge from a branch into this working tree.
916
901
 
917
902
        :param branch: The branch to merge from.
921
906
            branch.last_revision().
922
907
        """
923
908
        from bzrlib.merge import Merger, Merge3Merger
924
 
        merger = Merger(self.branch, this_tree=self)
925
 
        # check that there are no local alterations
926
 
        if not force and self.has_changes():
927
 
            raise errors.UncommittedChanges(self)
928
 
        if to_revision is None:
929
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
930
 
        merger.other_rev_id = to_revision
931
 
        if _mod_revision.is_null(merger.other_rev_id):
932
 
            raise errors.NoCommits(branch)
933
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
934
 
        merger.other_basis = merger.other_rev_id
935
 
        merger.other_tree = self.branch.repository.revision_tree(
936
 
            merger.other_rev_id)
937
 
        merger.other_branch = branch
938
 
        if from_revision is None:
939
 
            merger.find_base()
940
 
        else:
941
 
            merger.set_base_revision(from_revision, branch)
942
 
        if merger.base_rev_id == merger.other_rev_id:
943
 
            raise errors.PointlessMerge
944
 
        merger.backup_files = False
945
 
        if merge_type is None:
946
 
            merger.merge_type = Merge3Merger
947
 
        else:
948
 
            merger.merge_type = merge_type
949
 
        merger.set_interesting_files(None)
950
 
        merger.show_base = False
951
 
        merger.reprocess = False
952
 
        conflicts = merger.do_merge()
953
 
        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
 
915
            # local alterations
 
916
            merger.check_basis(check_clean=True, require_commits=False)
 
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()
954
946
        return conflicts
955
947
 
956
948
    @needs_read_lock
1103
1095
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1104
1096
        if tree_transport.base != branch_transport.base:
1105
1097
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1106
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1107
 
                target_branch=new_branch)
 
1098
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1108
1099
        else:
1109
1100
            tree_bzrdir = branch_bzrdir
1110
1101
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1148
1139
        This does not include files that have been deleted in this
1149
1140
        tree. Skips the control directory.
1150
1141
 
1151
 
        :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
1152
1143
        :param from_dir: start from this directory or None for the root
1153
1144
        :param recursive: whether to recurse into subdirectories or not
1154
1145
        """
1608
1599
    @needs_write_lock
1609
1600
    def pull(self, source, overwrite=False, stop_revision=None,
1610
1601
             change_reporter=None, possible_transports=None, local=False):
 
1602
        top_pb = ui.ui_factory.nested_progress_bar()
1611
1603
        source.lock_read()
1612
1604
        try:
 
1605
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1606
            pp.next_phase()
1613
1607
            old_revision_info = self.branch.last_revision_info()
1614
1608
            basis_tree = self.basis_tree()
1615
1609
            count = self.branch.pull(source, overwrite, stop_revision,
1617
1611
                                     local=local)
1618
1612
            new_revision_info = self.branch.last_revision_info()
1619
1613
            if new_revision_info != old_revision_info:
 
1614
                pp.next_phase()
1620
1615
                repository = self.branch.repository
 
1616
                pb = ui.ui_factory.nested_progress_bar()
1621
1617
                basis_tree.lock_read()
1622
1618
                try:
1623
1619
                    new_basis_tree = self.branch.basis_tree()
1626
1622
                                new_basis_tree,
1627
1623
                                basis_tree,
1628
1624
                                this_tree=self,
1629
 
                                pb=None,
 
1625
                                pb=pb,
1630
1626
                                change_reporter=change_reporter)
1631
 
                    basis_root_id = basis_tree.get_root_id()
1632
 
                    new_root_id = new_basis_tree.get_root_id()
1633
 
                    if basis_root_id != new_root_id:
1634
 
                        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())
1635
1630
                finally:
 
1631
                    pb.finished()
1636
1632
                    basis_tree.unlock()
1637
1633
                # TODO - dedup parents list with things merged by pull ?
1638
1634
                # reuse the revisiontree we merged against to set the new
1651
1647
            return count
1652
1648
        finally:
1653
1649
            source.unlock()
 
1650
            top_pb.finished()
1654
1651
 
1655
1652
    @needs_write_lock
1656
1653
    def put_file_bytes_non_atomic(self, file_id, bytes):
1741
1738
        r"""Check whether the filename matches an ignore pattern.
1742
1739
 
1743
1740
        Patterns containing '/' or '\' need to match the whole path;
1744
 
        others match against only the last component.  Patterns starting
1745
 
        with '!' are ignore exceptions.  Exceptions take precedence
1746
 
        over regular patterns and cause the filename to not be ignored.
 
1741
        others match against only the last component.
1747
1742
 
1748
1743
        If the file is ignored, returns the pattern which caused it to
1749
1744
        be ignored, otherwise None.  So this can simply be used as a
1750
1745
        boolean if desired."""
1751
1746
        if getattr(self, '_ignoreglobster', None) is None:
1752
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1747
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1753
1748
        return self._ignoreglobster.match(filename)
1754
1749
 
1755
1750
    def kind(self, file_id):
1805
1800
            raise errors.ObjectNotLocked(self)
1806
1801
 
1807
1802
    def lock_read(self):
1808
 
        """Lock the tree for reading.
1809
 
 
1810
 
        This also locks the branch, and can be unlocked via self.unlock().
1811
 
 
1812
 
        :return: A bzrlib.lock.LogicalLockResult.
1813
 
        """
 
1803
        """See Branch.lock_read, and WorkingTree.unlock."""
1814
1804
        if not self.is_locked():
1815
1805
            self._reset_data()
1816
1806
        self.branch.lock_read()
1817
1807
        try:
1818
 
            self._control_files.lock_read()
1819
 
            return LogicalLockResult(self.unlock)
 
1808
            return self._control_files.lock_read()
1820
1809
        except:
1821
1810
            self.branch.unlock()
1822
1811
            raise
1823
1812
 
1824
1813
    def lock_tree_write(self):
1825
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1826
 
 
1827
 
        :return: A bzrlib.lock.LogicalLockResult.
1828
 
        """
 
1814
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1829
1815
        if not self.is_locked():
1830
1816
            self._reset_data()
1831
1817
        self.branch.lock_read()
1832
1818
        try:
1833
 
            self._control_files.lock_write()
1834
 
            return LogicalLockResult(self.unlock)
 
1819
            return self._control_files.lock_write()
1835
1820
        except:
1836
1821
            self.branch.unlock()
1837
1822
            raise
1838
1823
 
1839
1824
    def lock_write(self):
1840
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1841
 
 
1842
 
        :return: A bzrlib.lock.LogicalLockResult.
1843
 
        """
 
1825
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1844
1826
        if not self.is_locked():
1845
1827
            self._reset_data()
1846
1828
        self.branch.lock_write()
1847
1829
        try:
1848
 
            self._control_files.lock_write()
1849
 
            return LogicalLockResult(self.unlock)
 
1830
            return self._control_files.lock_write()
1850
1831
        except:
1851
1832
            self.branch.unlock()
1852
1833
            raise
1860
1841
    def _reset_data(self):
1861
1842
        """Reset transient data that cannot be revalidated."""
1862
1843
        self._inventory_is_modified = False
1863
 
        f = self._transport.get('inventory')
1864
 
        try:
1865
 
            result = self._deserialize(f)
1866
 
        finally:
1867
 
            f.close()
 
1844
        result = self._deserialize(self._transport.get('inventory'))
1868
1845
        self._set_inventory(result, dirty=False)
1869
1846
 
1870
1847
    @needs_tree_write_lock
1917
1894
            # revision_id is set. We must check for this full string, because a
1918
1895
            # root node id can legitimately look like 'revision_id' but cannot
1919
1896
            # contain a '"'.
1920
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1897
            xml = self.branch.repository.get_inventory_xml(new_revision)
1921
1898
            firstline = xml.split('\n', 1)[0]
1922
1899
            if (not 'revision_id="' in firstline or
1923
1900
                'format="7"' not in firstline):
1946
1923
        # binary.
1947
1924
        if self._inventory_is_modified:
1948
1925
            raise errors.InventoryModified(self)
1949
 
        f = self._transport.get('inventory')
1950
 
        try:
1951
 
            result = self._deserialize(f)
1952
 
        finally:
1953
 
            f.close()
 
1926
        result = self._deserialize(self._transport.get('inventory'))
1954
1927
        self._set_inventory(result, dirty=False)
1955
1928
        return result
1956
1929
 
1971
1944
 
1972
1945
        new_files=set()
1973
1946
        unknown_nested_files=set()
1974
 
        if to_file is None:
1975
 
            to_file = sys.stdout
1976
1947
 
1977
1948
        def recurse_directory_to_add_files(directory):
1978
1949
            # Recurse directory and add all files
1979
1950
            # so we can check if they have changed.
1980
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1951
            for parent_info, file_infos in\
 
1952
                self.walkdirs(directory):
1981
1953
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1982
1954
                    # Is it versioned or ignored?
1983
1955
                    if self.path2id(relpath) or self.is_ignored(relpath):
2018
1990
                            # ... but not ignored
2019
1991
                            has_changed_files = True
2020
1992
                            break
2021
 
                    elif (content_change and (kind[1] is not None) and
2022
 
                            osutils.is_inside_any(files, path[1])):
2023
 
                        # Versioned and changed, but not deleted, and still
2024
 
                        # 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
2025
1995
                        has_changed_files = True
2026
1996
                        break
2027
1997
 
2049
2019
                        new_status = 'I'
2050
2020
                    else:
2051
2021
                        new_status = '?'
2052
 
                    # XXX: Really should be a more abstract reporter interface
2053
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2054
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2022
                    textui.show_status(new_status, self.kind(fid), f,
 
2023
                                       to_file=to_file)
2055
2024
                # Unversion file
2056
2025
                inv_delta.append((f, None, fid, None))
2057
2026
                message = "removed %s" % (f,)
2080
2049
 
2081
2050
    @needs_tree_write_lock
2082
2051
    def revert(self, filenames=None, old_tree=None, backups=True,
2083
 
               pb=None, report_changes=False):
 
2052
               pb=DummyProgress(), report_changes=False):
2084
2053
        from bzrlib.conflicts import resolve
2085
2054
        if filenames == []:
2086
2055
            filenames = None
2208
2177
        """
2209
2178
        raise NotImplementedError(self.unlock)
2210
2179
 
2211
 
    _marker = object()
2212
 
 
2213
 
    def update(self, change_reporter=None, possible_transports=None,
2214
 
               revision=None, old_tip=_marker):
 
2180
    def update(self, change_reporter=None, possible_transports=None):
2215
2181
        """Update a working tree along its branch.
2216
2182
 
2217
2183
        This will update the branch if its bound too, which means we have
2235
2201
        - Merge current state -> basis tree of the master w.r.t. the old tree
2236
2202
          basis.
2237
2203
        - Do a 'normal' merge of the old branch basis if it is relevant.
2238
 
 
2239
 
        :param revision: The target revision to update to. Must be in the
2240
 
            revision history.
2241
 
        :param old_tip: If branch.update() has already been run, the value it
2242
 
            returned (old tip of the branch or None). _marker is used
2243
 
            otherwise.
2244
2204
        """
2245
2205
        if self.branch.get_bound_location() is not None:
2246
2206
            self.lock_write()
2247
 
            update_branch = (old_tip is self._marker)
 
2207
            update_branch = True
2248
2208
        else:
2249
2209
            self.lock_tree_write()
2250
2210
            update_branch = False
2252
2212
            if update_branch:
2253
2213
                old_tip = self.branch.update(possible_transports)
2254
2214
            else:
2255
 
                if old_tip is self._marker:
2256
 
                    old_tip = None
2257
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2215
                old_tip = None
 
2216
            return self._update_tree(old_tip, change_reporter)
2258
2217
        finally:
2259
2218
            self.unlock()
2260
2219
 
2261
2220
    @needs_tree_write_lock
2262
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2221
    def _update_tree(self, old_tip=None, change_reporter=None):
2263
2222
        """Update a tree to the master branch.
2264
2223
 
2265
2224
        :param old_tip: if supplied, the previous tip revision the branch,
2275
2234
        # We MUST save it even if an error occurs, because otherwise the users
2276
2235
        # local work is unreferenced and will appear to have been lost.
2277
2236
        #
2278
 
        nb_conflicts = 0
 
2237
        result = 0
2279
2238
        try:
2280
2239
            last_rev = self.get_parent_ids()[0]
2281
2240
        except IndexError:
2282
2241
            last_rev = _mod_revision.NULL_REVISION
2283
 
        if revision is None:
2284
 
            revision = self.branch.last_revision()
2285
 
 
2286
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2287
 
 
2288
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2289
 
            # the branch we are bound to was updated
2290
 
            # merge those changes in first
2291
 
            base_tree  = self.basis_tree()
2292
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2293
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2294
 
                                             base_tree, this_tree=self,
2295
 
                                             change_reporter=change_reporter)
2296
 
            if nb_conflicts:
2297
 
                self.add_parent_tree((old_tip, other_tree))
2298
 
                trace.note('Rerun update after fixing the conflicts.')
2299
 
                return nb_conflicts
2300
 
 
2301
 
        if last_rev != _mod_revision.ensure_null(revision):
2302
 
            # the working tree is up to date with the branch
2303
 
            # we can merge the specified revision from master
2304
 
            to_tree = self.branch.repository.revision_tree(revision)
2305
 
            to_root_id = to_tree.get_root_id()
2306
 
 
 
2242
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2243
            # merge tree state up to new branch tip.
2307
2244
            basis = self.basis_tree()
2308
2245
            basis.lock_read()
2309
2246
            try:
2310
 
                if (basis.inventory.root is None
2311
 
                    or basis.inventory.root.file_id != to_root_id):
2312
 
                    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())
2313
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)
2314
2257
            finally:
2315
2258
                basis.unlock()
2316
 
 
2317
 
            # determine the branch point
2318
 
            graph = self.branch.repository.get_graph()
2319
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2320
 
                                                last_rev)
2321
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2322
 
 
2323
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2324
 
                                             this_tree=self,
2325
 
                                             change_reporter=change_reporter)
2326
 
            self.set_last_revision(revision)
2327
2259
            # TODO - dedup parents list with things merged by pull ?
2328
2260
            # reuse the tree we've updated to to set the basis:
2329
 
            parent_trees = [(revision, to_tree)]
 
2261
            parent_trees = [(self.branch.last_revision(), to_tree)]
2330
2262
            merges = self.get_parent_ids()[1:]
2331
2263
            # Ideally we ask the tree for the trees here, that way the working
2332
2264
            # tree can decide whether to give us the entire tree or give us a
2336
2268
            for parent in merges:
2337
2269
                parent_trees.append(
2338
2270
                    (parent, self.branch.repository.revision_tree(parent)))
2339
 
            if not _mod_revision.is_null(old_tip):
 
2271
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2340
2272
                parent_trees.append(
2341
2273
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2342
2274
            self.set_parent_trees(parent_trees)
2343
2275
            last_rev = parent_trees[0][0]
2344
 
        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
2345
2308
 
2346
2309
    def _write_hashcache_if_dirty(self):
2347
2310
        """Write out the hashcache if it is dirty."""
2617
2580
        """
2618
2581
        return
2619
2582
 
 
2583
    @needs_read_lock
2620
2584
    def _get_rules_searcher(self, default_searcher):
2621
2585
        """See Tree._get_rules_searcher."""
2622
2586
        if self._rules_searcher is None:
2658
2622
 
2659
2623
        In Format2 WorkingTrees we have a single lock for the branch and tree
2660
2624
        so lock_tree_write() degrades to lock_write().
2661
 
 
2662
 
        :return: An object with an unlock method which will release the lock
2663
 
            obtained.
2664
2625
        """
2665
2626
        self.branch.lock_write()
2666
2627
        try:
2667
 
            self._control_files.lock_write()
2668
 
            return self
 
2628
            return self._control_files.lock_write()
2669
2629
        except:
2670
2630
            self.branch.unlock()
2671
2631
            raise
2805
2765
        """Return the format for the working tree object in a_bzrdir."""
2806
2766
        try:
2807
2767
            transport = a_bzrdir.get_workingtree_transport(None)
2808
 
            format_string = transport.get_bytes("format")
 
2768
            format_string = transport.get("format").read()
2809
2769
            return klass._formats[format_string]
2810
2770
        except errors.NoSuchFile:
2811
2771
            raise errors.NoWorkingTree(base=transport.base)