/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Ian Clatworthy
  • Date: 2009-07-13 06:58:49 UTC
  • mto: (4527.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4529.
  • Revision ID: ian.clatworthy@canonical.com-20090713065849-n7g2rsjyl6dt1mgv
Apply review feedback

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
59
65
    merge,
60
66
    revision as _mod_revision,
61
67
    revisiontree,
 
68
    textui,
62
69
    trace,
63
70
    transform,
64
71
    ui,
77
84
 
78
85
from bzrlib import symbol_versioning
79
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
 
from bzrlib.lock import LogicalLockResult
81
87
from bzrlib.lockable_files import LockableFiles
82
88
from bzrlib.lockdir import LockDir
83
89
import bzrlib.mutabletree
96
102
from bzrlib.filters import filtered_input_file
97
103
from bzrlib.trace import mutter, note
98
104
from bzrlib.transport.local import LocalTransport
 
105
from bzrlib.progress import DummyProgress, ProgressPhase
99
106
from bzrlib.revision import CURRENT_REVISION
100
107
from bzrlib.rio import RioReader, rio_file, Stanza
101
108
from bzrlib.symbol_versioning import (
105
112
 
106
113
 
107
114
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
 
# TODO: Modifying the conflict objects or their type is currently nearly
109
 
# impossible as there is no clear relationship between the working tree format
110
 
# and the conflict list file format.
111
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
116
 
113
117
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
172
        return ''
169
173
 
170
174
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
175
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
176
    """Working copy tree.
174
177
 
175
178
    The inventory is held in the `Branch` working-inventory, and the
248
251
        self._rules_searcher = None
249
252
        self.views = self._make_views()
250
253
 
251
 
    @property
252
 
    def user_transport(self):
253
 
        return self.bzrdir.user_transport
254
 
 
255
 
    @property
256
 
    def control_transport(self):
257
 
        return self._transport
258
 
 
259
254
    def _detect_case_handling(self):
260
255
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
256
        try:
286
281
        self._control_files.break_lock()
287
282
        self.branch.break_lock()
288
283
 
289
 
    def _get_check_refs(self):
290
 
        """Return the references needed to perform a check of this tree.
291
 
        
292
 
        The default implementation returns no refs, and is only suitable for
293
 
        trees that have no local caching and can commit on ghosts at any time.
294
 
 
295
 
        :seealso: bzrlib.check for details about check_refs.
296
 
        """
297
 
        return []
298
 
 
299
284
    def requires_rich_root(self):
300
285
        return self._format.requires_rich_root
301
286
 
463
448
        return (file_obj, stat_value)
464
449
 
465
450
    def get_file_text(self, file_id, path=None, filtered=True):
466
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
467
 
        try:
468
 
            return my_file.read()
469
 
        finally:
470
 
            my_file.close()
 
451
        return self.get_file(file_id, path=path, filtered=filtered).read()
471
452
 
472
453
    def get_file_byname(self, filename, filtered=True):
473
454
        path = self.abspath(filename)
527
508
 
528
509
        # Now we have the parents of this content
529
510
        annotator = self.branch.repository.texts.get_annotator()
530
 
        text = self.get_file_text(file_id)
 
511
        text = self.get_file(file_id).read()
531
512
        this_key =(file_id, default_revision)
532
513
        annotator.add_special_text(this_key, file_parent_keys, text)
533
514
        annotations = [(key[-1], line)
553
534
        else:
554
535
            parents = [last_rev]
555
536
        try:
556
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
537
            merges_file = self._transport.get('pending-merges')
557
538
        except errors.NoSuchFile:
558
539
            pass
559
540
        else:
560
 
            for l in osutils.split_lines(merges_bytes):
 
541
            for l in merges_file.readlines():
561
542
                revision_id = l.rstrip('\n')
562
543
                parents.append(revision_id)
563
544
        return parents
622
603
 
623
604
    def get_file_size(self, file_id):
624
605
        """See Tree.get_file_size"""
625
 
        # XXX: this returns the on-disk size; it should probably return the
626
 
        # canonical size
627
606
        try:
628
607
            return os.path.getsize(self.id2abspath(file_id))
629
608
        except OSError, e:
645
624
 
646
625
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
647
626
        file_id = self.path2id(path)
648
 
        if file_id is None:
649
 
            # For unversioned files on win32, we just assume they are not
650
 
            # executable
651
 
            return False
652
627
        return self._inventory[file_id].executable
653
628
 
654
629
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
764
739
            raise
765
740
        kind = _mapper(stat_result.st_mode)
766
741
        if kind == 'file':
767
 
            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))
768
747
        elif kind == 'directory':
769
748
            # perhaps it looks like a plain directory, but it's really a
770
749
            # reference.
777
756
        else:
778
757
            return (kind, None, None, None)
779
758
 
780
 
    def _file_content_summary(self, path, stat_result):
781
 
        size = stat_result.st_size
782
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
783
 
        # try for a stat cache lookup
784
 
        return ('file', size, executable, self._sha_from_stat(
785
 
            path, stat_result))
786
 
 
787
759
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
788
760
        """Common ghost checking functionality from set_parent_*.
789
761
 
909
881
 
910
882
    @needs_write_lock # because merge pulls data into the branch.
911
883
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
912
 
                          merge_type=None, force=False):
 
884
        merge_type=None):
