← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-14 05:49:27 UTC
  • mfrom: (4476.3.86 inventory-delta)
  • Revision ID: pqm@pqm.ubuntu.com-20090814054927-k0k18dn46ax4b91f
(andrew) Add inventory-delta streaming for cross-format fetch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
59
65
    merge,
60
66
    revision as _mod_revision,
61
67
    revisiontree,
 
68
    textui,
62
69
    trace,
63
70
    transform,
64
 
    transport,
65
71
    ui,
66
72
    views,
67
73
    xml5,
68
74
    xml7,
69
75
    )
 
76
import bzrlib.branch
 
77
from bzrlib.transport import get_transport
70
78
from bzrlib.workingtree_4 import (
71
79
    WorkingTreeFormat4,
72
80
    WorkingTreeFormat5,
76
84
 
77
85
from bzrlib import symbol_versioning
78
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
79
 
from bzrlib.lock import LogicalLockResult
80
87
from bzrlib.lockable_files import LockableFiles
81
88
from bzrlib.lockdir import LockDir
82
89
import bzrlib.mutabletree
95
102
from bzrlib.filters import filtered_input_file
96
103
from bzrlib.trace import mutter, note
97
104
from bzrlib.transport.local import LocalTransport
 
105
from bzrlib.progress import DummyProgress, ProgressPhase
98
106
from bzrlib.revision import CURRENT_REVISION
99
107
from bzrlib.rio import RioReader, rio_file, Stanza
100
108
from bzrlib.symbol_versioning import (
104
112
 
105
113
 
106
114
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
 
# TODO: Modifying the conflict objects or their type is currently nearly
108
 
# impossible as there is no clear relationship between the working tree format
109
 
# and the conflict list file format.
110
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
116
 
112
117
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
172
        return ''
168
173
 
169
174
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
175
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
176
    """Working copy tree.
173
177
 
174
178
    The inventory is held in the `Branch` working-inventory, and the
176
180
 
177
181
    It is possible for a `WorkingTree` to have a filename which is
178
182
    not listed in the Inventory and vice versa.
179
 
 
180
 
    :ivar basedir: The root of the tree on disk. This is a unicode path object
181
 
        (as opposed to a URL).
182
183
    """
183
184
 
184
185
    # override this to set the strategy for storing views
250
251
        self._rules_searcher = None
251
252
        self.views = self._make_views()
252
253
 
253
 
    @property
254
 
    def user_transport(self):
255
 
        return self.bzrdir.user_transport
256
 
 
257
 
    @property
258
 
    def control_transport(self):
259
 
        return self._transport
260
 
 
261
254
    def _detect_case_handling(self):
262
255
        wt_trans = self.bzrdir.get_workingtree_transport(None)
263
256
        try:
371
364
                return True, None
372
365
            else:
373
366
                return True, tree
374
 
        t = transport.get_transport(location)
375
 
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
 
367
        transport = get_transport(location)
 
368
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
376
369
                                              list_current=list_current)
377
 
        return [tr for tr in iterator if tr is not None]
 
370
        return [t for t in iterator if t is not None]
378
371
 
379
372
    # should be deprecated - this is slow and in any case treating them as a
380
373
    # container is (we now know) bad style -- mbp 20070302
465
458
        return (file_obj, stat_value)
466
459
 
467
460
    def get_file_text(self, file_id, path=None, filtered=True):
468
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
469
 
        try:
470
 
            return my_file.read()
471
 
        finally:
472
 
            my_file.close()
 
461
        return self.get_file(file_id, path=path, filtered=filtered).read()
473
462
 
474
463
    def get_file_byname(self, filename, filtered=True):
475
464
        path = self.abspath(filename)
529
518
 
530
519
        # Now we have the parents of this content
531
520
        annotator = self.branch.repository.texts.get_annotator()
532
 
        text = self.get_file_text(file_id)
 
521
        text = self.get_file(file_id).read()
533
522
        this_key =(file_id, default_revision)
534
523
        annotator.add_special_text(this_key, file_parent_keys, text)
535
524
        annotations = [(key[-1], line)
555
544
        else:
556
545
            parents = [last_rev]
557
546
        try:
558
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
547
            merges_file = self._transport.get('pending-merges')
559
548
        except errors.NoSuchFile:
560
549
            pass
561
550
        else:
562
 
            for l in osutils.split_lines(merges_bytes):
 
551
            for l in merges_file.readlines():
563
552
                revision_id = l.rstrip('\n')
564
553
                parents.append(revision_id)
565
554
        return parents
624
613
 
625
614
    def get_file_size(self, file_id):
626
615
        """See Tree.get_file_size"""
627
 
        # XXX: this returns the on-disk size; it should probably return the
628
 
        # canonical size
629
616
        try:
630
617
            return os.path.getsize(self.id2abspath(file_id))
631
618
        except OSError, e:
647
634
 
648
635
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
649
636
        file_id = self.path2id(path)
650
 
        if file_id is None:
651
 
            # For unversioned files on win32, we just assume they are not
652
 
            # executable
653
 
            return False
654
637
        return self._inventory[file_id].executable
655
638
 
656
639
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
766
749
            raise
767
750
        kind = _mapper(stat_result.st_mode)
768
751
        if kind == 'file':
769
 
            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))
