← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge up through 2.2.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
32
 
# TODO: Give the workingtree sole responsibility for the working inventory;
33
 
# remove the variable and references to it from the branch.  This may require
34
 
# updating the commit code so as to update the inventory within the working
35
 
# copy, and making sure there's only one WorkingTree for any directory on disk.
36
 
# At the moment they may alias the inventory and have old copies of it in
37
 
# memory.  (Now done? -- mbp 20060309)
38
32
 
39
33
from cStringIO import StringIO
40
34
import os
65
59
    merge,
66
60
    revision as _mod_revision,
67
61
    revisiontree,
68
 
    textui,
69
62
    trace,
70
63
    transform,
 
64
    transport,
71
65
    ui,
72
66
    views,
73
67
    xml5,
74
68
    xml7,
75
69
    )
76
 
import bzrlib.branch
77
 
from bzrlib.transport import get_transport
78
70
from bzrlib.workingtree_4 import (
79
71
    WorkingTreeFormat4,
80
72
    WorkingTreeFormat5,
84
76
 
85
77
from bzrlib import symbol_versioning
86
78
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
79
from bzrlib.lock import LogicalLockResult
87
80
from bzrlib.lockable_files import LockableFiles
88
81
from bzrlib.lockdir import LockDir
89
82
import bzrlib.mutabletree
102
95
from bzrlib.filters import filtered_input_file
103
96
from bzrlib.trace import mutter, note
104
97
from bzrlib.transport.local import LocalTransport
105
 
from bzrlib.progress import DummyProgress, ProgressPhase
106
98
from bzrlib.revision import CURRENT_REVISION
107
99
from bzrlib.rio import RioReader, rio_file, Stanza
108
100
from bzrlib.symbol_versioning import (
112
104
 
113
105
 
114
106
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
 
107
# TODO: Modifying the conflict objects or their type is currently nearly
 
108
# impossible as there is no clear relationship between the working tree format
 
109
# and the conflict list file format.
115
110
CONFLICT_HEADER_1 = "BZR conflict list format 1"
116
111
 
117
112
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
172
167
        return ''
173
168
 
174
169
 
175
 
class WorkingTree(bzrlib.mutabletree.MutableTree):
 
170
class WorkingTree(bzrlib.mutabletree.MutableTree,
 
171
    bzrdir.ControlComponent):
176
172
    """Working copy tree.
177
173
 
178
174
    The inventory is held in the `Branch` working-inventory, and the
180
176
 
181
177
    It is possible for a `WorkingTree` to have a filename which is
182
178
    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).
183
182
    """
184
183
 
185
184
    # override this to set the strategy for storing views
251
250
        self._rules_searcher = None
252
251
        self.views = self._make_views()
253
252
 
 
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
 
254
261
    def _detect_case_handling(self):
255
262
        wt_trans = self.bzrdir.get_workingtree_transport(None)
256
263
        try:
364
371
                return True, None
365
372
            else:
366
373
                return True, tree
367
 
        transport = get_transport(location)
368
 
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
 
374
        t = transport.get_transport(location)
 
375
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
369
376
                                              list_current=list_current)
370
 
        return [t for t in iterator if t is not None]
 
377
        return [tr for tr in iterator if tr is not None]
371
378
 
372
379
    # should be deprecated - this is slow and in any case treating them as a
373
380
    # container is (we now know) bad style -- mbp 20070302
458
465
        return (file_obj, stat_value)
459
466
 
460
467
    def get_file_text(self, file_id, path=None, filtered=True):
461
 
        return self.get_file(file_id, path=path, filtered=filtered).read()
 
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()
462
473
 
463
474
    def get_file_byname(self, filename, filtered=True):
464
475
        path = self.abspath(filename)
518
529
 
519
530
        # Now we have the parents of this content
520
531
        annotator = self.branch.repository.texts.get_annotator()
521
 
        text = self.get_file(file_id).read()
 
532
        text = self.get_file_text(file_id)
522
533
        this_key =(file_id, default_revision)
523
534
        annotator.add_special_text(this_key, file_parent_keys, text)
524
535
        annotations = [(key[-1], line)
544
555
        else:
545
556
            parents = [last_rev]
546
557
        try:
547
 
            merges_file = self._transport.get('pending-merges')
 
558
            merges_bytes = self._transport.get_bytes('pending-merges')
548
559
        except errors.NoSuchFile:
549
560
            pass
550
561
        else:
551
 
            for l in merges_file.readlines():
 
562
            for l in osutils.split_lines(merges_bytes):
552
563
                revision_id = l.rstrip('\n')
553
564
                parents.append(revision_id)
554
565
        return parents
636
647
 
637
648
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
638
649
        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
639
654
        return self._inventory[file_id].executable
640
655
 
641
656
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
896
911
 
897
912
    @needs_write_lock # because merge pulls data into the branch.
898
913
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
899
 
        merge_type=None):
 
914
                          merge_type=None, force=False):
