/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: 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
 
    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:
288
281
        self._control_files.break_lock()
289
282
        self.branch.break_lock()
290
283
 
291
 
    def _get_check_refs(self):
292
 
        """Return the references needed to perform a check of this tree.
293
 
        
294
 
        The default implementation returns no refs, and is only suitable for
295
 
        trees that have no local caching and can commit on ghosts at any time.
296
 
 
297
 
        :seealso: bzrlib.check for details about check_refs.
298
 
        """
299
 
        return []
300
 
 
301
284
    def requires_rich_root(self):
302
285
        return self._format.requires_rich_root
303
286
 
371
354
                return True, None
372
355
            else:
373
356
                return True, tree
374
 
        t = transport.get_transport(location)
375
 
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
 
357
        transport = get_transport(location)
 
358
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
376
359
                                              list_current=list_current)
377
 
        return [tr for tr in iterator if tr is not None]
 
360
        return [t for t in iterator if t is not None]
378
361
 
379
362
    # should be deprecated - this is slow and in any case treating them as a
380
363
    # container is (we now know) bad style -- mbp 20070302
465
448
        return (file_obj, stat_value)
466
449
 
467
450
    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()
 
451
        return self.get_file(file_id, path=path, filtered=filtered).read()
473
452
 
474
453
    def get_file_byname(self, filename, filtered=True):
475
454
        path = self.abspath(filename)
529
508
 
530
509
        # Now we have the parents of this content
531
510
        annotator = self.branch.repository.texts.get_annotator()
532
 
        text = self.get_file_text(file_id)
 
511
        text = self.get_file(file_id).read()
533
512
        this_key =(file_id, default_revision)
534
513
        annotator.add_special_text(this_key, file_parent_keys, text)
535
514
        annotations = [(key[-1], line)
555
534
        else:
556
535
            parents = [last_rev]
557
536
        try:
558
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
537
            merges_file = self._transport.get('pending-merges')
559
538
        except errors.NoSuchFile:
560
539
            pass
561
540
        else:
562
 
            for l in osutils.split_lines(merges_bytes):
 
541
            for l in merges_file.readlines():
563
542
                revision_id = l.rstrip('\n')
564
543
                parents.append(revision_id)
565
544
        return parents
624
603
 
625
604
    def get_file_size(self, file_id):
626
605
        """See Tree.get_file_size"""
627
 
        # XXX: this returns the on-disk size; it should probably return the
628
 
        # canonical size
629
606
        try:
630
607
            return os.path.getsize(self.id2abspath(file_id))
631
608
        except OSError, e:
647
624
 
648
625
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
649
626
        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
627
        return self._inventory[file_id].executable
655
628
 
656
629
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
766
739
            raise
767
740
        kind = _mapper(stat_result.st_mode)
768
741
        if kind == 'file':
769
 
            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))
770
747
        elif kind == 'directory':
771
748
            # perhaps it looks like a plain directory, but it's really a
772
749
            # reference.
779
756
        else:
780
757
            return (kind, None, None, None)
781
758
 
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
759
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
790
760
        """Common ghost checking functionality from set_parent_*.
791
761
 
911
881
 
912
882
    @needs_write_lock # because merge pulls data into the branch.
913
883
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
914
 
                          merge_type=None, force=False):
 
884
        merge_type=None):
915
885
        """Merge from a branch into this working tree.
916
886
 
917
887
        :param branch: The branch to merge from.
921
891
            branch.last_revision().
922
892
        """
923
893
        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()
 
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()
954
931
        return conflicts
955
932
 
956
933
    @needs_read_lock
1103
1080
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1104
1081
        if tree_transport.base != branch_transport.base:
1105
1082
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1106
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1107
 
                target_branch=new_branch)
 
1083
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1108
1084
        else:
1109
1085
            tree_bzrdir = branch_bzrdir
1110
1086
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1148
1124
        This does not include files that have been deleted in this
1149
1125
        tree. Skips the control directory.
1150
1126
 
1151
 
        :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
1152
1128
        :param from_dir: start from this directory or None for the root
1153
1129
        :param recursive: whether to recurse into subdirectories or not
1154
1130
        """
1608
1584
    @needs_write_lock
1609
1585
    def pull(self, source, overwrite=False, stop_revision=None,
1610
1586
             change_reporter=None, possible_transports=None, local=False):
 
1587
        top_pb = ui.ui_factory.nested_progress_bar()
1611
1588
        source.lock_read()
1612
1589
        try:
 
1590
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1591
            pp.next_phase()
1613
1592
            old_revision_info = self.branch.last_revision_info()