913
885
        """Merge from a branch into this working tree.
914
886
 
915
887
        :param branch: The branch to merge from.
919
891
            branch.last_revision().
920
892
        """
921
893
        from bzrlib.merge import Merger, Merge3Merger
922
 
        merger = Merger(self.branch, this_tree=self)
923
 
        # check that there are no local alterations
924
 
        if not force and self.has_changes():
925
 
            raise errors.UncommittedChanges(self)
926
 
        if to_revision is None:
927
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
928
 
        merger.other_rev_id = to_revision
929
 
        if _mod_revision.is_null(merger.other_rev_id):
930
 
            raise errors.NoCommits(branch)
931
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
932
 
        merger.other_basis = merger.other_rev_id
933
 
        merger.other_tree = self.branch.repository.revision_tree(
934
 
            merger.other_rev_id)
935
 
        merger.other_branch = branch
936
 
        if from_revision is None:
937
 
            merger.find_base()
938
 
        else:
939
 
            merger.set_base_revision(from_revision, branch)
940
 
        if merger.base_rev_id == merger.other_rev_id:
941
 
            raise errors.PointlessMerge
942
 
        merger.backup_files = False
943
 
        if merge_type is None:
944
 
            merger.merge_type = Merge3Merger
945
 
        else:
946
 
            merger.merge_type = merge_type
947
 
        merger.set_interesting_files(None)
948
 
        merger.show_base = False
949
 
        merger.reprocess = False
950
 
        conflicts = merger.do_merge()
951
 
        merger.set_pending()
 
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()
952
931
        return conflicts
953
932
 
954
933
    @needs_read_lock
1101
1080
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1102
1081
        if tree_transport.base != branch_transport.base:
1103
1082
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1104
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1105
 
                target_branch=new_branch)
 
1083
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1106
1084
        else:
1107
1085
            tree_bzrdir = branch_bzrdir
1108
1086
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1146
1124
        This does not include files that have been deleted in this
1147
1125
        tree. Skips the control directory.
1148
1126
 
1149
 
        :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
1150
1128
        :param from_dir: start from this directory or None for the root
1151
1129
        :param recursive: whether to recurse into subdirectories or not
