/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-08-20 09:30:34 UTC
  • mto: This revision was merged to the branch mainline in revision 4633.
  • Revision ID: v.ladeuil+lp@free.fr-20090820093034-64jq23ddxe44tqfb
(vila)(trivial) Fix bzrtools tag used for windows installers

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
618
613
 
619
614
    def get_file_size(self, file_id):
620
615
        """See Tree.get_file_size"""
621
 
        # XXX: this returns the on-disk size; it should probably return the
622
 
        # canonical size
623
616
        try:
624
617
            return os.path.getsize(self.id2abspath(file_id))
625
618
        except OSError, e:
641
634
 
642
635
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
643
636
        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
637
        return self._inventory[file_id].executable
649
638
 
650
639
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
760
749
            raise
761
750
        kind = _mapper(stat_result.st_mode)
762
751
        if kind == 'file':
763
 
            return self._file_content_summary(path, stat_result)
 
752
            size = stat_result.st_size
 
753
            # try for a stat cache lookup
 
754
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
755
            return (kind, size, executable, self._sha_from_stat(
 
756
                path, stat_result))
764
757
        elif kind == 'directory':
765
758
            # perhaps it looks like a plain directory, but it's really a
766
759
            # reference.
773
766
        else:
774
767
            return (kind, None, None, None)
775
768
 
776
 
    def _file_content_summary(self, path, stat_result):
777
 
        size = stat_result.st_size
778
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
779
 
        # try for a stat cache lookup
780
 
        return ('file', size, executable, self._sha_from_stat(
781
 
            path, stat_result))
782
 
 
783
769
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
784
770
        """Common ghost checking functionality from set_parent_*.
785
771
 
905
891
 
906
892
    @needs_write_lock # because merge pulls data into the branch.
907
893
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
908
 
                          merge_type=None, force=False):
 
894
        merge_type=None):
909
895
        """Merge from a branch into this working tree.
910
896
 
911
897
        :param branch: The branch to merge from.
915
901
            branch.last_revision().
916
902
        """
917
903
        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()
 
904
        pb = ui.ui_factory.nested_progress_bar()
 
905
        try:
 
906
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
907
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
908
            merger.pp.next_phase()
 
909
            # check that there are no
 
910
            # local alterations
 
911
            merger.check_basis(check_clean=True, require_commits=False)
 
912
            if to_revision is None:
 
913
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
914
            merger.other_rev_id = to_revision
 
915
            if _mod_revision.is_null(merger.other_rev_id):
 
916
                raise errors.NoCommits(branch)
 
917
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
918
            merger.other_basis = merger.other_rev_id
 
919
            merger.other_tree = self.branch.repository.revision_tree(
 
920
                merger.other_rev_id)
 
921
            merger.other_branch = branch
 
922
            merger.pp.next_phase()
 
923
            if from_revision is None:
 
924
                merger.find_base()
 
925
            else:
 
926
                merger.set_base_revision(from_revision, branch)
 
927
            if merger.base_rev_id == merger.other_rev_id:
 
928
                raise errors.PointlessMerge
 
929
            merger.backup_files = False
 
930
            if merge_type is None:
 
931
                merger.merge_type = Merge3Merger
 
932
            else:
 
933
                merger.merge_type = merge_type
 
934
            merger.set_interesting_files(None)
 
935
            merger.show_base = False
 
936
            merger.reprocess = False
 
937
            conflicts = merger.do_merge()
 
938
            merger.set_pending()
 
939
        finally:
 
940
            pb.finished()
948
941
        return conflicts
949
942
 
950
943
    @needs_read_lock
1097
1090
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1091
        if tree_transport.base != branch_transport.base:
1099
1092
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1093
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1094
        else:
1103
1095
            tree_bzrdir = branch_bzrdir
1104
1096
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1134
        This does not include files that have been deleted in this
1143
1135
        tree. Skips the control directory.
1144
1136
 
1145
 
        :param include_root: if True, return an entry for the root
 
1137
        :param include_root: if True, do not return an entry for the root
1146
1138
        :param from_dir: start from this directory or None for the root
1147
1139
        :param recursive: whether to recurse into subdirectories or not
1148
1140
        """
1602
1594
    @needs_write_lock
