← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2009-09-11 06:36:50 UTC
  • mto: This revision was merged to the branch mainline in revision 4688.
  • Revision ID: mbp@sourcefrog.net-20090911063650-yvb522sbe6k0i62r
Only mutter extension load errors when they occur, and record for later

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,
95
102
from bzrlib.filters import filtered_input_file
96
103
from bzrlib.trace import mutter, note
97
104
from bzrlib.transport.local import LocalTransport
 
105
from bzrlib.progress import DummyProgress, ProgressPhase
98
106
from bzrlib.revision import CURRENT_REVISION
99
107
from bzrlib.rio import RioReader, rio_file, Stanza
100
108
from bzrlib.symbol_versioning import (
104
112
 
105
113
 
106
114
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
 
# TODO: Modifying the conflict objects or their type is currently nearly
108
 
# impossible as there is no clear relationship between the working tree format
109
 
# and the conflict list file format.
110
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
116
 
112
117
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
172
        return ''
168
173
 
169
174
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
175
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
176
    """Working copy tree.
173
177
 
174
178
    The inventory is held in the `Branch` working-inventory, and the
247
251
        self._rules_searcher = None
248
252
        self.views = self._make_views()
249
253
 
250
 
    @property
251
 
    def user_transport(self):
252
 
        return self.bzrdir.user_transport
253
 
 
254
 
    @property
255
 
    def control_transport(self):
256
 
        return self._transport
257
 
 
258
254
    def _detect_case_handling(self):
259
255
        wt_trans = self.bzrdir.get_workingtree_transport(None)
260
256
        try:
285
281
        self._control_files.break_lock()
286
282
        self.branch.break_lock()
287
283
 
288
 
    def _get_check_refs(self):
289
 
        """Return the references needed to perform a check of this tree.
290
 
        
291
 
        The default implementation returns no refs, and is only suitable for
292
 
        trees that have no local caching and can commit on ghosts at any time.
293
 
 
294
 
        :seealso: bzrlib.check for details about check_refs.
295
 
        """
296
 
        return []
297
 
 
298
284
    def requires_rich_root(self):
299
285
        return self._format.requires_rich_root
300
286
 
548
534
        else:
549
535
            parents = [last_rev]
550
536
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
537
            merges_file = self._transport.get('pending-merges')
552
538
        except errors.NoSuchFile:
553
539
            pass
554
540
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
541
            for l in merges_file.readlines():
556
542
                revision_id = l.rstrip('\n')
557
543
                parents.append(revision_id)
558
544
        return parents
617
603
 
618
604
    def get_file_size(self, file_id):
619
605
        """See Tree.get_file_size"""
620
 
        # XXX: this returns the on-disk size; it should probably return the
621
 
        # canonical size
622
606
        try:
623
607
            return os.path.getsize(self.id2abspath(file_id))
624
608
        except OSError, e:
640
624
 
641
625
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
626
        file_id = self.path2id(path)
643
 
        if file_id is None:
644
 
            # For unversioned files on win32, we just assume they are not
645
 
            # executable
646
 
            return False
647
627
        return self._inventory[file_id].executable
648
628
 
649
629
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
759
739
            raise
760
740
        kind = _mapper(stat_result.st_mode)
761
741
        if kind == 'file':
762
 
            return self._file_content_summary(path, stat_result)
 
742
            size = stat_result.st_size
 
743
            # try for a stat cache lookup
 
744
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
745
            return (kind, size, executable, self._sha_from_stat(
 
746
                path, stat_result))
763
747
        elif kind == 'directory':
764
748
            # perhaps it looks like a plain directory, but it's really a
765
749
            # reference.
772
756
        else:
773
757
            return (kind, None, None, None)
774
758
 
775
 
    def _file_content_summary(self, path, stat_result):
776
 
        size = stat_result.st_size
777
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
778
 
        # try for a stat cache lookup
779
 
        return ('file', size, executable, self._sha_from_stat(
780
 
            path, stat_result))
781
 
 
782
759
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
760
        """Common ghost checking functionality from set_parent_*.
784
761
 
904
881
 
905
882
    @needs_write_lock # because merge pulls data into the branch.
906
883
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
884
        merge_type=None):
908
885
        """Merge from a branch into this working tree.
909
886
 
910
887
        :param branch: The branch to merge from.
914
891
            branch.last_revision().
915
892
        """