1152
1130
        """
1498
1476
        from_tail = splitpath(from_rel)[-1]
1499
1477
        from_id = inv.path2id(from_rel)
1500
1478
        if from_id is None:
1501
 
            # if file is missing in the inventory maybe it's in the basis_tree
1502
 
            basis_tree = self.branch.basis_tree()
1503
 
            from_id = basis_tree.path2id(from_rel)
1504
 
            if from_id is None:
1505
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1506
 
                    errors.NotVersionedError(path=str(from_rel)))
1507
 
            # put entry back in the inventory so we can rename it
1508
 
            from_entry = basis_tree.inventory[from_id].copy()
1509
 
            inv.add(from_entry)
1510
 
        else:
1511
 
            from_entry = inv[from_id]
 
1479
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1480
                errors.NotVersionedError(path=str(from_rel)))
 
1481
        from_entry = inv[from_id]
1512
1482
        from_parent_id = from_entry.parent_id
1513
1483
        to_dir, to_tail = os.path.split(to_rel)
1514
1484
        to_dir_id = inv.path2id(to_dir)
1606
1576
    @needs_write_lock
1607
1577
    def pull(self, source, overwrite=False, stop_revision=None,
1608
1578
             change_reporter=None, possible_transports=None, local=False):
 
1579
        top_pb = ui.ui_factory.nested_progress_bar()
1609
1580
        source.lock_read()
1610
1581
        try:
 
1582
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1583
            pp.next_phase()
1611
1584
            old_revision_info = self.branch.last_revision_info()
1612
1585
            basis_tree = self.basis_tree()
1613
1586
            count = self.branch.pull(source, overwrite, stop_revision,
1615
1588
                                     local=local)
1616
1589
            new_revision_info = self.branch.last_revision_info()
1617
1590
            if new_revision_info != old_revision_info:
 
1591
                pp.next_phase()
1618
1592
                repository = self.branch.repository
 
1593
                pb = ui.ui_factory.nested_progress_bar()
1619
1594
                basis_tree.lock_read()
1620
1595
                try:
1621
1596
                    new_basis_tree = self.branch.basis_tree()
1624
1599
                                new_basis_tree,
1625
1600
                                basis_tree,
1626
1601
                                this_tree=self,
1627
 
                                pb=None,
 
1602
                                pb=pb,
1628
1603
                                change_reporter=change_reporter)
1629
 
                    basis_root_id = basis_tree.get_root_id()
1630
 
                    new_root_id = new_basis_tree.get_root_id()
1631
 
                    if basis_root_id != new_root_id:
1632
 
                        self.set_root_id(new_root_id)
 
1604
                    if (basis_tree.inventory.root is None and
 
1605
                        new_basis_tree.inventory.root is not None):
 
1606
                        self.set_root_id(new_basis_tree.get_root_id())
1633
1607
                finally:
 
1608
                    pb.finished()
1634
1609
                    basis_tree.unlock()
1635
1610
                # TODO - dedup parents list with things merged by pull ?
1636
1611
                # reuse the revisiontree we merged against to set the new
1649
1624
            return count
1650
1625
        finally:
1651
1626
            source.unlock()
 
1627
            top_pb.finished()
1652
1628
 
1653
1629
    @needs_write_lock
1654
1630
    def put_file_bytes_non_atomic(self, file_id, bytes):
1739
1715
        r"""Check whether the filename matches an ignore pattern.
1740
1716
 
1741
1717
        Patterns containing '/' or '\' need to match the whole path;
1742
 
        others match against only the last component.  Patterns starting
1743
 
        with '!' are ignore exceptions.  Exceptions take precedence
1744
 
        over regular patterns and cause the filename to not be ignored.
 
1718
        others match against only the last component.
1745
1719
 
1746
1720
        If the file is ignored, returns the pattern which caused it to
1747
1721
        be ignored, otherwise None.  So this can simply be used as a
1748
1722
        boolean if desired."""
1749
1723
        if getattr(self, '_ignoreglobster', None) is None:
1750
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1724
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1751
1725
        return self._ignoreglobster.match(filename)
1752
1726
 
1753
1727
    def kind(self, file_id):
1803
1777
            raise errors.ObjectNotLocked(self)
1804
1778
 
1805
1779
    def lock_read(self):
1806
 
        """Lock the tree for reading.
1807
 
 
1808
 
        This also locks the branch, and can be unlocked via self.unlock().