770
757
        elif kind == 'directory':
771
758
            # perhaps it looks like a plain directory, but it's really a
772
759
            # reference.
779
766
        else:
780
767
            return (kind, None, None, None)
781
768
 
782
 
    def _file_content_summary(self, path, stat_result):
783
 
        size = stat_result.st_size
784
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
785
 
        # try for a stat cache lookup
786
 
        return ('file', size, executable, self._sha_from_stat(
787
 
            path, stat_result))
788
 
 
789
769
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
790
770
        """Common ghost checking functionality from set_parent_*.
791
771
 
911
891
 
912
892
    @needs_write_lock # because merge pulls data into the branch.
913
893
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
914
 
                          merge_type=None, force=False):
 
894
        merge_type=None):
915
895
        """Merge from a branch into this working tree.
916
896
 
917
897
        :param branch: The branch to merge from.
921
901
            branch.last_revision().
922
902
        """
923
903
        from bzrlib.merge import Merger, Merge3Merger
924
 
        merger = Merger(self.branch, this_tree=self)
925
 
        # check that there are no local alterations
926
 
        if not force and self.has_changes():
927
 
            raise errors.UncommittedChanges(self)
928
 
        if to_revision is None:
929
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
930
 
        merger.other_rev_id = to_revision
931
 
        if _mod_revision.is_null(merger.other_rev_id):
932
 
            raise errors.NoCommits(branch)
933
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
934
 
        merger.other_basis = merger.other_rev_id
935
 
        merger.other_tree = self.branch.repository.revision_tree(
936
 
            merger.other_rev_id)
937
 
        merger.other_branch = branch
938
 
        if from_revision is None:
939
 
            merger.find_base()
940
 
        else:
941
 
            merger.set_base_revision(from_revision, branch)
942
 
        if merger.base_rev_id == merger.other_rev_id:
943
 
            raise errors.PointlessMerge
944
 
        merger.backup_files = False
945
 
        if merge_type is None:
946
 
            merger.merge_type = Merge3Merger
947
 
        else:
948
 
            merger.merge_type = merge_type
949
 
        merger.set_interesting_files(None)
950
 
        merger.show_base = False
951
 
        merger.reprocess = False
952
 
        conflicts = merger.do_merge()
953
 
        merger.set_pending()
 
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()
954
941
        return conflicts
955
942
 
956
943
    @needs_read_lock
1103
1090
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1104
1091
        if tree_transport.base != branch_transport.base:
1105
1092
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1106
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1107
 
                target_branch=new_branch)
 
1093
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1108
1094
        else:
1109
1095
            tree_bzrdir = branch_bzrdir
1110
1096
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1148
1134
        This does not include files that have been deleted in this
1149
1135
        tree. Skips the control directory.
1150
1136
 
1151
 
        :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
1152
1138
        :param from_dir: start from this directory or None for the root
1153
1139
        :param recursive: whether to recurse into subdirectories or not
1154
1140
        """
