/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: Ian Clatworthy
  • Date: 2009-09-02 16:03:51 UTC
  • mto: (4634.39.1 pdf-chm-docs)
  • mto: This revision was merged to the branch mainline in revision 4689.
  • Revision ID: ian.clatworthy@canonical.com-20090902160351-sxptcz3ttc1aencw
first cut at pdf docs via sphinx

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:
463
458
        return (file_obj, stat_value)
464
459
 
465
460
    def get_file_text(self, file_id, path=None, filtered=True):
466
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
467
 
        try:
468
 
            return my_file.read()
469
 
        finally:
470
 
            my_file.close()
 
461
        return self.get_file(file_id, path=path, filtered=filtered).read()
471
462
 
472
463
    def get_file_byname(self, filename, filtered=True):
473
464
        path = self.abspath(filename)
527
518
 
528
519
        # Now we have the parents of this content
529
520
        annotator = self.branch.repository.texts.get_annotator()
530
 
        text = self.get_file_text(file_id)
 
521
        text = self.get_file(file_id).read()
531
522
        this_key =(file_id, default_revision)
532
523
        annotator.add_special_text(this_key, file_parent_keys, text)
533
524
        annotations = [(key[-1], line)
553
544
        else:
554
545
            parents = [last_rev]
555
546
        try:
556
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
547
            merges_file = self._transport.get('pending-merges')
557
548
        except errors.NoSuchFile:
558
549
            pass
559
550
        else:
560
 
            for l in osutils.split_lines(merges_bytes):
 
551
            for l in merges_file.readlines():
561
552
                revision_id = l.rstrip('\n')
562
553
                parents.append(revision_id)
563
554
        return parents
645
636
 
646
637
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
647
638
        file_id = self.path2id(path)
648
 
        if file_id is None:
649
 
            # For unversioned files on win32, we just assume they are not
650
 
            # executable
651
 
            return False
652
639
        return self._inventory[file_id].executable
653
640
 
654
641
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
909
896
 
910
897
    @needs_write_lock # because merge pulls data into the branch.
911
898
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
912
 
                          merge_type=None, force=False):
 
899
        merge_type=None):
913
900
        """Merge from a branch into this working tree.
914
901
 
915
902
        :param branch: The branch to merge from.
919
906
            branch.last_revision().
920
907
        """
921
908
        from bzrlib.merge import Merger, Merge3Merger
922
 
        merger = Merger(self.branch, this_tree=self)
923
 
        # check that there are no local alterations
924
 
        if not force and self.has_changes():
925
 
            raise errors.UncommittedChanges(self)
926
 
        if to_revision is None:
927
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
928
 
        merger.other_rev_id = to_revision
929
 
        if _mod_revision.is_null(merger.other_rev_id):
930
 
            raise errors.NoCommits(branch)
931
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
932
 
        merger.other_basis = merger.other_rev_id
933
 
        merger.other_tree = self.branch.repository.revision_tree(
934
 
            merger.other_rev_id)
935
 
        merger.other_branch = branch
936
 
        if from_revision is None:
937
 
            merger.find_base()
938
 
        else:
939
 
            merger.set_base_revision(from_revision, branch)
940
 
        if merger.base_rev_id == merger.other_rev_id:
941
 
            raise errors.PointlessMerge
942
 
        merger.backup_files = False
943
 
        if merge_type is None:
944
 
            merger.merge_type = Merge3Merger
945
 
        else:
946
 
            merger.merge_type = merge_type
947
 
        merger.set_interesting_files(None)
948
 
        merger.show_base = False
949
 
        merger.reprocess = False
950
 
        conflicts = merger.do_merge()
951
 
        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()
952
946
        return conflicts
953
947
 
954
948
    @needs_read_lock
1101
1095
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1102
1096
        if tree_transport.base != branch_transport.base:
1103
1097
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1104
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1105
 
                target_branch=new_branch)
 
1098
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1106
1099
        else:
1107
1100
            tree_bzrdir = branch_bzrdir
1108
1101
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1146
1139
        This does not include files that have been deleted in this
1147
1140
        tree. Skips the control directory.
1148
1141
 
1149
 
        :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
1150
1143
        :param from_dir: start from this directory or None for the root
1151
1144
        :param recursive: whether to recurse into subdirectories or not