1809
 
 
1810
 
        :return: A bzrlib.lock.LogicalLockResult.
1811
 
        """
 
1780
        """See Branch.lock_read, and WorkingTree.unlock."""
1812
1781
        if not self.is_locked():
1813
1782
            self._reset_data()
1814
1783
        self.branch.lock_read()
1815
1784
        try:
1816
 
            self._control_files.lock_read()
1817
 
            return LogicalLockResult(self.unlock)
 
1785
            return self._control_files.lock_read()
1818
1786
        except:
1819
1787
            self.branch.unlock()
1820
1788
            raise
1821
1789
 
1822
1790
    def lock_tree_write(self):
1823
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1824
 
 
1825
 
        :return: A bzrlib.lock.LogicalLockResult.
1826
 
        """
 
1791
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1827
1792
        if not self.is_locked():
1828
1793
            self._reset_data()
1829
1794
        self.branch.lock_read()
1830
1795
        try:
1831
 
            self._control_files.lock_write()
1832
 
            return LogicalLockResult(self.unlock)
 
1796
            return self._control_files.lock_write()
1833
1797
        except:
1834
1798
            self.branch.unlock()
1835
1799
            raise
1836
1800
 
1837
1801
    def lock_write(self):
1838
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1839
 
 
1840
 
        :return: A bzrlib.lock.LogicalLockResult.
1841
 
        """
 
1802
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1842
1803
        if not self.is_locked():
1843
1804
            self._reset_data()
1844
1805
        self.branch.lock_write()
1845
1806
        try:
1846
 
            self._control_files.lock_write()
1847
 
            return LogicalLockResult(self.unlock)
 
1807
            return self._control_files.lock_write()
1848
1808
        except:
1849
1809
            self.branch.unlock()
1850
1810
            raise
1858
1818
    def _reset_data(self):
1859
1819
        """Reset transient data that cannot be revalidated."""
1860
1820
        self._inventory_is_modified = False
1861
 
        f = self._transport.get('inventory')
1862
 
        try:
1863
 
            result = self._deserialize(f)
1864
 
        finally:
1865
 
            f.close()
 
1821
        result = self._deserialize(self._transport.get('inventory'))
1866
1822
        self._set_inventory(result, dirty=False)
1867
1823
 
1868
1824
    @needs_tree_write_lock
1915
1871
            # revision_id is set. We must check for this full string, because a
1916
1872
            # root node id can legitimately look like 'revision_id' but cannot
1917
1873
            # contain a '"'.
1918
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1874
            xml = self.branch.repository.get_inventory_xml(new_revision)
1919
1875
            firstline = xml.split('\n', 1)[0]
1920
1876
            if (not 'revision_id="' in firstline or
1921
1877
                'format="7"' not in firstline):
1922
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1923
 
                    xml, new_revision)
 
1878
                inv = self.branch.repository.deserialise_inventory(
 
1879
                    new_revision, xml)
1924
1880
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1925
1881
            self._write_basis_inventory(xml)
1926
1882
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1944
1900
        # binary.
1945
1901
        if self._inventory_is_modified:
1946
1902
            raise errors.InventoryModified(self)
1947
 
        f = self._transport.get('inventory')
1948
 
        try:
1949
 
            result = self._deserialize(f)
1950
 
        finally:
1951
 
            f.close()
 
1903
        result = self._deserialize(self._transport.get('inventory'))
1952
1904
        self._set_inventory(result, dirty=False)
1953
1905
        return result
1954
1906
 
1969
1921
 
1970
1922
        new_files=set()
1971
1923
        unknown_nested_files=set()
1972
 
        if to_file is None:
1973
 
            to_file = sys.stdout
1974
1924
 
1975
1925
        def recurse_directory_to_add_files(directory):
1976
1926
            # Recurse directory and add all files
1977
1927
            # so we can check if they have changed.
1978
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1928
            for parent_info, file_infos in\
 
1929
                self.walkdirs(directory):
1979
1930
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1980
1931
                    # Is it versioned or ignored?
1981
1932
                    if self.path2id(relpath) or self.is_ignored(relpath):
2016
1967
                            # ... but not ignored
2017
1968
                            has_changed_files = True
2018
1969
                            break
2019
 
                    elif (content_change and (kind[1] is not None) and
2020
 
                            osutils.is_inside_any(files, path[1])):
2021
 
                        # Versioned and changed, but not deleted, and still
2022
 
                        # in one of the dirs to be deleted.
 
1970
                    elif content_change and (kind[1] is not None):
 
1971
                        # Versioned and changed, but not deleted
2023
1972
                        has_changed_files = True
2024
1973
                        break
2025
1974
 
2047
1996
                        new_status = 'I'
2048
1997
                    else:
2049
1998
                        new_status = '?'
2050
 
                    # XXX: Really should be a more abstract reporter interface
2051
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2052
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1999
                    textui.show_status(new_status, self.kind(fid), f,
 
2000
                                       to_file=to_file)
2053
2001
                # Unversion file
2054
2002
                inv_delta.append((f, None, fid, None))
2055
2003
                message = "removed %s" % (f,)
2078
2026
 
2079
2027
    @needs_tree_write_lock
2080
2028
    def revert(self, filenames=None, old_tree=None, backups=True,
2081
 
               pb=None, report_changes=False):
 
2029
               pb=DummyProgress(), report_changes=False):
2082
2030
        from bzrlib.conflicts import resolve
2083
2031
        if filenames == []:
2084
2032
            filenames = None
2206
2154
        """