1603
1595
    def pull(self, source, overwrite=False, stop_revision=None,
1604
1596
             change_reporter=None, possible_transports=None, local=False):
 
1597
        top_pb = ui.ui_factory.nested_progress_bar()
1605
1598
        source.lock_read()
1606
1599
        try:
 
1600
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1601
            pp.next_phase()
1607
1602
            old_revision_info = self.branch.last_revision_info()
1608
1603
            basis_tree = self.basis_tree()
1609
1604
            count = self.branch.pull(source, overwrite, stop_revision,
1611
1606
                                     local=local)
1612
1607
            new_revision_info = self.branch.last_revision_info()
1613
1608
            if new_revision_info != old_revision_info:
 
1609
                pp.next_phase()
1614
1610
                repository = self.branch.repository
 
1611
                pb = ui.ui_factory.nested_progress_bar()
1615
1612
                basis_tree.lock_read()
1616
1613
                try:
1617
1614
                    new_basis_tree = self.branch.basis_tree()
1620
1617
                                new_basis_tree,
1621
1618
                                basis_tree,
1622
1619
                                this_tree=self,
1623
 
                                pb=None,
 
1620
                                pb=pb,
1624
1621
                                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)
 
1622
                    if (basis_tree.inventory.root is None and
 
1623
                        new_basis_tree.inventory.root is not None):
 
1624
                        self.set_root_id(new_basis_tree.get_root_id())
1629
1625
                finally:
 
1626
                    pb.finished()
1630
1627
                    basis_tree.unlock()
1631
1628
                # TODO - dedup parents list with things merged by pull ?
1632
1629
                # reuse the revisiontree we merged against to set the new
1645
1642
            return count
1646
1643
        finally:
1647
1644
            source.unlock()
 
1645
            top_pb.finished()
1648
1646
 
1649
1647
    @needs_write_lock
1650
1648
    def put_file_bytes_non_atomic(self, file_id, bytes):
1735
1733
        r"""Check whether the filename matches an ignore pattern.
1736
1734
 
1737
1735
        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.
 
1736
        others match against only the last component.
1741
1737
 
1742
1738
        If the file is ignored, returns the pattern which caused it to
1743
1739
        be ignored, otherwise None.  So this can simply be used as a
1744
1740
        boolean if desired."""
1745
1741
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1742
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1743
        return self._ignoreglobster.match(filename)
1748
1744
 
1749
1745
    def kind(self, file_id):
1799
1795
            raise errors.ObjectNotLocked(self)
1800
1796
 