900
915
        """Merge from a branch into this working tree.
901
916
 
902
917
        :param branch: The branch to merge from.
906
921
            branch.last_revision().
907
922
        """
908
923
        from bzrlib.merge import Merger, Merge3Merger
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()
 
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()
946
954
        return conflicts
947
955
 
948
956
    @needs_read_lock
1095
1103
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1096
1104
        if tree_transport.base != branch_transport.base:
1097
1105
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1098
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
 
1106
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
 
1107
                target_branch=new_branch)
1099
1108
        else:
1100
1109
            tree_bzrdir = branch_bzrdir
1101
1110
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1139
1148
        This does not include files that have been deleted in this
1140
1149
        tree. Skips the control directory.
1141
1150
 
1142
 
        :param include_root: if True, do not return an entry for the root
 
1151
        :param include_root: if True, return an entry for the root
1143
1152
        :param from_dir: start from this directory or None for the root
1144
1153
        :param recursive: whether to recurse into subdirectories or not
1145
1154
        """
1599
1608
    @needs_write_lock
1600
1609
    def pull(self, source, overwrite=False, stop_revision=None,
1601
1610
             change_reporter=None, possible_transports=None, local=False):
1602
 
        top_pb = ui.ui_factory.nested_progress_bar()
1603
1611
        source.lock_read()
1604
1612
        try:
1605
 
            pp = ProgressPhase("Pull phase", 2, top_pb)
1606
 
            pp.next_phase()
1607
1613
            old_revision_info = self.branch.last_revision_info()
1608
1614
            basis_tree = self.basis_tree()
1609
1615
            count = self.branch.pull(source, overwrite, stop_revision,
1611
1617
                                     local=local)
1612
1618
            new_revision_info = self.branch.last_revision_info()
1613
1619
            if new_revision_info != old_revision_info:
1614
 
                pp.next_phase()
1615
1620
                repository = self.branch.repository
1616
 
                pb = ui.ui_factory.nested_progress_bar()
1617
1621
                basis_tree.lock_read()
1618
1622
                try:
1619
1623
                    new_basis_tree = self.branch.basis_tree()
1622
1626
                                new_basis_tree,
1623
1627
                                basis_tree,
1624
1628
                                this_tree=self,
1625
 
                                pb=pb,
 
1629
                                pb=None,
1626
1630
                                change_reporter=change_reporter)
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())
 
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)
1630
1635
                finally:
1631
 
                    pb.finished()
1632
1636
                    basis_tree.unlock()
1633
1637
                # TODO - dedup parents list with things merged by pull ?
1634
1638
                # reuse the revisiontree we merged against to set the new
1647
1651
            return count
1648
1652
        finally:
1649
1653
            source.unlock()
1650
 
            top_pb.finished()
1651
1654
 
1652
1655
    @needs_write_lock
1653
1656
    def put_file_bytes_non_atomic(self, file_id, bytes):
1738
1741
        r"""Check whether the filename matches an ignore pattern.
1739
1742
 
1740
1743
        Patterns containing '/' or '\' need to match the whole path;
1741
 
        others match against only the last component.
 
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.
1742
1747
 
1743
1748
        If the file is ignored, returns the pattern which caused it to
1744
1749
        be ignored, otherwise None.  So this can simply be used as a
1745
1750
        boolean if desired."""
1746
1751
        if getattr(self, '_ignoreglobster', None) is None:
1747
 
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
 
1752
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1748
1753
        return self._ignoreglobster.match(filename)
1749
1754
 
1750
1755
    def kind(self, file_id):
1800
1805
            raise errors.ObjectNotLocked(self)
1801
1806
 
1802
1807
    def lock_read(self):
1803
 
        """See Branch.lock_read, and WorkingTree.unlock."""
 
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
        """
1804
1814
        if not self.is_locked():
1805
1815
            self._reset_data()
1806
1816
        self.branch.lock_read()
1807
1817
        try:
1808
 
            return self._control_files.lock_read()
 
1818
            self._control_files.lock_read()
 
1819
            return LogicalLockResult(self.unlock)
1809
1820
        except:
1810
1821
            self.branch.unlock()
1811
1822
            raise
1812
1823
 
1813
1824
    def lock_tree_write(self):
1814
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
 
1825
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
 
1826
 
 
1827
        :return: A bzrlib.lock.LogicalLockResult.
 
