← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2010-07-13 07:44:02 UTC
  • mto: This revision was merged to the branch mainline in revision 5342.
  • Revision ID: john@arbash-meinel.com-20100713074402-wp3oh7cyx76fkvmm
Bump trunk to 2.3-dev1

Show diffs side-by-side

added added

removed removed

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