1801
1797
    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
 
        """
 
1798
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1799
        if not self.is_locked():
1809
1800
            self._reset_data()
1810
1801
        self.branch.lock_read()
1811
1802
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1803
            return self._control_files.lock_read()
1814
1804
        except:
1815
1805
            self.branch.unlock()
1816
1806
            raise
1817
1807
 
1818
1808
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1809
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1810
        if not self.is_locked():
1824
1811
            self._reset_data()
1825
1812
        self.branch.lock_read()
1826
1813
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1814
            return self._control_files.lock_write()
1829
1815
        except:
1830
1816
            self.branch.unlock()
1831
1817
            raise
1832
1818
 
1833
1819
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1820
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1821
        if not self.is_locked():
1839
1822
            self._reset_data()
1840
1823
        self.branch.lock_write()
1841
1824
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1825
            return self._control_files.lock_write()
1844
1826
        except:
1845
1827
            self.branch.unlock()
1846
1828
            raise
1854
1836
    def _reset_data(self):
1855
1837
        """Reset transient data that cannot be revalidated."""
1856
1838
        self._inventory_is_modified = False
1857
 
        f = self._transport.get('inventory')
1858
 
        try:
1859
 
            result = self._deserialize(f)
1860
 
        finally:
1861
 
            f.close()
 
1839
        result = self._deserialize(self._transport.get('inventory'))
1862
1840
        self._set_inventory(result, dirty=False)
1863
1841
 
1864
1842
    @needs_tree_write_lock
1911
1889
            # revision_id is set. We must check for this full string, because a
1912
1890
            # root node id can legitimately look like 'revision_id' but cannot
1913
1891
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1892
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1893
            firstline = xml.split('\n', 1)[0]
1916
1894
            if (not 'revision_id="' in firstline or
1917
1895
                'format="7"' not in firstline):
1940
1918
        # binary.
1941
1919
        if self._inventory_is_modified:
1942
1920
            raise errors.InventoryModified(self)
1943
 
        f = self._transport.get('inventory')
1944
 
        try:
1945
 
            result = self._deserialize(f)
1946
 
        finally:
1947
 
            f.close()
 
1921
        result = self._deserialize(self._transport.get('inventory'))
1948
1922
        self._set_inventory(result, dirty=False)
1949
1923
        return result
1950
1924
 
1965
1939
 
1966
1940
        new_files=set()
1967
1941
        unknown_nested_files=set()
1968
 
        if to_file is None:
1969
 
            to_file = sys.stdout
1970
1942
 
1971
1943
        def recurse_directory_to_add_files(directory):
1972
1944
            # Recurse directory and add all files
1973
1945
            # so we can check if they have changed.
1974
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1946
            for parent_info, file_infos in\
 
1947
                self.walkdirs(directory):
1975
1948
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1976
1949
                    # Is it versioned or ignored?
1977
1950
                    if self.path2id(relpath) or self.is_ignored(relpath):
2012
1985
                            # ... but not ignored
2013
1986
                            has_changed_files = True
2014
1987
                            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.
 
1988
                    elif content_change and (kind[1] is not None):
 
1989
                        # Versioned and changed, but not deleted
2019
1990
                        has_changed_files = True
2020
1991
                        break
2021
1992
 
2043
2014
                        new_status = 'I'
2044
2015
                    else:
2045
2016
                        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')
 
2017
                    textui.show_status(new_status, self.kind(fid), f,
 
2018
                                       to_file=to_file)
2049
2019
                # Unversion file
2050
2020
                inv_delta.append((f, None, fid, None))
2051
2021
                message = "removed %s" % (f,)
2074
2044
 
2075
2045
    @needs_tree_write_lock
2076
2046
    def revert(self, filenames=None, old_tree=None, backups=True,
2077
 
               pb=None, report_changes=False):
 
2047
               pb=DummyProgress(), report_changes=False):
2078
2048
        from bzrlib.conflicts import resolve
2079
2049
        if filenames == []:
2080
2050
            filenames = None
2202
2172
        """
2203
2173
        raise NotImplementedError(self.unlock)
2204
2174
 
2205
 
    _marker = object()
2206
 
 
2207
 
    def update(self, change_reporter=None, possible_transports=None,
2208
 
               revision=None, old_tip=_marker):
 
2175
    def update(self, change_reporter=None, possible_transports=None):
2209
2176
        """Update a working tree along its branch.
2210
2177
 
2211
2178
        This will update the branch if its bound too, which means we have
2229
2196
        - Merge current state -> basis tree of the master w.r.t. the old tree
2230
2197
          basis.
2231
2198
        - 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
2199
        """
2239
2200
        if self.branch.get_bound_location() is not None:
2240
2201
            self.lock_write()
2241
 
            update_branch = (old_tip is self._marker)
 
2202
            update_branch = True
2242
2203
        else:
2243
2204
            self.lock_tree_write()
2244
2205
            update_branch = False
2246
2207
            if update_branch:
2247
2208
                old_tip = self.branch.update(possible_transports)
2248
2209
            else:
2249
 
                if old_tip is self._marker:
2250
 
                    old_tip = None
2251
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2210
                old_tip = None
 
2211
            return self._update_tree(old_tip, change_reporter)
2252
2212
        finally:
2253
2213
            self.unlock()
2254
2214
 
2255
2215
    @needs_tree_write_lock
2256
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2216
    def _update_tree(self, old_tip=None, change_reporter=None):