1152
1145
        """
1606
1599
    @needs_write_lock
1607
1600
    def pull(self, source, overwrite=False, stop_revision=None,
1608
1601
             change_reporter=None, possible_transports=None, local=False):
 
1602
        top_pb = ui.ui_factory.nested_progress_bar()
1609
1603
        source.lock_read()
1610
1604
        try:
 
1605
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1606
            pp.next_phase()
1611
1607
            old_revision_info = self.branch.last_revision_info()
1612
1608
            basis_tree = self.basis_tree()
1613
1609
            count = self.branch.pull(source, overwrite, stop_revision,
1615
1611
                                     local=local)
1616
1612
            new_revision_info = self.branch.last_revision_info()
1617
1613
            if new_revision_info != old_revision_info:
 
1614
                pp.next_phase()
1618
1615
                repository = self.branch.repository
 
1616
                pb = ui.ui_factory.nested_progress_bar()
1619
1617
                basis_tree.lock_read()
1620
1618
                try:
1621
1619
                    new_basis_tree = self.branch.basis_tree()
1624
1622
                                new_basis_tree,
1625
1623
                                basis_tree,
1626
1624
                                this_tree=self,
1627
 
                                pb=None,
 
1625
                                pb=pb,
1628
1626
                                change_reporter=change_reporter)
1629
 
                    basis_root_id = basis_tree.get_root_id()
1630
 
                    new_root_id = new_basis_tree.get_root_id()
1631
 
                    if basis_root_id != new_root_id:
1632
 
                        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())
1633
1630
                finally:
 
1631
                    pb.finished()
1634
1632
                    basis_tree.unlock()
1635
1633
                # TODO - dedup parents list with things merged by pull ?
1636
1634
                # reuse the revisiontree we merged against to set the new
1649
1647
            return count
1650
1648
        finally:
1651
1649
            source.unlock()
 
1650
            top_pb.finished()
1652
1651
 
1653
1652
    @needs_write_lock
1654
1653
    def put_file_bytes_non_atomic(self, file_id, bytes):
1739
1738
        r"""Check whether the filename matches an ignore pattern.
1740
1739
 
1741
1740
        Patterns containing '/' or '\' need to match the whole path;
1742
 
        others match against only the last component.  Patterns starting
1743
 
        with '!' are ignore exceptions.  Exceptions take precedence
1744
 
        over regular patterns and cause the filename to not be ignored.
 
1741
        others match against only the last component.
1745
1742
 
1746
1743
        If the file is ignored, returns the pattern which caused it to
1747
1744
        be ignored, otherwise None.  So this can simply be used as a
1748
1745
        boolean if desired."""
1749
1746
        if getattr(self, '_ignoreglobster', None) is None:
1750
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1747
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1751
1748
        return self._ignoreglobster.match(filename)
1752
1749
 
1753
1750
    def kind(self, file_id):
1803
1800
            raise errors.ObjectNotLocked(self)
1804
1801
 
1805
1802
    def lock_read(self):
1806
 
        """Lock the tree for reading.
1807
 
 
1808
 
        This also locks the branch, and can be unlocked via self.unlock().
1809
 
 
1810
 
        :return: A bzrlib.lock.LogicalLockResult.
1811
 
        """
 
1803
        """See Branch.lock_read, and WorkingTree.unlock."""
1812
1804
        if not self.is_locked():
1813
1805
            self._reset_data()
1814
1806
        self.branch.lock_read()
1815
1807
        try:
1816
 
            self._control_files.lock_read()
1817
 
            return LogicalLockResult(self.unlock)
 
1808
            return self._control_files.lock_read()
1818
1809
        except:
1819
1810
            self.branch.unlock()
1820
1811
            raise
1821
1812
 
1822
1813
    def lock_tree_write(self):
1823
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1824
 
 
1825
 
        :return: A bzrlib.lock.LogicalLockResult.
1826
 
        """
 
1814
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1827
1815
        if not self.is_locked():
1828
1816
            self._reset_data()
1829
1817
        self.branch.lock_read()
1830
1818
        try:
1831
 
            self._control_files.lock_write()
1832
 
            return LogicalLockResult(self.unlock)
 
1819
            return self._control_files.lock_write()
1833
1820
        except:
1834
1821
            self.branch.unlock()
1835
1822
            raise
1836
1823
 
1837
1824
    def lock_write(self):
1838
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1839
 
 
1840
 
        :return: A bzrlib.lock.LogicalLockResult.