1614
1593
            basis_tree = self.basis_tree()
1615
1594
            count = self.branch.pull(source, overwrite, stop_revision,
1617
1596
                                     local=local)
1618
1597
            new_revision_info = self.branch.last_revision_info()
1619
1598
            if new_revision_info != old_revision_info:
 
1599
                pp.next_phase()
1620
1600
                repository = self.branch.repository
 
1601
                pb = ui.ui_factory.nested_progress_bar()
1621
1602
                basis_tree.lock_read()
1622
1603
                try:
1623
1604
                    new_basis_tree = self.branch.basis_tree()
1626
1607
                                new_basis_tree,
1627
1608
                                basis_tree,
1628
1609
                                this_tree=self,
1629
 
                                pb=None,
 
1610
                                pb=pb,
1630
1611
                                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)
 
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())
1635
1615
                finally:
 
1616
                    pb.finished()
1636
1617
                    basis_tree.unlock()
1637
1618
                # TODO - dedup parents list with things merged by pull ?
1638
1619
                # reuse the revisiontree we merged against to set the new
1651
1632
            return count
1652
1633
        finally:
1653
1634
            source.unlock()
 
1635
            top_pb.finished()
1654
1636
 
1655
1637
    @needs_write_lock
1656
1638
    def put_file_bytes_non_atomic(self, file_id, bytes):
1741
1723
        r"""Check whether the filename matches an ignore pattern.
1742
1724
 
1743
1725
        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.
 
1726
        others match against only the last component.
1747
1727
 
1748
1728
        If the file is ignored, returns the pattern which caused it to
1749
1729
        be ignored, otherwise None.  So this can simply be used as a
1750
1730
        boolean if desired."""
1751
1731
        if getattr(self, '_ignoreglobster', None) is None:
1752
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1732
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1753
1733
        return self._ignoreglobster.match(filename)
1754
1734
 
1755
1735
    def kind(self, file_id):
1805
1785
            raise errors.ObjectNotLocked(self)
1806
1786
 
1807
1787
    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
 
        """
 
1788
        """See Branch.lock_read, and WorkingTree.unlock."""
1814
1789
        if not self.is_locked():
1815
1790
            self._reset_data()
1816
1791
        self.branch.lock_read()
1817
1792
        try:
1818
 
            self._control_files.lock_read()
1819
 
            return LogicalLockResult(self.unlock)
 
1793
            return self._control_files.lock_read()
1820
1794
        except:
1821
1795
            self.branch.unlock()
1822
1796
            raise
1823
1797
 
1824
1798
    def lock_tree_write(self):
1825
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1826
 
 
1827
 
        :return: A bzrlib.lock.LogicalLockResult.
1828
 
        """
 
1799
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1829
1800
        if not self.is_locked():
1830
1801
            self._reset_data()
1831
1802
        self.branch.lock_read()
1832
1803
        try:
1833
 
            self._control_files.lock_write()
1834
 
            return LogicalLockResult(self.unlock)
 
1804
            return self._control_files.lock_write()
1835
1805
        except:
1836
1806
            self.branch.unlock()
1837
1807
            raise
1838
1808
 
1839
1809
    def lock_write(self):
1840
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1841
 
 
1842
 
        :return: A bzrlib.lock.LogicalLockResult.