2207
2155
        raise NotImplementedError(self.unlock)
2208
2156
 
2209
 
    _marker = object()
2210
 
 
2211
 
    def update(self, change_reporter=None, possible_transports=None,
2212
 
               revision=None, old_tip=_marker):
 
2157
    def update(self, change_reporter=None, possible_transports=None):
2213
2158
        """Update a working tree along its branch.
2214
2159
 
2215
2160
        This will update the branch if its bound too, which means we have
2233
2178
        - Merge current state -> basis tree of the master w.r.t. the old tree
2234
2179
          basis.
2235
2180
        - Do a 'normal' merge of the old branch basis if it is relevant.
2236
 
 
2237
 
        :param revision: The target revision to update to. Must be in the
2238
 
            revision history.
2239
 
        :param old_tip: If branch.update() has already been run, the value it
2240
 
            returned (old tip of the branch or None). _marker is used
2241
 
            otherwise.
2242
2181
        """
2243
2182
        if self.branch.get_bound_location() is not None:
2244
2183
            self.lock_write()
2245
 
            update_branch = (old_tip is self._marker)
 
2184
            update_branch = True
2246
2185
        else:
2247
2186
            self.lock_tree_write()
2248
2187
            update_branch = False
2250
2189
            if update_branch:
2251
2190
                old_tip = self.branch.update(possible_transports)
2252
2191
            else:
2253
 
                if old_tip is self._marker:
2254
 
                    old_tip = None
2255
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2192
                old_tip = None
 
2193
            return self._update_tree(old_tip, change_reporter)
2256
2194
        finally:
2257
2195
            self.unlock()
2258
2196
 
2259
2197
    @needs_tree_write_lock
2260
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2198
    def _update_tree(self, old_tip=None, change_reporter=None):