1841
 
        """
 
1825
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1842
1826
        if not self.is_locked():
1843
1827
            self._reset_data()
1844
1828
        self.branch.lock_write()
1845
1829
        try:
1846
 
            self._control_files.lock_write()
1847
 
            return LogicalLockResult(self.unlock)
 
1830
            return self._control_files.lock_write()
1848
1831
        except:
1849
1832
            self.branch.unlock()
1850
1833
            raise
1858
1841
    def _reset_data(self):
1859
1842
        """Reset transient data that cannot be revalidated."""
1860
1843
        self._inventory_is_modified = False
1861
 
        f = self._transport.get('inventory')
1862
 
        try:
1863
 
            result = self._deserialize(f)
1864
 
        finally:
1865
 
            f.close()
 
1844
        result = self._deserialize(self._transport.get('inventory'))
1866
1845
        self._set_inventory(result, dirty=False)
1867
1846
 
1868
1847
    @needs_tree_write_lock
1915
1894
            # revision_id is set. We must check for this full string, because a
1916
1895
            # root node id can legitimately look like 'revision_id' but cannot
1917
1896
            # contain a '"'.
1918
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1897
            xml = self.branch.repository.get_inventory_xml(new_revision)
1919
1898
            firstline = xml.split('\n', 1)[0]
1920
1899
            if (not 'revision_id="' in firstline or
1921
1900
                'format="7"' not in firstline):
1944
1923
        # binary.
1945
1924
        if self._inventory_is_modified:
1946
1925
            raise errors.InventoryModified(self)
1947
 
        f = self._transport.get('inventory')
1948
 
        try:
1949
 
            result = self._deserialize(f)
1950
 
        finally:
1951
 
            f.close()
 
1926
        result = self._deserialize(self._transport.get('inventory'))
1952
1927
        self._set_inventory(result, dirty=False)
1953
1928
        return result
1954
1929
 
1969
1944
 
1970
1945
        new_files=set()
1971
1946
        unknown_nested_files=set()
1972
 
        if to_file is None:
1973
 
            to_file = sys.stdout
1974
1947
 
1975
1948
        def recurse_directory_to_add_files(directory):
1976
1949
            # Recurse directory and add all files
1977
1950
            # so we can check if they have changed.
1978
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1951
            for parent_info, file_infos in\
 
1952
                self.walkdirs(directory):
1979
1953
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1980
1954
                    # Is it versioned or ignored?
1981
1955
                    if self.path2id(relpath) or self.is_ignored(relpath):
2016
1990
                            # ... but not ignored
2017
1991
                            has_changed_files = True
2018
1992
                            break
2019
 
                    elif (content_change and (kind[1] is not None) and
2020
 
                            osutils.is_inside_any(files, path[1])):
2021
 
                        # Versioned and changed, but not deleted, and still
2022
 
                        # 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
2023
1995
                        has_changed_files = True
2024
1996
                        break
2025
1997
 
2047
2019
                        new_status = 'I'
2048
2020
                    else:
2049
2021
                        new_status = '?'
2050
 
                    # XXX: Really should be a more abstract reporter interface
2051
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2052
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2022
                    textui.show_status(new_status, self.kind(fid), f,
 
2023
                                       to_file=to_file)
2053
2024
                # Unversion file
2054
2025
                inv_delta.append((f, None, fid, None))
2055
2026
                message = "removed %s" % (f,)
2078
2049
 
2079
2050
    @needs_tree_write_lock
2080
2051
    def revert(self, filenames=None, old_tree=None, backups=True,
2081
 
               pb=None, report_changes=False):
 
2052
               pb=DummyProgress(), report_changes=False):
2082
2053
        from bzrlib.conflicts import resolve
2083
2054
        if filenames == []:
2084
2055
            filenames = None
2206
2177
        """
2207
2178
        raise NotImplementedError(self.unlock)
2208
2179
 
2209
 
    _marker = object()
2210
 
 
2211
 
    def update(self, change_reporter=None, possible_transports=None,
2212
 
               revision=None, old_tip=_marker):
 
2180
    def update(self, change_reporter=None, possible_transports=None):
2213
2181
        """Update a working tree along its branch.
2214
2182
 
2215
2183
        This will update the branch if its bound too, which means we have
2233
2201
        - Merge current state -> basis tree of the master w.r.t. the old tree
2234
2202
          basis.
2235
2203
        - Do a 'normal' merge of the old branch basis if it is relevant.
2236
 
 
2237
 
        :param revision: The target revision to update to. Must be in the
2238
 
            revision history.
2239
 
        :param old_tip: If branch.update() has already been run, the value it
2240
 
            returned (old tip of the branch or None). _marker is used
2241
 
            otherwise.
2242
2204
        """
2243
2205
        if self.branch.get_bound_location() is not None:
2244
2206
            self.lock_write()
2245
 
            update_branch = (old_tip is self._marker)
 
2207
            update_branch = True
2246
2208
        else:
2247
2209
            self.lock_tree_write()
2248
2210
            update_branch = False
2250
2212
            if update_branch:
2251
2213
                old_tip = self.branch.update(possible_transports)
2252
2214
            else:
2253
 
                if old_tip is self._marker:
2254
 
                    old_tip = None
2255
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2215
                old_tip = None
 
2216
            return self._update_tree(old_tip, change_reporter)
2256
2217
        finally:
2257
2218
            self.unlock()
2258
2219
 
2259
2220
    @needs_tree_write_lock