916
893
        from bzrlib.merge import Merger, Merge3Merger
917
 
        merger = Merger(self.branch, this_tree=self)
918
 
        # check that there are no local alterations
919
 
        if not force and self.has_changes():
920
 
            raise errors.UncommittedChanges(self)
921
 
        if to_revision is None:
922
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
923
 
        merger.other_rev_id = to_revision
924
 
        if _mod_revision.is_null(merger.other_rev_id):
925
 
            raise errors.NoCommits(branch)
926
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
 
        merger.other_basis = merger.other_rev_id
928
 
        merger.other_tree = self.branch.repository.revision_tree(
929
 
            merger.other_rev_id)
930
 
        merger.other_branch = branch
931
 
        if from_revision is None:
932
 
            merger.find_base()
933
 
        else:
934
 
            merger.set_base_revision(from_revision, branch)
935
 
        if merger.base_rev_id == merger.other_rev_id:
936
 
            raise errors.PointlessMerge
937
 
        merger.backup_files = False
938
 
        if merge_type is None:
939
 
            merger.merge_type = Merge3Merger
940
 
        else:
941
 
            merger.merge_type = merge_type
942
 
        merger.set_interesting_files(None)
943
 
        merger.show_base = False
944
 
        merger.reprocess = False
945
 
        conflicts = merger.do_merge()
946
 
        merger.set_pending()
 
894
        pb = ui.ui_factory.nested_progress_bar()
 
895
        try:
 
896
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
897
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
898
            merger.pp.next_phase()
 
899
            # check that there are no
 
900
            # local alterations
 
901
            merger.check_basis(check_clean=True, require_commits=False)
 
902
            if to_revision is None:
 
903
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
904
            merger.other_rev_id = to_revision
 
905
            if _mod_revision.is_null(merger.other_rev_id):
 
906
                raise errors.NoCommits(branch)
 
907
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
908
            merger.other_basis = merger.other_rev_id
 
909
            merger.other_tree = self.branch.repository.revision_tree(
 
910
                merger.other_rev_id)
 
911
            merger.other_branch = branch
 
912
            merger.pp.next_phase()
 
913
            if from_revision is None:
 
914
                merger.find_base()
 
915
            else:
 
916
                merger.set_base_revision(from_revision, branch)
 
917
            if merger.base_rev_id == merger.other_rev_id:
 
918
                raise errors.PointlessMerge
 
919
            merger.backup_files = False
 
920
            if merge_type is None:
 
921
                merger.merge_type = Merge3Merger
 
922
            else:
 
923
                merger.merge_type = merge_type
 
924
            merger.set_interesting_files(None)
 
925
            merger.show_base = False
 
926
            merger.reprocess = False
 
927
            conflicts = merger.do_merge()
 
928
            merger.set_pending()
 
929
        finally:
 
930
            pb.finished()
947
931
        return conflicts
948
932
 
949
933
    @needs_read_lock
1096
1080
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1081
        if tree_transport.base != branch_transport.base:
1098
1082
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1083
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1084
        else:
1102
1085
            tree_bzrdir = branch_bzrdir
1103
1086
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1124
        This does not include files that have been deleted in this
1142
1125
        tree. Skips the control directory.
1143
1126
 
1144
 
        :param include_root: if True, return an entry for the root
 
1127
        :param include_root: if True, do not return an entry for the root
1145
1128
        :param from_dir: start from this directory or None for the root
1146
1129
        :param recursive: whether to recurse into subdirectories or not