1608
1594
    @needs_write_lock
1609
1595
    def pull(self, source, overwrite=False, stop_revision=None,
1610
1596
             change_reporter=None, possible_transports=None, local=False):
 
1597
        top_pb = ui.ui_factory.nested_progress_bar()
1611
1598
        source.lock_read()
1612
1599
        try:
 
1600
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1601
            pp.next_phase()
1613
1602
            old_revision_info = self.branch.last_revision_info()
1614
1603
            basis_tree = self.basis_tree()
1615
1604
            count = self.branch.pull(source, overwrite, stop_revision,
1617
1606
                                     local=local)
1618
1607
            new_revision_info = self.branch.last_revision_info()
1619
1608
            if new_revision_info != old_revision_info:
 
1609
                pp.next_phase()
1620
1610
                repository = self.branch.repository
 
1611
                pb = ui.ui_factory.nested_progress_bar()
1621
1612
                basis_tree.lock_read()
1622
1613
                try:
1623
1614
                    new_basis_tree = self.branch.basis_tree()
1626
1617
                                new_basis_tree,
1627
1618
                                basis_tree,
1628
1619
                                this_tree=self,
1629
 
                                pb=None,
 
1620
                                pb=pb,
1630
1621
                                change_reporter=change_reporter)
1631
 
                    basis_root_id = basis_tree.get_root_id()
1632
 
                    new_root_id = new_basis_tree.get_root_id()
1633
 
                    if basis_root_id != new_root_id:
1634
 
                        self.set_root_id(new_root_id)
 
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())
1635
1625
                finally:
 
1626
                    pb.finished()
1636
1627
                    basis_tree.unlock()
1637
1628
                # TODO - dedup parents list with things merged by pull ?
1638
1629
                # reuse the revisiontree we merged against to set the new
1651
1642
            return count
1652
1643
        finally:
1653
1644
            source.unlock()
 
1645
            top_pb.finished()
1654
1646
 
1655
1647
    @needs_write_lock
1656
1648
    def put_file_bytes_non_atomic(self, file_id, bytes):
1741
1733
        r"""Check whether the filename matches an ignore pattern.
1742
1734
 
1743
1735
        Patterns containing '/' or '\' need to match the whole path;
1744
 
        others match against only the last component.  Patterns starting
1745
 
        with '!' are ignore exceptions.  Exceptions take precedence
1746
 
        over regular patterns and cause the filename to not be ignored.
 
1736
        others match against only the last component.
1747
1737
 
1748
1738
        If the file is ignored, returns the pattern which caused it to
1749
1739
        be ignored, otherwise None.  So this can simply be used as a
1750
1740
        boolean if desired."""
1751
1741
        if getattr(self, '_ignoreglobster', None) is None:
1752
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1742
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1753
1743
        return self._ignoreglobster.match(filename)
1754
1744
 
1755
1745
    def kind(self, file_id):
1805
1795
            raise errors.ObjectNotLocked(self)
1806
1796
 
1807
1797
    def lock_read(self):
1808
 
        """Lock the tree for reading.
1809
 
 
1810
 
        This also locks the branch, and can be unlocked via self.unlock().
1811
 
 
1812
 
        :return: A bzrlib.lock.LogicalLockResult.
1813
 
        """
 
1798
        """See Branch.lock_read, and WorkingTree.unlock."""
1814
1799
        if not self.is_locked():
1815
1800
            self._reset_data()
1816
1801
        self.branch.lock_read()
1817
1802
        try:
1818
 
            self._control_files.lock_read()
1819
 
            return LogicalLockResult(self.unlock)
 
1803
            return self._control_files.lock_read()
1820
1804
        except:
1821
1805
            self.branch.unlock()
1822
1806
            raise
1823
1807
 