1843
 
        """
 
1810
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1844
1811
        if not self.is_locked():
1845
1812
            self._reset_data()
1846
1813
        self.branch.lock_write()
1847
1814
        try:
1848
 
            self._control_files.lock_write()
1849
 
            return LogicalLockResult(self.unlock)
 
1815
            return self._control_files.lock_write()
1850
1816
        except:
1851
1817
            self.branch.unlock()
1852
1818
            raise
1860
1826
    def _reset_data(self):
1861
1827
        """Reset transient data that cannot be revalidated."""
1862
1828
        self._inventory_is_modified = False
1863
 
        f = self._transport.get('inventory')
1864
 
        try:
1865
 
            result = self._deserialize(f)
1866
 
        finally:
1867
 
            f.close()
 
1829
        result = self._deserialize(self._transport.get('inventory'))
1868
1830
        self._set_inventory(result, dirty=False)
1869
1831
 
1870
1832
    @needs_tree_write_lock
1917
1879
            # revision_id is set. We must check for this full string, because a
1918
1880
            # root node id can legitimately look like 'revision_id' but cannot
1919
1881
            # contain a '"'.
1920
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1882
            xml = self.branch.repository.get_inventory_xml(new_revision)
1921
1883
            firstline = xml.split('\n', 1)[0]
1922
1884
            if (not 'revision_id="' in firstline or
1923
1885
                'format="7"' not in firstline):
1924
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1925
 
                    xml, new_revision)
 
1886
                inv = self.branch.repository.deserialise_inventory(
 
1887
                    new_revision, xml)
1926
1888
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1927
1889
            self._write_basis_inventory(xml)
1928
1890
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1946
1908
        # binary.
1947
1909
        if self._inventory_is_modified:
1948
1910
            raise errors.InventoryModified(self)
1949
 
        f = self._transport.get('inventory')
1950
 
        try:
1951
 
            result = self._deserialize(f)
1952
 
        finally:
1953
 
            f.close()
 
1911
        result = self._deserialize(self._transport.get('inventory'))
1954
1912
        self._set_inventory(result, dirty=False)
1955
1913
        return result
1956
1914
 
1971
1929
 
1972
1930
        new_files=set()
1973
1931
        unknown_nested_files=set()
1974
 
        if to_file is None:
1975
 
            to_file = sys.stdout
1976
1932
 
1977
1933
        def recurse_directory_to_add_files(directory):
1978
1934
            # Recurse directory and add all files
1979
1935
            # so we can check if they have changed.
1980
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1936
            for parent_info, file_infos in\
 
1937
                self.walkdirs(directory):
1981
1938
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1982
1939
                    # Is it versioned or ignored?
1983
1940
                    if self.path2id(relpath) or self.is_ignored(relpath):
2018
1975
                            # ... but not ignored
2019
1976
                            has_changed_files = True
2020
1977
                            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.
 
1978
                    elif content_change and (kind[1] is not None):
 
1979
                        # Versioned and changed, but not deleted
2025
1980
                        has_changed_files = True
2026
1981
                        break
2027
1982
 
2049
2004
                        new_status = 'I'
2050
2005
                    else:
2051
2006
                        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')
 
2007
                    textui.show_status(new_status, self.kind(fid), f,
 
2008
                                       to_file=to_file)
2055
2009
                # Unversion file
2056
2010
                inv_delta.append((f, None, fid, None))
2057
2011
                message = "removed %s" % (f,)
2080
2034
 
2081
2035
    @needs_tree_write_lock
2082
2036
    def revert(self, filenames=None, old_tree=None, backups=True,
2083
 
               pb=None, report_changes=False):
 
2037
               pb=DummyProgress(), report_changes=False):
2084
2038
        from bzrlib.conflicts import resolve
2085
2039
        if filenames == []:
2086
2040
            filenames = None
2208
2162
        """
2209
2163
        raise NotImplementedError(self.unlock)
2210
2164
 
2211
 
    _marker = object()
2212
 
 
2213
 
    def update(self, change_reporter=None, possible_transports=None,
2214
 
               revision=None, old_tip=_marker):
 
2165
    def update(self, change_reporter=None, possible_transports=None):
2215
2166
        """Update a working tree along its branch.
2216
2167
 
2217
2168
        This will update the branch if its bound too, which means we have
2235
2186
        - Merge current state -> basis tree of the master w.r.t. the old tree
2236
2187
          basis.
2237
2188
        - 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
2189
        """
2245
2190
        if self.branch.get_bound_location() is not None:
2246
2191
            self.lock_write()
2247
 
            update_branch = (old_tip is self._marker)
 
2192
            update_branch = True
2248
2193
        else:
2249
2194
            self.lock_tree_write()
2250
2195
            update_branch = False
2252
2197
            if update_branch:
2253
2198
                old_tip = self.branch.update(possible_transports)
2254
2199
            else:
2255
 
                if old_tip is self._marker:
2256
 
                    old_tip = None
2257
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2200
                old_tip = None
 
2201
            return self._update_tree(old_tip, change_reporter)
2258
2202
        finally:
2259
2203
            self.unlock()
2260
2204
 
2261
2205
    @needs_tree_write_lock
2262
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2206
    def _update_tree(self, old_tip=None, change_reporter=None):