1147
1130
        """
1601
1584
    @needs_write_lock
1602
1585
    def pull(self, source, overwrite=False, stop_revision=None,
1603
1586
             change_reporter=None, possible_transports=None, local=False):
 
1587
        top_pb = ui.ui_factory.nested_progress_bar()
1604
1588
        source.lock_read()
1605
1589
        try:
 
1590
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1591
            pp.next_phase()
1606
1592
            old_revision_info = self.branch.last_revision_info()
1607
1593
            basis_tree = self.basis_tree()
1608
1594
            count = self.branch.pull(source, overwrite, stop_revision,
1610
1596
                                     local=local)
1611
1597
            new_revision_info = self.branch.last_revision_info()
1612
1598
            if new_revision_info != old_revision_info:
 
1599
                pp.next_phase()
1613
1600
                repository = self.branch.repository
 
1601
                pb = ui.ui_factory.nested_progress_bar()
1614
1602
                basis_tree.lock_read()
1615
1603
                try:
1616
1604
                    new_basis_tree = self.branch.basis_tree()
1619
1607
                                new_basis_tree,
1620
1608
                                basis_tree,
1621
1609
                                this_tree=self,
1622
 
                                pb=None,
 
1610
                                pb=pb,
1623
1611
                                change_reporter=change_reporter)
1624
 
                    basis_root_id = basis_tree.get_root_id()
1625
 
                    new_root_id = new_basis_tree.get_root_id()
1626
 
                    if basis_root_id != new_root_id:
1627
 
                        self.set_root_id(new_root_id)
 
1612
                    if (basis_tree.inventory.root is None and
 
1613
                        new_basis_tree.inventory.root is not None):
 
1614
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1615
                finally:
 
1616
                    pb.finished()
1629
1617
                    basis_tree.unlock()
1630
1618
                # TODO - dedup parents list with things merged by pull ?
1631
1619
                # reuse the revisiontree we merged against to set the new
1644
1632
            return count
1645
1633
        finally:
1646
1634
            source.unlock()
 
1635
            top_pb.finished()
1647
1636
 
1648
1637
    @needs_write_lock
1649
1638
    def put_file_bytes_non_atomic(self, file_id, bytes):
1734
1723
        r"""Check whether the filename matches an ignore pattern.
1735
1724
 
1736
1725
        Patterns containing '/' or '\' need to match the whole path;
1737
 
        others match against only the last component.  Patterns starting
1738
 
        with '!' are ignore exceptions.  Exceptions take precedence
1739
 
        over regular patterns and cause the filename to not be ignored.
 
1726
        others match against only the last component.
1740
1727
 
1741
1728
        If the file is ignored, returns the pattern which caused it to
1742
1729
        be ignored, otherwise None.  So this can simply be used as a
1743
1730
        boolean if desired."""
1744
1731
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1732
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1733
        return self._ignoreglobster.match(filename)
1747
1734
 
1748
1735
    def kind(self, file_id):
1798
1785
            raise errors.ObjectNotLocked(self)
1799
1786
 
1800
1787
    def lock_read(self):
1801
 
        """Lock the tree for reading.
1802
 
 
1803
 
        This also locks the branch, and can be unlocked via self.unlock().
1804
 
 
1805
 
        :return: An object with an unlock method which will release the lock
1806
 
            obtained.
1807
 
        """
 
1788
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1789
        if not self.is_locked():
1809
1790
            self._reset_data()
1810
1791
        self.branch.lock_read()
1811
1792
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return self
 
1793
            return self._control_files.lock_read()
1814
1794
        except:
1815
1795
            self.branch.unlock()
1816
1796
            raise
1817
1797
 
1818
1798
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: An object with an unlock method which will release the lock
1822
 
            obtained.
1823
 
        """
 
1799
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1824
1800
        if not self.is_locked():
1825
1801
            self._reset_data()
1826
1802
        self.branch.lock_read()
1827
1803
        try:
1828
 
            self._control_files.lock_write()
1829
 
            return self
 
1804
            return self._control_files.lock_write()
1830
1805
        except:
1831
1806
            self.branch.unlock()
1832
1807
            raise
1833
1808
 
1834
1809
    def lock_write(self):
1835
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1836
 
 
1837
 
        :return: An object with an unlock method which will release the lock
1838
 
            obtained.