1824
1808
    def lock_tree_write(self):
1825
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1826
 
 
1827
 
        :return: A bzrlib.lock.LogicalLockResult.
1828
 
        """
 
1809
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1829
1810
        if not self.is_locked():
1830
1811
            self._reset_data()
1831
1812
        self.branch.lock_read()
1832
1813
        try:
1833
 
            self._control_files.lock_write()
1834
 
            return LogicalLockResult(self.unlock)
 
1814
            return self._control_files.lock_write()
1835
1815
        except:
1836
1816
            self.branch.unlock()
1837
1817
            raise
1838
1818
 
1839
1819
    def lock_write(self):
1840
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1841
 
 
1842
 
        :return: A bzrlib.lock.LogicalLockResult.
1843
 
        """
 
1820
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1844
1821
        if not self.is_locked():
1845
1822
            self._reset_data()
1846
1823
        self.branch.lock_write()
1847
1824
        try:
1848
 
            self._control_files.lock_write()
1849
 
            return LogicalLockResult(self.unlock)
 
1825
            return self._control_files.lock_write()
1850
1826
        except:
1851
1827
            self.branch.unlock()
1852
1828
            raise
1860
1836
    def _reset_data(self):
1861
1837
        """Reset transient data that cannot be revalidated."""
1862
1838
        self._inventory_is_modified = False
1863
 
        f = self._transport.get('inventory')
1864
 
        try:
1865
 
            result = self._deserialize(f)
1866
 
        finally:
1867
 
            f.close()
 
1839
        result = self._deserialize(self._transport.get('inventory'))
1868
1840
        self._set_inventory(result, dirty=False)
1869
1841
 
1870
1842
    @needs_tree_write_lock
1917
1889
            # revision_id is set. We must check for this full string, because a
1918
1890
            # root node id can legitimately look like 'revision_id' but cannot
1919
1891
            # contain a '"'.
1920
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1892
            xml = self.branch.repository.get_inventory_xml(new_revision)
1921
1893
            firstline = xml.split('\n', 1)[0]
1922
1894
            if (not 'revision_id="' in firstline or
1923
1895
                'format="7"' not in firstline):
1924
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1925
 
                    xml, new_revision)
 
1896
                inv = self.branch.repository.deserialise_inventory(
 
1897
                    new_revision, xml)
1926
1898
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1927
1899
            self._write_basis_inventory(xml)
1928
1900
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1946
1918
        # binary.
1947
1919
        if self._inventory_is_modified:
1948
1920
            raise errors.InventoryModified(self)
1949
 
        f = self._transport.get('inventory')
1950
 
        try:
1951
 
            result = self._deserialize(f)
1952
 
        finally:
1953
 
            f.close()
 
1921
        result = self._deserialize(self._transport.get('inventory'))
1954
1922
        self._set_inventory(result, dirty=False)
1955
1923
        return result
1956
1924
 
1971
1939
 
1972
1940
        new_files=set()
1973
1941
        unknown_nested_files=set()
1974
 
        if to_file is None:
1975
 
            to_file = sys.stdout
1976
1942
 
1977
1943
        def recurse_directory_to_add_files(directory):
1978
1944
            # Recurse directory and add all files
1979
1945
            # so we can check if they have changed.
1980
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1946
            for parent_info, file_infos in\
 
1947
                self.walkdirs(directory):
1981
1948
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1982
1949
                    # Is it versioned or ignored?
1983
1950
                    if self.path2id(relpath) or self.is_ignored(relpath):
2018
1985
                            # ... but not ignored
2019
1986
                            has_changed_files = True
2020
1987
                            break
2021
 
                    elif (content_change and (kind[1] is not None) and
2022
 
                            osutils.is_inside_any(files, path[1])):
2023
 
                        # Versioned and changed, but not deleted, and still
2024
 
                        # in one of the dirs to be deleted.
 
1988
                    elif content_change and (kind[1] is not None):
 
1989
                        # Versioned and changed, but not deleted
2025
1990
                        has_changed_files = True