2261
2199
        """Update a tree to the master branch.
2262
2200
 
2263
2201
        :param old_tip: if supplied, the previous tip revision the branch,
2273
2211
        # We MUST save it even if an error occurs, because otherwise the users
2274
2212
        # local work is unreferenced and will appear to have been lost.
2275
2213
        #
2276
 
        nb_conflicts = 0
 
2214
        result = 0
2277
2215
        try:
2278
2216
            last_rev = self.get_parent_ids()[0]
2279
2217
        except IndexError:
2280
2218
            last_rev = _mod_revision.NULL_REVISION
2281
 
        if revision is None:
2282
 
            revision = self.branch.last_revision()
2283
 
 
2284
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2285
 
 
2286
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2287
 
            # the branch we are bound to was updated
2288
 
            # merge those changes in first
2289
 
            base_tree  = self.basis_tree()
2290
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2291
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2292
 
                                             base_tree, this_tree=self,
2293
 
                                             change_reporter=change_reporter)
2294
 
            if nb_conflicts:
2295
 
                self.add_parent_tree((old_tip, other_tree))
2296
 
                trace.note('Rerun update after fixing the conflicts.')
2297
 
                return nb_conflicts
2298
 
 
2299
 
        if last_rev != _mod_revision.ensure_null(revision):
2300
 
            # the working tree is up to date with the branch
2301
 
            # we can merge the specified revision from master
2302
 
            to_tree = self.branch.repository.revision_tree(revision)
2303
 
            to_root_id = to_tree.get_root_id()
2304
 
 
 
2219
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2220
            # merge tree state up to new branch tip.
2305
2221
            basis = self.basis_tree()
2306
2222
            basis.lock_read()
2307
2223
            try:
2308
 
                if (basis.inventory.root is None
2309
 
                    or basis.inventory.root.file_id != to_root_id):
2310
 
                    self.set_root_id(to_root_id)
 
2224
                to_tree = self.branch.basis_tree()
 
2225
                if basis.inventory.root is None:
 
2226
                    self.set_root_id(to_tree.get_root_id())
2311
2227
                    self.flush()
 
2228
                result += merge.merge_inner(
 
2229
                                      self.branch,
 
2230
                                      to_tree,
 
2231
                                      basis,
 
2232
                                      this_tree=self,
 
2233
                                      change_reporter=change_reporter)
2312
2234
            finally:
2313
2235
                basis.unlock()
2314
 
 
2315
 
            # determine the branch point
2316
 
            graph = self.branch.repository.get_graph()
2317
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2318
 
                                                last_rev)
2319
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2320
 
 
2321
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2322
 
                                             this_tree=self,
2323
 
                                             change_reporter=change_reporter)
2324
 
            self.set_last_revision(revision)
2325
2236
            # TODO - dedup parents list with things merged by pull ?
2326
2237
            # reuse the tree we've updated to to set the basis:
2327
 
            parent_trees = [(revision, to_tree)]
 
2238
            parent_trees = [(self.branch.last_revision(), to_tree)]
2328
2239
            merges = self.get_parent_ids()[1:]
2329
2240
            # Ideally we ask the tree for the trees here, that way the working
2330
2241
            # tree can decide whether to give us the entire tree or give us a
2334
2245
            for parent in merges:
2335
2246
                parent_trees.append(
2336
2247
                    (parent, self.branch.repository.revision_tree(parent)))
2337
 
            if not _mod_revision.is_null(old_tip):
 
2248
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2338
2249
                parent_trees.append(
2339
2250
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2340
2251
            self.set_parent_trees(parent_trees)
2341
2252
            last_rev = parent_trees[0][0]
2342
 
        return nb_conflicts
 
2253
        else:
 
2254
            # the working tree had the same last-revision as the master
 
2255
            # branch did. We may still have pivot local work from the local
 
2256
            # branch into old_tip:
 
2257
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2258
                self.add_parent_tree_id(old_tip)
 
2259
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2260
            and old_tip != last_rev):
 
2261
            # our last revision was not the prior branch last revision
 
2262
            # and we have converted that last revision to a pending merge.
 
2263
            # base is somewhere between the branch tip now
 
2264
            # and the now pending merge
 
2265
 
 
2266
            # Since we just modified the working tree and inventory, flush out
 
2267
            # the current state, before we modify it again.
 
2268
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2269
            #       requires it only because TreeTransform directly munges the
 
2270
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2271
            #       should be able to remove this extra flush.
 
2272
            self.flush()
 
2273
            graph = self.branch.repository.get_graph()
 
2274
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2275
                                                old_tip)
 
2276
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2277
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2278
            result += merge.merge_inner(
 
2279
                                  self.branch,
 
2280
                                  other_tree,
 
2281
                                  base_tree,
 
2282
                                  this_tree=self,
 
2283
                                  change_reporter=change_reporter)
 
2284
        return result
2343
2285
 
2344
2286
    def _write_hashcache_if_dirty(self):
2345
2287
        """Write out the hashcache if it is dirty."""
2586
2528
        return un_resolved, resolved
2587
2529
 
2588
2530
    @needs_read_lock
2589
 
    def _check(self, references):
2590
 
        """Check the tree for consistency.