1828
        """
1815
1829
        if not self.is_locked():
1816
1830
            self._reset_data()
1817
1831
        self.branch.lock_read()
1818
1832
        try:
1819
 
            return self._control_files.lock_write()
 
1833
            self._control_files.lock_write()
 
1834
            return LogicalLockResult(self.unlock)
1820
1835
        except:
1821
1836
            self.branch.unlock()
1822
1837
            raise
1823
1838
 
1824
1839
    def lock_write(self):
1825
 
        """See MutableTree.lock_write, and WorkingTree.unlock."""
 
1840
        """See MutableTree.lock_write, and WorkingTree.unlock.
 
1841
 
 
1842
        :return: A bzrlib.lock.LogicalLockResult.
 
1843
        """
1826
1844
        if not self.is_locked():
1827
1845
            self._reset_data()
1828
1846
        self.branch.lock_write()
1829
1847
        try:
1830
 
            return self._control_files.lock_write()
 
1848
            self._control_files.lock_write()
 
1849
            return LogicalLockResult(self.unlock)
1831
1850
        except:
1832
1851
            self.branch.unlock()
1833
1852
            raise
1841
1860
    def _reset_data(self):
1842
1861
        """Reset transient data that cannot be revalidated."""
1843
1862
        self._inventory_is_modified = False
1844
 
        result = self._deserialize(self._transport.get('inventory'))
 
1863
        f = self._transport.get('inventory')
 
1864
        try:
 
1865
            result = self._deserialize(f)
 
1866
        finally:
 
1867
            f.close()
1845
1868
        self._set_inventory(result, dirty=False)
1846
1869
 
1847
1870
    @needs_tree_write_lock
1894
1917
            # revision_id is set. We must check for this full string, because a
1895
1918
            # root node id can legitimately look like 'revision_id' but cannot
1896
1919
            # contain a '"'.
1897
 
            xml = self.branch.repository.get_inventory_xml(new_revision)
 
1920
            xml = self.branch.repository._get_inventory_xml(new_revision)
1898
1921
            firstline = xml.split('\n', 1)[0]
1899
1922
            if (not 'revision_id="' in firstline or
1900
1923
                'format="7"' not in firstline):
1923
1946
        # binary.
1924
1947
        if self._inventory_is_modified:
1925
1948
            raise errors.InventoryModified(self)
1926
 
        result = self._deserialize(self._transport.get('inventory'))
 
1949
        f = self._transport.get('inventory')
 
1950
        try:
 
1951
            result = self._deserialize(f)
 
1952
        finally:
 
1953
            f.close()
1927
1954
        self._set_inventory(result, dirty=False)
1928
1955
        return result
1929
1956
 
1944
1971
 
1945
1972
        new_files=set()
1946
1973
        unknown_nested_files=set()
 
1974
        if to_file is None:
 
1975
            to_file = sys.stdout
1947
1976
 
1948
1977
        def recurse_directory_to_add_files(directory):
1949
1978
            # Recurse directory and add all files
1950
1979
            # so we can check if they have changed.
1951
 
            for parent_info, file_infos in\
1952
 
                self.walkdirs(directory):
 
1980
            for parent_info, file_infos in self.walkdirs(directory):
1953
1981
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1954
1982
                    # Is it versioned or ignored?
1955
1983
                    if self.path2id(relpath) or self.is_ignored(relpath):
1990
2018
                            # ... but not ignored
1991
2019
                            has_changed_files = True
1992
2020
                            break
1993
 
                    elif content_change and (kind[1] is not None):
1994
 
                        # Versioned and changed, but not deleted
 
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.
1995
2025
                        has_changed_files = True
1996
2026
                        break
1997
2027
 
2019
2049
                        new_status = 'I'
2020
2050
                    else:
2021
2051
                        new_status = '?'
2022
 
                    textui.show_status(new_status, self.kind(fid), f,
2023
 
                                       to_file=to_file)
 
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')
2024
2055
                # Unversion file
2025
2056
                inv_delta.append((f, None, fid, None))
2026
2057
                message = "removed %s" % (f,)
2049
2080
 
2050
2081
    @needs_tree_write_lock
2051
2082
    def revert(self, filenames=None, old_tree=None, backups=True,
2052
 
               pb=DummyProgress(), report_changes=False):
 
2083
               pb=None, report_changes=False):
2053
2084
        from bzrlib.conflicts import resolve
2054
2085
        if filenames == []:
2055
2086
            filenames = None
2177
2208
        """
2178
2209
        raise NotImplementedError(self.unlock)
2179
2210
 
2180
 
    def update(self, change_reporter=None, possible_transports=None):
 
2211
    _marker = object()
 
2212
 
 
2213
    def update(self, change_reporter=None, possible_transports=None,
 
2214
               revision=None, old_tip=_marker):