2026
1991
                        break
2027
1992
 
2049
2014
                        new_status = 'I'
2050
2015
                    else:
2051
2016
                        new_status = '?'
2052
 
                    # XXX: Really should be a more abstract reporter interface
2053
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2054
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2017
                    textui.show_status(new_status, self.kind(fid), f,
 
2018
                                       to_file=to_file)
2055
2019
                # Unversion file
2056
2020
                inv_delta.append((f, None, fid, None))
2057
2021
                message = "removed %s" % (f,)
2080
2044
 
2081
2045
    @needs_tree_write_lock
2082
2046
    def revert(self, filenames=None, old_tree=None, backups=True,
2083
 
               pb=None, report_changes=False):
 
2047
               pb=DummyProgress(), report_changes=False):
2084
2048
        from bzrlib.conflicts import resolve
2085
2049
        if filenames == []:
2086
2050
            filenames = None
2208
2172
        """
2209
2173
        raise NotImplementedError(self.unlock)
2210
2174
 
2211
 
    _marker = object()
2212
 
 
2213
 
    def update(self, change_reporter=None, possible_transports=None,
2214
 
               revision=None, old_tip=_marker):
 
2175
    def update(self, change_reporter=None, possible_transports=None):
2215
2176
        """Update a working tree along its branch.
2216
2177
 
2217
2178
        This will update the branch if its bound too, which means we have
2235
2196
        - Merge current state -> basis tree of the master w.r.t. the old tree
2236
2197
          basis.
2237
2198
        - Do a 'normal' merge of the old branch basis if it is relevant.
2238
 
 
2239
 
        :param revision: The target revision to update to. Must be in the
2240
 
            revision history.
2241
 
        :param old_tip: If branch.update() has already been run, the value it
2242
 
            returned (old tip of the branch or None). _marker is used
2243
 
            otherwise.
2244
2199
        """
2245
2200
        if self.branch.get_bound_location() is not None:
2246
2201
            self.lock_write()
2247
 
            update_branch = (old_tip is self._marker)
 
2202
            update_branch = True
2248
2203
        else:
2249
2204
            self.lock_tree_write()
2250
2205
            update_branch = False
2252
2207
            if update_branch:
2253
2208
                old_tip = self.branch.update(possible_transports)
2254
2209
            else:
2255
 
                if old_tip is self._marker:
2256
 
                    old_tip = None
2257
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2210
                old_tip = None
 
2211
            return self._update_tree(old_tip, change_reporter)
2258
2212
        finally:
2259
2213
            self.unlock()
2260
2214
 
2261
2215
    @needs_tree_write_lock
2262
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2216
    def _update_tree(self, old_tip=None, change_reporter=None):
2263
2217
        """Update a tree to the master branch.
2264
2218
 
2265
2219
        :param old_tip: if supplied, the previous tip revision the branch,
2275
2229
        # We MUST save it even if an error occurs, because otherwise the users
2276
2230
        # local work is unreferenced and will appear to have been lost.
2277
2231
        #
2278
 
        nb_conflicts = 0
 
2232
        result = 0
2279
2233
        try:
2280
2234
            last_rev = self.get_parent_ids()[0]
2281
2235
        except IndexError:
2282
2236
            last_rev = _mod_revision.NULL_REVISION
2283
 
        if revision is None:
2284
 
            revision = self.branch.last_revision()
2285
 
 
2286
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2287
 
 
2288
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2289
 
            # the branch we are bound to was updated
2290
 
            # merge those changes in first
2291
 
            base_tree  = self.basis_tree()
2292
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2293
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2294
 
                                             base_tree, this_tree=self,
2295
 
                                             change_reporter=change_reporter)
2296
 
            if nb_conflicts:
2297
 
                self.add_parent_tree((old_tip, other_tree))
2298
 
                trace.note('Rerun update after fixing the conflicts.')
2299
 
                return nb_conflicts
2300
 
 
2301
 
        if last_rev != _mod_revision.ensure_null(revision):