1839
 
        """
 
1810
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1811
        if not self.is_locked():
1841
1812
            self._reset_data()
1842
1813
        self.branch.lock_write()
1843
1814
        try:
1844
 
            self._control_files.lock_write()
1845
 
            return self
 
1815
            return self._control_files.lock_write()
1846
1816
        except:
1847
1817
            self.branch.unlock()
1848
1818
            raise
1856
1826
    def _reset_data(self):
1857
1827
        """Reset transient data that cannot be revalidated."""
1858
1828
        self._inventory_is_modified = False
1859
 
        f = self._transport.get('inventory')
1860
 
        try:
1861
 
            result = self._deserialize(f)
1862
 
        finally:
1863
 
            f.close()
 
1829
        result = self._deserialize(self._transport.get('inventory'))
1864
1830
        self._set_inventory(result, dirty=False)
1865
1831
 
1866
1832
    @needs_tree_write_lock
1913
1879
            # revision_id is set. We must check for this full string, because a
1914
1880
            # root node id can legitimately look like 'revision_id' but cannot
1915
1881
            # contain a '"'.
1916
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1882
            xml = self.branch.repository.get_inventory_xml(new_revision)
1917
1883
            firstline = xml.split('\n', 1)[0]
1918
1884
            if (not 'revision_id="' in firstline or
1919
1885
                'format="7"' not in firstline):
1920
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1921
 
                    xml, new_revision)
 
1886
                inv = self.branch.repository.deserialise_inventory(
 
1887
                    new_revision, xml)
1922
1888
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1923
1889
            self._write_basis_inventory(xml)
1924
1890
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1942
1908
        # binary.
1943
1909
        if self._inventory_is_modified:
1944
1910
            raise errors.InventoryModified(self)
1945
 
        f = self._transport.get('inventory')
1946
 
        try:
1947
 
            result = self._deserialize(f)
1948
 
        finally:
1949
 
            f.close()
 
1911
        result = self._deserialize(self._transport.get('inventory'))
1950
1912
        self._set_inventory(result, dirty=False)
1951
1913
        return result
1952
1914
 
1967
1929
 
1968
1930
        new_files=set()
1969
1931
        unknown_nested_files=set()
1970
 
        if to_file is None:
1971
 
            to_file = sys.stdout
1972
1932
 
1973
1933
        def recurse_directory_to_add_files(directory):
1974
1934
            # Recurse directory and add all files
2044
2004
                        new_status = 'I'
2045
2005
                    else:
2046
2006
                        new_status = '?'
2047
 
                    # XXX: Really should be a more abstract reporter interface
2048
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2049
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2007
                    textui.show_status(new_status, self.kind(fid), f,
 
2008
                                       to_file=to_file)
2050
2009
                # Unversion file
2051
2010
                inv_delta.append((f, None, fid, None))
2052
2011
                message = "removed %s" % (f,)
2075
2034
 
2076
2035
    @needs_tree_write_lock
2077
2036
    def revert(self, filenames=None, old_tree=None, backups=True,
2078
 
               pb=None, report_changes=False):
 
2037
               pb=DummyProgress(), report_changes=False):
2079
2038
        from bzrlib.conflicts import resolve
2080
2039
        if filenames == []:
2081
2040
            filenames = None
2203
2162
        """
2204
2163
        raise NotImplementedError(self.unlock)
2205
2164
 
2206
 
    _marker = object()
2207
 
 
2208
 
    def update(self, change_reporter=None, possible_transports=None,
2209
 
               revision=None, old_tip=_marker):
 
2165
    def update(self, change_reporter=None, possible_transports=None):
2210
2166
        """Update a working tree along its branch.
2211
2167
 
2212
2168
        This will update the branch if its bound too, which means we have
2230
2186
        - Merge current state -> basis tree of the master w.r.t. the old tree
2231
2187
          basis.
2232
2188
        - Do a 'normal' merge of the old branch basis if it is relevant.
2233
 
 
2234
 
        :param revision: The target revision to update to. Must be in the
2235
 
            revision history.
2236
 
        :param old_tip: If branch.update() has already been run, the value it
2237
 
            returned (old tip of the branch or None). _marker is used
2238
 
            otherwise.
2239
2189
        """
2240
2190
        if self.branch.get_bound_location() is not None:
2241
2191
            self.lock_write()
2242
 
            update_branch = (old_tip is self._marker)
 
2192
            update_branch = True
2243
2193
        else:
2244
2194
            self.lock_tree_write()
2245
2195
            update_branch = False
2247
2197
            if update_branch:
2248
2198
                old_tip = self.branch.update(possible_transports)
2249
2199
            else:
2250
 
                if old_tip is self._marker:
2251
 
                    old_tip = None
2252
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2200
                old_tip = None
 
2201
            return self._update_tree(old_tip, change_reporter)
2253
2202
        finally:
2254
2203
            self.unlock()
2255
2204
 
2256
2205
    @needs_tree_write_lock