2260
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2221
    def _update_tree(self, old_tip=None, change_reporter=None):
2261
2222
        """Update a tree to the master branch.
2262
2223
 
2263
2224
        :param old_tip: if supplied, the previous tip revision the branch,
2273
2234
        # We MUST save it even if an error occurs, because otherwise the users
2274
2235
        # local work is unreferenced and will appear to have been lost.
2275
2236
        #
2276
 
        nb_conflicts = 0
 
2237
        result = 0
2277
2238
        try:
2278
2239
            last_rev = self.get_parent_ids()[0]
2279
2240
        except IndexError:
2280
2241
            last_rev = _mod_revision.NULL_REVISION
2281
 
        if revision is None:
2282
 
            revision = self.branch.last_revision()
2283
 
 
2284
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2285
 
 
2286
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2287
 
            # the branch we are bound to was updated
2288
 
            # merge those changes in first
2289
 
            base_tree  = self.basis_tree()
2290
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2291
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2292
 
                                             base_tree, this_tree=self,
2293
 
                                             change_reporter=change_reporter)
2294
 
            if nb_conflicts:
2295
 
                self.add_parent_tree((old_tip, other_tree))
2296
 
                trace.note('Rerun update after fixing the conflicts.')
2297
 
                return nb_conflicts
2298
 
 
2299
 
        if last_rev != _mod_revision.ensure_null(revision):
2300
 
            # the working tree is up to date with the branch
2301
 
            # we can merge the specified revision from master
2302
 
            to_tree = self.branch.repository.revision_tree(revision)
2303
 
            to_root_id = to_tree.get_root_id()
2304
 
 
 
2242
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2243
            # merge tree state up to new branch tip.
2305
2244
            basis = self.basis_tree()
2306
2245
            basis.lock_read()
2307
2246
            try:
2308
 
                if (basis.inventory.root is None
2309
 
                    or basis.inventory.root.file_id != to_root_id):
2310
 
                    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())
2311
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)
2312
2257
            finally:
2313
2258
                basis.unlock()
2314
 
 
2315
 
            # determine the branch point
2316
 
            graph = self.branch.repository.get_graph()
2317
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2318
 
                                                last_rev)
2319
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2320
 
 
2321
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2322
 
                                             this_tree=self,
2323
 
                                             change_reporter=change_reporter)
2324
 
            self.set_last_revision(revision)
2325
2259
            # TODO - dedup parents list with things merged by pull ?
2326
2260
            # reuse the tree we've updated to to set the basis:
2327
 
            parent_trees = [(revision, to_tree)]
 
2261
            parent_trees = [(self.branch.last_revision(), to_tree)]
2328
2262
            merges = self.get_parent_ids()[1:]
2329
2263
            # Ideally we ask the tree for the trees here, that way the working
2330
2264
            # tree can decide whether to give us the entire tree or give us a
2334
2268
            for parent in merges:
2335
2269
                parent_trees.append(
2336
2270
                    (parent, self.branch.repository.revision_tree(parent)))
2337
 
            if not _mod_revision.is_null(old_tip):
 
2271
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2338
2272
                parent_trees.append(
2339
2273
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2340
2274
            self.set_parent_trees(parent_trees)
2341
2275
            last_rev = parent_trees[0][0]
2342
 
        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
2343
2308
 
2344
2309
    def _write_hashcache_if_dirty(self):
2345
2310
        """Write out the hashcache if it is dirty."""
2615
2580
        """
2616
2581
        return
2617
2582
 
 
2583
    @needs_read_lock
2618
2584
    def _get_rules_searcher(self, default_searcher):
2619
2585
        """See Tree._get_rules_searcher."""
2620
2586
        if self._rules_searcher is None:
2656
2622
 
2657
2623
        In Format2 WorkingTrees we have a single lock for the branch and tree
2658
2624
        so lock_tree_write() degrades to lock_write().
2659
 
 
2660
 
        :return: An object with an unlock method which will release the lock
2661
 
            obtained.
2662
2625
        """
2663
2626
        self.branch.lock_write()
2664
2627
        try:
2665
 
            self._control_files.lock_write()
2666
 
            return self
 
2628
            return self._control_files.lock_write()
2667
2629
        except:
2668
2630
            self.branch.unlock()
2669
2631
            raise
2803
2765
        """Return the format for the working tree object in a_bzrdir."""
2804
2766
        try:
2805
2767
            transport = a_bzrdir.get_workingtree_transport(None)
2806
 
            format_string = transport.get_bytes("format")
 
2768
            format_string = transport.get("format").read()
2807
2769
            return klass._formats[format_string]
2808
2770
        except errors.NoSuchFile:
2809
2771
            raise errors.NoWorkingTree(base=transport.base)