2302
 
            # the working tree is up to date with the branch
2303
 
            # we can merge the specified revision from master
2304
 
            to_tree = self.branch.repository.revision_tree(revision)
2305
 
            to_root_id = to_tree.get_root_id()
2306
 
 
 
2237
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2238
            # merge tree state up to new branch tip.
2307
2239
            basis = self.basis_tree()
2308
2240
            basis.lock_read()
2309
2241
            try:
2310
 
                if (basis.inventory.root is None
2311
 
                    or basis.inventory.root.file_id != to_root_id):
2312
 
                    self.set_root_id(to_root_id)
 
2242
                to_tree = self.branch.basis_tree()
 
2243
                if basis.inventory.root is None:
 
2244
                    self.set_root_id(to_tree.get_root_id())
2313
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)
2314
2252
            finally:
2315
2253
                basis.unlock()
2316
 
 
2317
 
            # determine the branch point
2318
 
            graph = self.branch.repository.get_graph()
2319
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2320
 
                                                last_rev)
2321
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2322
 
 
2323
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2324
 
                                             this_tree=self,
2325
 
                                             change_reporter=change_reporter)
2326
 
            self.set_last_revision(revision)
2327
2254
            # TODO - dedup parents list with things merged by pull ?
2328
2255
            # reuse the tree we've updated to to set the basis:
2329
 
            parent_trees = [(revision, to_tree)]
 
2256
            parent_trees = [(self.branch.last_revision(), to_tree)]
2330
2257
            merges = self.get_parent_ids()[1:]
2331
2258
            # Ideally we ask the tree for the trees here, that way the working
2332
2259
            # tree can decide whether to give us the entire tree or give us a
2336
2263
            for parent in merges:
2337
2264
                parent_trees.append(
2338
2265
                    (parent, self.branch.repository.revision_tree(parent)))
2339
 
            if not _mod_revision.is_null(old_tip):
 
2266
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2340
2267
                parent_trees.append(
2341
2268
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2342
2269
            self.set_parent_trees(parent_trees)
2343
2270
            last_rev = parent_trees[0][0]
2344
 
        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
2345
2303
 
2346
2304
    def _write_hashcache_if_dirty(self):
2347
2305
        """Write out the hashcache if it is dirty."""
2617
2575
        """
2618
2576
        return
2619
2577
 
 
2578
    @needs_read_lock
2620
2579
    def _get_rules_searcher(self, default_searcher):
2621
2580
        """See Tree._get_rules_searcher."""
2622
2581
        if self._rules_searcher is None:
2658
2617
 
2659
2618
        In Format2 WorkingTrees we have a single lock for the branch and tree
2660
2619
        so lock_tree_write() degrades to lock_write().
2661
 
 
2662
 
        :return: An object with an unlock method which will release the lock
2663
 
            obtained.
2664
2620
        """
2665
2621
        self.branch.lock_write()
2666
2622
        try:
2667
 
            self._control_files.lock_write()
2668
 
            return self
 
2623
            return self._control_files.lock_write()
2669
2624
        except:
2670
2625
            self.branch.unlock()
2671
2626
            raise
2805
2760
        """Return the format for the working tree object in a_bzrdir."""
2806
2761
        try:
2807
2762
            transport = a_bzrdir.get_workingtree_transport(None)
2808
 
            format_string = transport.get_bytes("format")
 
2763
            format_string = transport.get("format").read()
2809
2764
            return klass._formats[format_string]
2810
2765
        except errors.NoSuchFile:
2811
2766
            raise errors.NoWorkingTree(base=transport.base)
3075
3030
        return self.get_format_string()
3076
3031
 
3077
3032
 
3078
 
__default_format = WorkingTreeFormat6()
 
3033
__default_format = WorkingTreeFormat4()
3079
3034
WorkingTreeFormat.register_format(__default_format)
 
3035
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3080
3036
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3081
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3082
3037
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3083
3038
WorkingTreeFormat.set_default_format(__default_format)
3084
3039
# formats which have no format string are not discoverable