2263
2207
        """Update a tree to the master branch.
2264
2208
 
2265
2209
        :param old_tip: if supplied, the previous tip revision the branch,
2275
2219
        # We MUST save it even if an error occurs, because otherwise the users
2276
2220
        # local work is unreferenced and will appear to have been lost.
2277
2221
        #
2278
 
        nb_conflicts = 0
 
2222
        result = 0
2279
2223
        try:
2280
2224
            last_rev = self.get_parent_ids()[0]
2281
2225
        except IndexError:
2282
2226
            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
 
 
 
2227
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2228
            # merge tree state up to new branch tip.
2307
2229
            basis = self.basis_tree()
2308
2230
            basis.lock_read()
2309
2231
            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)
 
2232
                to_tree = self.branch.basis_tree()
 
2233
                if basis.inventory.root is None:
 
2234
                    self.set_root_id(to_tree.get_root_id())
2313
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)
2314
2242
            finally:
2315
2243
                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
2244
            # TODO - dedup parents list with things merged by pull ?
2328
2245
            # reuse the tree we've updated to to set the basis:
2329
 
            parent_trees = [(revision, to_tree)]
 
2246
            parent_trees = [(self.branch.last_revision(), to_tree)]
2330
2247
            merges = self.get_parent_ids()[1:]
2331
2248
            # Ideally we ask the tree for the trees here, that way the working
2332
2249
            # tree can decide whether to give us the entire tree or give us a
2336
2253
            for parent in merges:
2337
2254
                parent_trees.append(
2338
2255
                    (parent, self.branch.repository.revision_tree(parent)))
2339
 
            if not _mod_revision.is_null(old_tip):
 
2256
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2340
2257
                parent_trees.append(
2341
2258
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2342
2259
            self.set_parent_trees(parent_trees)
2343
2260
            last_rev = parent_trees[0][0]
2344
 
        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
2345
2293
 
2346
2294
    def _write_hashcache_if_dirty(self):
2347
2295
        """Write out the hashcache if it is dirty."""
2588
2536
        return un_resolved, resolved
2589
2537
 
2590
2538
    @needs_read_lock
2591
 
    def _check(self, references):
2592
 
        """Check the tree for consistency.
2593
 
 
2594
 
        :param references: A dict with keys matching the items returned by
2595
 
            self._get_check_refs(), and values from looking those keys up in
2596
 
            the repository.
2597
 
        """
 
2539
    def _check(self):
2598
2540
        tree_basis = self.basis_tree()
2599
2541
        tree_basis.lock_read()
2600
2542
        try:
2601
 
            repo_basis = references[('trees', self.last_revision())]
 
2543
            repo_basis = self.branch.repository.revision_tree(
 
2544
                self.last_revision())
2602
2545
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2603
2546
                raise errors.BzrCheckError(
2604
2547
                    "Mismatched basis inventory content.")
2617
2560
        """
2618
2561
        return
2619
2562
 
 
2563
    @needs_read_lock
2620
2564
    def _get_rules_searcher(self, default_searcher):
2621
2565
        """See Tree._get_rules_searcher."""
2622
2566
        if self._rules_searcher is None:
2649
2593
        if self._inventory is None:
2650
2594
            self.read_working_inventory()
2651
2595
 
2652
 
    def _get_check_refs(self):
2653
 
        """Return the references needed to perform a check of this tree."""
2654
 
        return [('trees', self.last_revision())]
2655
 
 
2656
2596
    def lock_tree_write(self):
2657
2597
        """See WorkingTree.lock_tree_write().
2658
2598
 
2659
2599
        In Format2 WorkingTrees we have a single lock for the branch and tree
2660
2600
        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
2601
        """
2665
2602
        self.branch.lock_write()
2666
2603
        try:
2667
 
            self._control_files.lock_write()
2668
 
            return self
 
2604
            return self._control_files.lock_write()
2669
2605
        except:
2670
2606
            self.branch.unlock()
2671
2607
            raise
2719
2655
                mode=self.bzrdir._get_file_mode())
2720
2656
            return True
2721
2657
 
2722
 
    def _get_check_refs(self):
2723
 
        """Return the references needed to perform a check of this tree."""
2724
 
        return [('trees', self.last_revision())]
2725
 
 
2726
2658
    @needs_tree_write_lock
2727
2659
    def set_conflicts(self, conflicts):
2728
2660
        self._put_rio('conflicts', conflicts.to_stanzas(),
2805
2737
        """Return the format for the working tree object in a_bzrdir."""
2806
2738
        try:
2807
2739
            transport = a_bzrdir.get_workingtree_transport(None)
2808
 
            format_string = transport.get_bytes("format")
 
2740
            format_string = transport.get("format").read()
2809
2741
            return klass._formats[format_string]
2810
2742
        except errors.NoSuchFile:
2811
2743
            raise errors.NoWorkingTree(base=transport.base)
3075
3007
        return self.get_format_string()
3076
3008
 
3077
3009
 
3078
 
__default_format = WorkingTreeFormat6()
 
3010
__default_format = WorkingTreeFormat4()
3079
3011
WorkingTreeFormat.register_format(__default_format)
 
3012
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3080
3013
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3081
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3082
3014
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3083
3015
WorkingTreeFormat.set_default_format(__default_format)
3084
3016
# formats which have no format string are not discoverable