2181
2215
        """Update a working tree along its branch.
2182
2216
 
2183
2217
        This will update the branch if its bound too, which means we have
2201
2235
        - Merge current state -> basis tree of the master w.r.t. the old tree
2202
2236
          basis.
2203
2237
        - 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.
2204
2244
        """
2205
2245
        if self.branch.get_bound_location() is not None:
2206
2246
            self.lock_write()
2207
 
            update_branch = True
 
2247
            update_branch = (old_tip is self._marker)
2208
2248
        else:
2209
2249
            self.lock_tree_write()
2210
2250
            update_branch = False
2212
2252
            if update_branch:
2213
2253
                old_tip = self.branch.update(possible_transports)
2214
2254
            else:
2215
 
                old_tip = None
2216
 
            return self._update_tree(old_tip, change_reporter)
 
2255
                if old_tip is self._marker:
 
2256
                    old_tip = None
 
2257
            return self._update_tree(old_tip, change_reporter, revision)
2217
2258
        finally:
2218
2259
            self.unlock()
2219
2260
 
2220
2261
    @needs_tree_write_lock
2221
 
    def _update_tree(self, old_tip=None, change_reporter=None):
 
2262
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2222
2263
        """Update a tree to the master branch.
2223
2264
 
2224
2265
        :param old_tip: if supplied, the previous tip revision the branch,
2234
2275
        # We MUST save it even if an error occurs, because otherwise the users
2235
2276
        # local work is unreferenced and will appear to have been lost.
2236
2277
        #
2237
 
        result = 0
 
2278
        nb_conflicts = 0
2238
2279
        try:
2239
2280
            last_rev = self.get_parent_ids()[0]
2240
2281
        except IndexError:
2241
2282
            last_rev = _mod_revision.NULL_REVISION
2242
 
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2243
 
            # merge tree state up to new branch tip.
 
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
 
2244
2307
            basis = self.basis_tree()
2245
2308
            basis.lock_read()
2246
2309
            try:
2247
 
                to_tree = self.branch.basis_tree()
2248
 
                if basis.inventory.root is None:
2249
 
                    self.set_root_id(to_tree.get_root_id())
 
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)
2250
2313
                    self.flush()
2251
 
                result += merge.merge_inner(
2252
 
                                      self.branch,
2253
 
                                      to_tree,
2254
 
                                      basis,
2255
 
                                      this_tree=self,
2256
 
                                      change_reporter=change_reporter)
2257
2314
            finally:
2258
2315
                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)
2259
2327
            # TODO - dedup parents list with things merged by pull ?
2260
2328
            # reuse the tree we've updated to to set the basis:
2261
 
            parent_trees = [(self.branch.last_revision(), to_tree)]
 
2329
            parent_trees = [(revision, to_tree)]
2262
2330
            merges = self.get_parent_ids()[1:]
2263
2331
            # Ideally we ask the tree for the trees here, that way the working
2264
2332
            # tree can decide whether to give us the entire tree or give us a
2268
2336
            for parent in merges:
2269
2337
                parent_trees.append(
2270
2338
                    (parent, self.branch.repository.revision_tree(parent)))
2271
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2339
            if not _mod_revision.is_null(old_tip):
2272
2340
                parent_trees.append(
2273
2341
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2274
2342
            self.set_parent_trees(parent_trees)
2275
2343
            last_rev = parent_trees[0][0]
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
 
2344
        return nb_conflicts
2308
2345
 
2309
2346
    def _write_hashcache_if_dirty(self):
2310
2347
        """Write out the hashcache if it is dirty."""
2580
2617
        """
2581
2618
        return
2582
2619
 
2583
 
    @needs_read_lock
2584
2620
    def _get_rules_searcher(self, default_searcher):
2585
2621
        """See Tree._get_rules_searcher."""
2586
2622
        if self._rules_searcher is None:
2622
2658
 
2623
2659
        In Format2 WorkingTrees we have a single lock for the branch and tree
2624
2660
        so lock_tree_write() degrades to lock_write().
 
2661
 
 
2662
        :return: An object with an unlock method which will release the lock
 
2663
            obtained.
2625
2664
        """
2626
2665
        self.branch.lock_write()
2627
2666
        try:
2628
 
            return self._control_files.lock_write()
 
2667
            self._control_files.lock_write()
 
2668
            return self
2629
2669
        except:
2630
2670
            self.branch.unlock()
2631
2671
            raise
2765
2805
        """Return the format for the working tree object in a_bzrdir."""
2766
2806
        try:
2767
2807
            transport = a_bzrdir.get_workingtree_transport(None)
2768
 
            format_string = transport.get("format").read()
 
2808
            format_string = transport.get_bytes("format")
2769
2809
            return klass._formats[format_string]
2770
2810
        except errors.NoSuchFile:
2771
2811
            raise errors.NoWorkingTree(base=transport.base)