2257
2217
        """Update a tree to the master branch.
2258
2218
 
2259
2219
        :param old_tip: if supplied, the previous tip revision the branch,
2269
2229
        # We MUST save it even if an error occurs, because otherwise the users
2270
2230
        # local work is unreferenced and will appear to have been lost.
2271
2231
        #
2272
 
        nb_conflicts = 0
 
2232
        result = 0
2273
2233
        try:
2274
2234
            last_rev = self.get_parent_ids()[0]
2275
2235
        except IndexError:
2276
2236
            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
 
 
 
2237
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2238
            # merge tree state up to new branch tip.
2301
2239
            basis = self.basis_tree()
2302
2240
            basis.lock_read()
2303
2241
            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)
 
2242
                to_tree = self.branch.basis_tree()
 
2243
                if basis.inventory.root is None:
 
2244
                    self.set_root_id(to_tree.get_root_id())
2307
2245
                    self.flush()
 
2246
                result += merge.merge_inner(
 
2247
                                      self.branch,
 
2248
                                      to_tree,
 
2249
                                      basis,
 
2250
                                      this_tree=self,
 
2251
                                      change_reporter=change_reporter)
2308
2252
            finally:
2309
2253
                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
2254
            # TODO - dedup parents list with things merged by pull ?
2322
2255
            # reuse the tree we've updated to to set the basis:
2323
 
            parent_trees = [(revision, to_tree)]
 
2256
            parent_trees = [(self.branch.last_revision(), to_tree)]
2324
2257
            merges = self.get_parent_ids()[1:]
2325
2258
            # Ideally we ask the tree for the trees here, that way the working
2326
2259
            # tree can decide whether to give us the entire tree or give us a
2330
2263
            for parent in merges:
2331
2264
                parent_trees.append(
2332
2265
                    (parent, self.branch.repository.revision_tree(parent)))
2333
 
            if not _mod_revision.is_null(old_tip):
 
2266
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2334
2267
                parent_trees.append(
2335
2268
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2336
2269
            self.set_parent_trees(parent_trees)
2337
2270
            last_rev = parent_trees[0][0]
2338
 
        return nb_conflicts
 
2271
        else:
 
2272
            # the working tree had the same last-revision as the master
 
2273
            # branch did. We may still have pivot local work from the local
 
2274
            # branch into old_tip:
 
2275
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2276
                self.add_parent_tree_id(old_tip)
 
2277
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2278
            and old_tip != last_rev):
 
2279
            # our last revision was not the prior branch last revision
 
2280
            # and we have converted that last revision to a pending merge.
 
2281
            # base is somewhere between the branch tip now
 
2282
            # and the now pending merge
 
2283
 
 
2284
            # Since we just modified the working tree and inventory, flush out
 
2285
            # the current state, before we modify it again.
 
2286
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2287
            #       requires it only because TreeTransform directly munges the
 
2288
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2289
            #       should be able to remove this extra flush.
 
2290
            self.flush()
 
2291
            graph = self.branch.repository.get_graph()
 
2292
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2293
                                                old_tip)
 
2294
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2295
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2296
            result += merge.merge_inner(
 
2297
                                  self.branch,
 
2298
                                  other_tree,
 
2299
                                  base_tree,
 
2300
                                  this_tree=self,
 
2301
                                  change_reporter=change_reporter)
 
2302
        return result
2339
2303
 
2340
2304
    def _write_hashcache_if_dirty(self):
2341
2305
        """Write out the hashcache if it is dirty."""
2611
2575
        """
2612
2576
        return
2613
2577
 
 
2578
    @needs_read_lock
2614
2579
    def _get_rules_searcher(self, default_searcher):
2615
2580
        """See Tree._get_rules_searcher."""
2616
2581
        if self._rules_searcher is None:
2652
2617
 
2653
2618
        In Format2 WorkingTrees we have a single lock for the branch and tree
2654
2619
        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
2620
        """
2659
2621
        self.branch.lock_write()
2660
2622
        try:
2661
 
            self._control_files.lock_write()
2662
 
            return self
 
2623
            return self._control_files.lock_write()
2663
2624
        except:
2664
2625
            self.branch.unlock()
2665
2626
            raise
2799
2760
        """Return the format for the working tree object in a_bzrdir."""
2800
2761
        try:
2801
2762
            transport = a_bzrdir.get_workingtree_transport(None)
2802
 
            format_string = transport.get_bytes("format")
 
2763
            format_string = transport.get("format").read()
2803
2764
            return klass._formats[format_string]
2804
2765
        except errors.NoSuchFile:
2805
2766
            raise errors.NoWorkingTree(base=transport.base)