2591
 
 
2592
 
        :param references: A dict with keys matching the items returned by
2593
 
            self._get_check_refs(), and values from looking those keys up in
2594
 
            the repository.
2595
 
        """
 
2531
    def _check(self):
2596
2532
        tree_basis = self.basis_tree()
2597
2533
        tree_basis.lock_read()
2598
2534
        try:
2599
 
            repo_basis = references[('trees', self.last_revision())]
 
2535
            repo_basis = self.branch.repository.revision_tree(
 
2536
                self.last_revision())
2600
2537
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2601
2538
                raise errors.BzrCheckError(
2602
2539
                    "Mismatched basis inventory content.")
2615
2552
        """
2616
2553
        return
2617
2554
 
 
2555
    @needs_read_lock
2618
2556
    def _get_rules_searcher(self, default_searcher):
2619
2557
        """See Tree._get_rules_searcher."""
2620
2558
        if self._rules_searcher is None:
2647
2585
        if self._inventory is None:
2648
2586
            self.read_working_inventory()
2649
2587
 
2650
 
    def _get_check_refs(self):
2651
 
        """Return the references needed to perform a check of this tree."""
2652
 
        return [('trees', self.last_revision())]
2653
 
 
2654
2588
    def lock_tree_write(self):
2655
2589
        """See WorkingTree.lock_tree_write().
2656
2590
 
2657
2591
        In Format2 WorkingTrees we have a single lock for the branch and tree
2658
2592
        so lock_tree_write() degrades to lock_write().
2659
 
 
2660
 
        :return: An object with an unlock method which will release the lock
2661
 
            obtained.
2662
2593
        """
2663
2594
        self.branch.lock_write()
2664
2595
        try:
2665
 
            self._control_files.lock_write()
2666
 
            return self
 
2596
            return self._control_files.lock_write()
2667
2597
        except:
2668
2598
            self.branch.unlock()
2669
2599
            raise
2717
2647
                mode=self.bzrdir._get_file_mode())
2718
2648
            return True
2719
2649
 
2720
 
    def _get_check_refs(self):
2721
 
        """Return the references needed to perform a check of this tree."""
2722
 
        return [('trees', self.last_revision())]
2723
 
 
2724
2650
    @needs_tree_write_lock
2725
2651
    def set_conflicts(self, conflicts):
2726
2652
        self._put_rio('conflicts', conflicts.to_stanzas(),
2803
2729
        """Return the format for the working tree object in a_bzrdir."""
2804
2730
        try:
2805
2731
            transport = a_bzrdir.get_workingtree_transport(None)
2806
 
            format_string = transport.get_bytes("format")
 
2732
            format_string = transport.get("format").read()
2807
2733
            return klass._formats[format_string]
2808
2734
        except errors.NoSuchFile:
2809
2735
            raise errors.NoWorkingTree(base=transport.base)
3073
2999
        return self.get_format_string()
3074
3000
 
3075
3001
 
3076
 
__default_format = WorkingTreeFormat6()
 
3002
__default_format = WorkingTreeFormat4()
3077
3003
WorkingTreeFormat.register_format(__default_format)
 
3004
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3078
3005
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3079
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3080
3006
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3081
3007
WorkingTreeFormat.set_default_format(__default_format)
3082
3008
# formats which have no format string are not discoverable