2257
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2206
    def _update_tree(self, old_tip=None, change_reporter=None):
2258
2207
        """Update a tree to the master branch.
2259
2208
 
2260
2209
        :param old_tip: if supplied, the previous tip revision the branch,
2270
2219
        # We MUST save it even if an error occurs, because otherwise the users
2271
2220
        # local work is unreferenced and will appear to have been lost.
2272
2221
        #
2273
 
        nb_conflicts = 0
 
2222
        result = 0
2274
2223
        try:
2275
2224
            last_rev = self.get_parent_ids()[0]
2276
2225
        except IndexError:
2277
2226
            last_rev = _mod_revision.NULL_REVISION
2278
 
        if revision is None:
2279
 
            revision = self.branch.last_revision()
2280
 
 
2281
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2282
 
 
2283
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2284
 
            # the branch we are bound to was updated
2285
 
            # merge those changes in first
2286
 
            base_tree  = self.basis_tree()
2287
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2288
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2289
 
                                             base_tree, this_tree=self,
2290
 
                                             change_reporter=change_reporter)
2291
 
            if nb_conflicts:
2292
 
                self.add_parent_tree((old_tip, other_tree))
2293
 
                trace.note('Rerun update after fixing the conflicts.')
2294
 
                return nb_conflicts
2295
 
 
2296
 
        if last_rev != _mod_revision.ensure_null(revision):
2297
 
            # the working tree is up to date with the branch
2298
 
            # we can merge the specified revision from master
2299
 
            to_tree = self.branch.repository.revision_tree(revision)
2300
 
            to_root_id = to_tree.get_root_id()
2301
 
 
 
2227
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2228
            # merge tree state up to new branch tip.
2302
2229
            basis = self.basis_tree()
2303
2230
            basis.lock_read()
2304
2231
            try:
2305
 
                if (basis.inventory.root is None
2306
 
                    or basis.inventory.root.file_id != to_root_id):
2307
 
                    self.set_root_id(to_root_id)
 
2232
                to_tree = self.branch.basis_tree()
 
2233
                if basis.inventory.root is None:
 
2234
                    self.set_root_id(to_tree.get_root_id())
2308
2235
                    self.flush()
 
2236
                result += merge.merge_inner(
 
2237
                                      self.branch,
 
2238
                                      to_tree,
 
2239
                                      basis,
 
2240
                                      this_tree=self,
 
2241
                                      change_reporter=change_reporter)
2309
2242
            finally:
2310
2243
                basis.unlock()
2311
 
 
2312
 
            # determine the branch point
2313
 
            graph = self.branch.repository.get_graph()
2314
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2315
 
                                                last_rev)
2316
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
 
 
2318
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2319
 
                                             this_tree=self,
2320
 
                                             change_reporter=change_reporter)
2321
 
            self.set_last_revision(revision)
2322
2244
            # TODO - dedup parents list with things merged by pull ?
2323
2245
            # reuse the tree we've updated to to set the basis:
2324
 
            parent_trees = [(revision, to_tree)]
 
2246
            parent_trees = [(self.branch.last_revision(), to_tree)]
2325
2247
            merges = self.get_parent_ids()[1:]
2326
2248
            # Ideally we ask the tree for the trees here, that way the working
2327
2249
            # tree can decide whether to give us the entire tree or give us a
2331
2253
            for parent in merges:
2332
2254
                parent_trees.append(
2333
2255
                    (parent, self.branch.repository.revision_tree(parent)))
2334
 
            if not _mod_revision.is_null(old_tip):
 
2256
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2335
2257
                parent_trees.append(
2336
2258
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2337
2259
            self.set_parent_trees(parent_trees)
2338
2260
            last_rev = parent_trees[0][0]
2339
 
        return nb_conflicts
 
2261
        else:
 
2262
            # the working tree had the same last-revision as the master
 
2263
            # branch did. We may still have pivot local work from the local
 
2264
            # branch into old_tip:
 
2265
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2266
                self.add_parent_tree_id(old_tip)
 
2267
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2268
            and old_tip != last_rev):
 
2269
            # our last revision was not the prior branch last revision
 
2270
            # and we have converted that last revision to a pending merge.
 
2271
            # base is somewhere between the branch tip now
 
2272
            # and the now pending merge
 
2273
 
 
2274
            # Since we just modified the working tree and inventory, flush out
 
2275
            # the current state, before we modify it again.
 
2276
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2277
            #       requires it only because TreeTransform directly munges the
 
2278
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2279
            #       should be able to remove this extra flush.
 
2280
            self.flush()
 
2281
            graph = self.branch.repository.get_graph()
 
2282
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2283
                                                old_tip)
 
2284
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2285
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2286
            result += merge.merge_inner(
 
2287
                                  self.branch,
 
2288
                                  other_tree,
 
2289
                                  base_tree,
 
2290
                                  this_tree=self,
 
2291
                                  change_reporter=change_reporter)
 
2292
        return result
2340
2293
 
2341
2294
    def _write_hashcache_if_dirty(self):
2342
2295
        """Write out the hashcache if it is dirty."""
2583
2536
        return un_resolved, resolved
2584
2537
 
2585
2538
    @needs_read_lock
2586
 
    def _check(self, references):
2587
 
        """Check the tree for consistency.
2588
 
 
2589
 
        :param references: A dict with keys matching the items returned by
2590
 
            self._get_check_refs(), and values from looking those keys up in
2591
 
            the repository.
2592
 
        """
 
2539
    def _check(self):
2593
2540
        tree_basis = self.basis_tree()
2594
2541
        tree_basis.lock_read()
2595
2542
        try:
2596
 
            repo_basis = references[('trees', self.last_revision())]
 
2543
            repo_basis = self.branch.repository.revision_tree(
 
2544
                self.last_revision())
2597
2545
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2598
2546
                raise errors.BzrCheckError(
2599
2547
                    "Mismatched basis inventory content.")
2612
2560
        """
2613
2561
        return
2614
2562
 
 
2563
    @needs_read_lock
2615
2564
    def _get_rules_searcher(self, default_searcher):
2616
2565
        """See Tree._get_rules_searcher."""
2617
2566
        if self._rules_searcher is None:
2644
2593
        if self._inventory is None:
2645
2594
            self.read_working_inventory()
2646
2595
 
2647
 
    def _get_check_refs(self):
2648
 
        """Return the references needed to perform a check of this tree."""
2649
 
        return [('trees', self.last_revision())]
2650
 
 
2651
2596
    def lock_tree_write(self):
2652
2597
        """See WorkingTree.lock_tree_write().
2653
2598
 
2654
2599
        In Format2 WorkingTrees we have a single lock for the branch and tree
2655
2600
        so lock_tree_write() degrades to lock_write().
2656
 
 
2657
 
        :return: An object with an unlock method which will release the lock
2658
 
            obtained.
2659
2601
        """
2660
2602
        self.branch.lock_write()
2661
2603
        try:
2662
 
            self._control_files.lock_write()
2663
 
            return self
 
2604
            return self._control_files.lock_write()
2664
2605
        except:
2665
2606
            self.branch.unlock()
2666
2607
            raise
2714
2655
                mode=self.bzrdir._get_file_mode())
2715
2656
            return True
2716
2657
 
2717
 
    def _get_check_refs(self):
2718
 
        """Return the references needed to perform a check of this tree."""
2719
 
        return [('trees', self.last_revision())]
2720
 
 
2721
2658
    @needs_tree_write_lock
2722
2659
    def set_conflicts(self, conflicts):
2723
2660
        self._put_rio('conflicts', conflicts.to_stanzas(),
2800
2737
        """Return the format for the working tree object in a_bzrdir."""
2801
2738
        try:
2802
2739
            transport = a_bzrdir.get_workingtree_transport(None)
2803
 
            format_string = transport.get_bytes("format")
 
2740
            format_string = transport.get("format").read()
2804
2741
            return klass._formats[format_string]
2805
2742
        except errors.NoSuchFile:
2806
2743
            raise errors.NoWorkingTree(base=transport.base)
3070
3007
        return self.get_format_string()
3071
3008
 
3072
3009
 
3073
 
__default_format = WorkingTreeFormat6()
 
3010
__default_format = WorkingTreeFormat4()
3074
3011
WorkingTreeFormat.register_format(__default_format)
 
3012
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3075
3013
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3076
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3077
3014
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3078
3015
WorkingTreeFormat.set_default_format(__default_format)
3079
3016
# formats which have no format string are not discoverable