← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-08 15:24:31 UTC
  • mto: (4516.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4519.
  • Revision ID: v.ladeuil+lp@free.fr-20090708152431-i49iqbrzb7xx6hob
Delete spurious import.

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 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
52
58
    errors,
53
59
    generate_ids,
54
60
    globbing,
55
 
    graph as _mod_graph,
56
61
    hashcache,
57
62
    ignores,
58
63
    inventory,
59
64
    merge,
60
65
    revision as _mod_revision,
61
66
    revisiontree,
 
67
    textui,
62
68
    trace,
63
69
    transform,
64
70
    ui,
95
101
from bzrlib.filters import filtered_input_file
96
102
from bzrlib.trace import mutter, note
97
103
from bzrlib.transport.local import LocalTransport
 
104
from bzrlib.progress import DummyProgress, ProgressPhase
98
105
from bzrlib.revision import CURRENT_REVISION
99
106
from bzrlib.rio import RioReader, rio_file, Stanza
100
107
from bzrlib.symbol_versioning import (
104
111
 
105
112
 
106
113
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
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
115
 
112
116
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
171
        return ''
168
172
 
169
173
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
174
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
175
    """Working copy tree.
173
176
 
174
177
    The inventory is held in the `Branch` working-inventory, and the
247
250
        self._rules_searcher = None
248
251
        self.views = self._make_views()
249
252
 
250
 
    @property
251
 
    def user_transport(self):
252
 
        return self.bzrdir.user_transport
253
 
 
254
 
    @property
255
 
    def control_transport(self):
256
 
        return self._transport
257
 
 
258
253
    def _detect_case_handling(self):
259
254
        wt_trans = self.bzrdir.get_workingtree_transport(None)
260
255
        try:
285
280
        self._control_files.break_lock()
286
281
        self.branch.break_lock()
287
282
 
288
 
    def _get_check_refs(self):
289
 
        """Return the references needed to perform a check of this tree.
290
 
        
291
 
        The default implementation returns no refs, and is only suitable for
292
 
        trees that have no local caching and can commit on ghosts at any time.
293
 
 
294
 
        :seealso: bzrlib.check for details about check_refs.
295
 
        """
296
 
        return []
297
 
 
298
283
    def requires_rich_root(self):
299
284
        return self._format.requires_rich_root
300
285
 
492
477
        incorrectly attributed to CURRENT_REVISION (but after committing, the
493
478
        attribution will be correct).
494
479
        """
495
 
        maybe_file_parent_keys = []
496
 
        for parent_id in self.get_parent_ids():
497
 
            try:
498
 
                parent_tree = self.revision_tree(parent_id)
499
 
            except errors.NoSuchRevisionInTree:
500
 
                parent_tree = self.branch.repository.revision_tree(parent_id)
501
 
            parent_tree.lock_read()
502
 
            try:
503
 
                if file_id not in parent_tree:
504
 
                    continue
505
 
                ie = parent_tree.inventory[file_id]
506
 
                if ie.kind != 'file':
507
 
                    # Note: this is slightly unnecessary, because symlinks and
508
 
                    # directories have a "text" which is the empty text, and we
509
 
                    # know that won't mess up annotations. But it seems cleaner
510
 
                    continue
511
 
                parent_text_key = (file_id, ie.revision)
512
 
                if parent_text_key not in maybe_file_parent_keys:
513
 
                    maybe_file_parent_keys.append(parent_text_key)
514
 
            finally:
515
 
                parent_tree.unlock()
516
 
        graph = _mod_graph.Graph(self.branch.repository.texts)
517
 
        heads = graph.heads(maybe_file_parent_keys)
518
 
        file_parent_keys = []
519
 
        for key in maybe_file_parent_keys:
520
 
            if key in heads:
521
 
                file_parent_keys.append(key)
522
 
 
523
 
        # Now we have the parents of this content
524
 
        annotator = self.branch.repository.texts.get_annotator()
525
 
        text = self.get_file(file_id).read()
526
 
        this_key =(file_id, default_revision)
527
 
        annotator.add_special_text(this_key, file_parent_keys, text)
528
 
        annotations = [(key[-1], line)
529
 
                       for key, line in annotator.annotate_flat(this_key)]
530
 
        return annotations
 
480
        basis = self.basis_tree()
 
481
        basis.lock_read()
 
482
        try:
 
483
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
484
                require_versioned=True).next()
 
485
            changed_content, kind = changes[2], changes[6]
 
486
            if not changed_content:
 
487
                return basis.annotate_iter(file_id)
 
488
            if kind[1] is None:
 
489
                return None
 
490
            import annotate
 
491
            if kind[0] != 'file':
 
492
                old_lines = []
 
493
            else:
 
494
                old_lines = list(basis.annotate_iter(file_id))
 
495
            old = [old_lines]
 
496
            for tree in self.branch.repository.revision_trees(
 
497
                self.get_parent_ids()[1:]):
 
498
                if file_id not in tree:
 
499
                    continue
 
500
                old.append(list(tree.annotate_iter(file_id)))
 
501
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
502
                                       default_revision)
 
503
        finally:
 
504
            basis.unlock()
531
505
 
532
506
    def _get_ancestors(self, default_revision):
533
507
        ancestors = set([default_revision])
548
522
        else:
549
523
            parents = [last_rev]
550
524
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
525
            merges_file = self._transport.get('pending-merges')
552
526
        except errors.NoSuchFile:
553
527
            pass
554
528
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
529
            for l in merges_file.readlines():
556
530
                revision_id = l.rstrip('\n')
557
531
                parents.append(revision_id)
558
532
        return parents
617
591
 
618
592
    def get_file_size(self, file_id):
619
593
        """See Tree.get_file_size"""
620
 
        # XXX: this returns the on-disk size; it should probably return the
621
 
        # canonical size
622
594
        try:
623
595
            return os.path.getsize(self.id2abspath(file_id))
624
596
        except OSError, e:
640
612
 
641
613
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
614
        file_id = self.path2id(path)
643
 
        if file_id is None:
644
 
            # For unversioned files on win32, we just assume they are not
645
 
            # executable
646
 
            return False
647
615
        return self._inventory[file_id].executable
648
616
 
649
617
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
759
727
            raise
760
728
        kind = _mapper(stat_result.st_mode)
761
729
        if kind == 'file':
762
 
            return self._file_content_summary(path, stat_result)
 
730
            size = stat_result.st_size
 
731
            # try for a stat cache lookup
 
732
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
733
            return (kind, size, executable, self._sha_from_stat(
 
734
                path, stat_result))
763
735
        elif kind == 'directory':
764
736
            # perhaps it looks like a plain directory, but it's really a
765
737
            # reference.
772
744
        else:
773
745
            return (kind, None, None, None)
774
746
 
775
 
    def _file_content_summary(self, path, stat_result):
776
 
        size = stat_result.st_size
777
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
778
 
        # try for a stat cache lookup
779
 
        return ('file', size, executable, self._sha_from_stat(
780
 
            path, stat_result))
781
 
 
782
747
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
748
        """Common ghost checking functionality from set_parent_*.
784
749
 
904
869
 
905
870
    @needs_write_lock # because merge pulls data into the branch.
906
871
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
872
        merge_type=None):
908
873
        """Merge from a branch into this working tree.
909
874
 
910
875
        :param branch: The branch to merge from.
914
879
            branch.last_revision().
915
880
        """
916
881
        from bzrlib.merge import Merger, Merge3Merger
917
 
        merger = Merger(self.branch, this_tree=self)
918
 
        # check that there are no local alterations
919
 
        if not force and self.has_changes():
920
 
            raise errors.UncommittedChanges(self)
921
 
        if to_revision is None:
922
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
923
 
        merger.other_rev_id = to_revision
924
 
        if _mod_revision.is_null(merger.other_rev_id):
925
 
            raise errors.NoCommits(branch)
926
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
 
        merger.other_basis = merger.other_rev_id
928
 
        merger.other_tree = self.branch.repository.revision_tree(
929
 
            merger.other_rev_id)
930
 
        merger.other_branch = branch
931
 
        if from_revision is None:
932
 
            merger.find_base()
933
 
        else:
934
 
            merger.set_base_revision(from_revision, branch)
935
 
        if merger.base_rev_id == merger.other_rev_id:
936
 
            raise errors.PointlessMerge
937
 
        merger.backup_files = False
938
 
        if merge_type is None:
939
 
            merger.merge_type = Merge3Merger
940
 
        else:
941
 
            merger.merge_type = merge_type
942
 
        merger.set_interesting_files(None)
943
 
        merger.show_base = False
944
 
        merger.reprocess = False
945
 
        conflicts = merger.do_merge()
946
 
        merger.set_pending()
 
882
        pb = ui.ui_factory.nested_progress_bar()
 
883
        try:
 
884
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
885
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
886
            merger.pp.next_phase()
 
887
            # check that there are no
 
888
            # local alterations
 
889
            merger.check_basis(check_clean=True, require_commits=False)
 
890
            if to_revision is None:
 
891
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
892
            merger.other_rev_id = to_revision
 
893
            if _mod_revision.is_null(merger.other_rev_id):
 
894
                raise errors.NoCommits(branch)
 
895
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
896
            merger.other_basis = merger.other_rev_id
 
897
            merger.other_tree = self.branch.repository.revision_tree(
 
898
                merger.other_rev_id)
 
899
            merger.other_branch = branch
 
900
            merger.pp.next_phase()
 
901
            if from_revision is None:
 
902
                merger.find_base()
 
903
            else:
 
904
                merger.set_base_revision(from_revision, branch)
 
905
            if merger.base_rev_id == merger.other_rev_id:
 
906
                raise errors.PointlessMerge
 
907
            merger.backup_files = False
 
908
            if merge_type is None:
 
909
                merger.merge_type = Merge3Merger
 
910
            else:
 
911
                merger.merge_type = merge_type
 
912
            merger.set_interesting_files(None)
 
913
            merger.show_base = False
 
914
            merger.reprocess = False
 
915
            conflicts = merger.do_merge()
 
916
            merger.set_pending()
 
917
        finally:
 
918
            pb.finished()
947
919
        return conflicts
948
920
 
949
921
    @needs_read_lock
1096
1068
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1069
        if tree_transport.base != branch_transport.base:
1098
1070
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1071
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1072
        else:
1102
1073
            tree_bzrdir = branch_bzrdir
1103
1074
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1112
        This does not include files that have been deleted in this
1142
1113
        tree. Skips the control directory.
1143
1114
 
1144
 
        :param include_root: if True, return an entry for the root
 
1115
        :param include_root: if True, do not return an entry for the root
1145
1116
        :param from_dir: start from this directory or None for the root
1146
1117
        :param recursive: whether to recurse into subdirectories or not
1147
1118
        """
1493
1464
        from_tail = splitpath(from_rel)[-1]
1494
1465
        from_id = inv.path2id(from_rel)
1495
1466
        if from_id is None:
1496
 
            # if file is missing in the inventory maybe it's in the basis_tree
1497
 
            basis_tree = self.branch.basis_tree()
1498
 
            from_id = basis_tree.path2id(from_rel)
1499
 
            if from_id is None:
1500
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1501
 
                    errors.NotVersionedError(path=str(from_rel)))
1502
 
            # put entry back in the inventory so we can rename it
1503
 
            from_entry = basis_tree.inventory[from_id].copy()
1504
 
            inv.add(from_entry)
1505
 
        else:
1506
 
            from_entry = inv[from_id]
 
1467
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1468
                errors.NotVersionedError(path=str(from_rel)))
 
1469
        from_entry = inv[from_id]
1507
1470
        from_parent_id = from_entry.parent_id
1508
1471
        to_dir, to_tail = os.path.split(to_rel)
1509
1472
        to_dir_id = inv.path2id(to_dir)
1601
1564
    @needs_write_lock
1602
1565
    def pull(self, source, overwrite=False, stop_revision=None,
1603
1566
             change_reporter=None, possible_transports=None, local=False):
 
1567
        top_pb = ui.ui_factory.nested_progress_bar()
1604
1568
        source.lock_read()
1605
1569
        try:
 
1570
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1571
            pp.next_phase()
1606
1572
            old_revision_info = self.branch.last_revision_info()
1607
1573
            basis_tree = self.basis_tree()
1608
1574
            count = self.branch.pull(source, overwrite, stop_revision,
1610
1576
                                     local=local)
1611
1577
            new_revision_info = self.branch.last_revision_info()
1612
1578
            if new_revision_info != old_revision_info:
 
1579
                pp.next_phase()
1613
1580
                repository = self.branch.repository
 
1581
                pb = ui.ui_factory.nested_progress_bar()
1614
1582
                basis_tree.lock_read()
1615
1583
                try:
1616
1584
                    new_basis_tree = self.branch.basis_tree()
1619
1587
                                new_basis_tree,
1620
1588
                                basis_tree,
1621
1589
                                this_tree=self,
1622
 
                                pb=None,
 
1590
                                pb=pb,
1623
1591
                                change_reporter=change_reporter)
1624
 
                    basis_root_id = basis_tree.get_root_id()
1625
 
                    new_root_id = new_basis_tree.get_root_id()
1626
 
                    if basis_root_id != new_root_id:
1627
 
                        self.set_root_id(new_root_id)
 
1592
                    if (basis_tree.inventory.root is None and
 
1593
                        new_basis_tree.inventory.root is not None):
 
1594
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1595
                finally:
 
1596
                    pb.finished()
1629
1597
                    basis_tree.unlock()
1630
1598
                # TODO - dedup parents list with things merged by pull ?
1631
1599
                # reuse the revisiontree we merged against to set the new
1644
1612
            return count
1645
1613
        finally:
1646
1614
            source.unlock()
 
1615
            top_pb.finished()
1647
1616
 
1648
1617
    @needs_write_lock
1649
1618
    def put_file_bytes_non_atomic(self, file_id, bytes):
1734
1703
        r"""Check whether the filename matches an ignore pattern.
1735
1704
 
1736
1705
        Patterns containing '/' or '\' need to match the whole path;
1737
 
        others match against only the last component.  Patterns starting
1738
 
        with '!' are ignore exceptions.  Exceptions take precedence
1739
 
        over regular patterns and cause the filename to not be ignored.
 
1706
        others match against only the last component.
1740
1707
 
1741
1708
        If the file is ignored, returns the pattern which caused it to
1742
1709
        be ignored, otherwise None.  So this can simply be used as a
1743
1710
        boolean if desired."""
1744
1711
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1712
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1713
        return self._ignoreglobster.match(filename)
1747
1714
 
1748
1715
    def kind(self, file_id):
1839
1806
    def _reset_data(self):
1840
1807
        """Reset transient data that cannot be revalidated."""
1841
1808
        self._inventory_is_modified = False
1842
 
        f = self._transport.get('inventory')
1843
 
        try:
1844
 
            result = self._deserialize(f)
1845
 
        finally:
1846
 
            f.close()
 
1809
        result = self._deserialize(self._transport.get('inventory'))
1847
1810
        self._set_inventory(result, dirty=False)
1848
1811
 
1849
1812
    @needs_tree_write_lock
1896
1859
            # revision_id is set. We must check for this full string, because a
1897
1860
            # root node id can legitimately look like 'revision_id' but cannot
1898
1861
            # contain a '"'.
1899
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1862
            xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1863
            firstline = xml.split('\n', 1)[0]
1901
1864
            if (not 'revision_id="' in firstline or
1902
1865
                'format="7"' not in firstline):
1903
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1904
 
                    xml, new_revision)
 
1866
                inv = self.branch.repository.deserialise_inventory(
 
1867
                    new_revision, xml)
1905
1868
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1906
1869
            self._write_basis_inventory(xml)
1907
1870
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
1888
        # binary.
1926
1889
        if self._inventory_is_modified:
1927
1890
            raise errors.InventoryModified(self)
1928
 
        f = self._transport.get('inventory')
1929
 
        try:
1930
 
            result = self._deserialize(f)
1931
 
        finally:
1932
 
            f.close()
 
1891
        result = self._deserialize(self._transport.get('inventory'))
1933
1892
        self._set_inventory(result, dirty=False)
1934
1893
        return result
1935
1894
 
1950
1909
 
1951
1910
        new_files=set()
1952
1911
        unknown_nested_files=set()
1953
 
        if to_file is None:
1954
 
            to_file = sys.stdout
1955
1912
 
1956
1913
        def recurse_directory_to_add_files(directory):
1957
1914
            # Recurse directory and add all files
2027
1984
                        new_status = 'I'
2028
1985
                    else:
2029
1986
                        new_status = '?'
2030
 
                    # XXX: Really should be a more abstract reporter interface
2031
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2032
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1987
                    textui.show_status(new_status, self.kind(fid), f,
 
1988
                                       to_file=to_file)
2033
1989
                # Unversion file
2034
1990
                inv_delta.append((f, None, fid, None))
2035
1991
                message = "removed %s" % (f,)
2058
2014
 
2059
2015
    @needs_tree_write_lock
2060
2016
    def revert(self, filenames=None, old_tree=None, backups=True,
2061
 
               pb=None, report_changes=False):
 
2017
               pb=DummyProgress(), report_changes=False):
2062
2018
        from bzrlib.conflicts import resolve
2063
2019
        if filenames == []:
2064
2020
            filenames = None
2186
2142
        """
2187
2143
        raise NotImplementedError(self.unlock)
2188
2144
 
2189
 
    _marker = object()
2190
 
 
2191
 
    def update(self, change_reporter=None, possible_transports=None,
2192
 
               revision=None, old_tip=_marker):
 
2145
    def update(self, change_reporter=None, possible_transports=None):
2193
2146
        """Update a working tree along its branch.
2194
2147
 
2195
2148
        This will update the branch if its bound too, which means we have
2213
2166
        - Merge current state -> basis tree of the master w.r.t. the old tree
2214
2167
          basis.
2215
2168
        - Do a 'normal' merge of the old branch basis if it is relevant.
2216
 
 
2217
 
        :param revision: The target revision to update to. Must be in the
2218
 
            revision history.
2219
 
        :param old_tip: If branch.update() has already been run, the value it
2220
 
            returned (old tip of the branch or None). _marker is used
2221
 
            otherwise.
2222
2169
        """
2223
2170
        if self.branch.get_bound_location() is not None:
2224
2171
            self.lock_write()
2225
 
            update_branch = (old_tip is self._marker)
 
2172
            update_branch = True
2226
2173
        else:
2227
2174
            self.lock_tree_write()
2228
2175
            update_branch = False
2230
2177
            if update_branch:
2231
2178
                old_tip = self.branch.update(possible_transports)
2232
2179
            else:
2233
 
                if old_tip is self._marker:
2234
 
                    old_tip = None
2235
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2180
                old_tip = None
 
2181
            return self._update_tree(old_tip, change_reporter)
2236
2182
        finally:
2237
2183
            self.unlock()
2238
2184
 
2239
2185
    @needs_tree_write_lock
2240
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2186
    def _update_tree(self, old_tip=None, change_reporter=None):
2241
2187
        """Update a tree to the master branch.
2242
2188
 
2243
2189
        :param old_tip: if supplied, the previous tip revision the branch,
2253
2199
        # We MUST save it even if an error occurs, because otherwise the users
2254
2200
        # local work is unreferenced and will appear to have been lost.
2255
2201
        #
2256
 
        nb_conflicts = 0
 
2202
        result = 0
2257
2203
        try:
2258
2204
            last_rev = self.get_parent_ids()[0]
2259
2205
        except IndexError:
2260
2206
            last_rev = _mod_revision.NULL_REVISION
2261
 
        if revision is None:
2262
 
            revision = self.branch.last_revision()
2263
 
 
2264
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2265
 
 
2266
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
 
            # the branch we are bound to was updated
2268
 
            # merge those changes in first
2269
 
            base_tree  = self.basis_tree()
2270
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2271
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
 
                                             base_tree, this_tree=self,
2273
 
                                             change_reporter=change_reporter)
2274
 
            if nb_conflicts:
2275
 
                self.add_parent_tree((old_tip, other_tree))
2276
 
                trace.note('Rerun update after fixing the conflicts.')
2277
 
                return nb_conflicts
2278
 
 
2279
 
        if last_rev != _mod_revision.ensure_null(revision):
2280
 
            # the working tree is up to date with the branch
2281
 
            # we can merge the specified revision from master
2282
 
            to_tree = self.branch.repository.revision_tree(revision)
2283
 
            to_root_id = to_tree.get_root_id()
2284
 
 
 
2207
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2208
            # merge tree state up to new branch tip.
2285
2209
            basis = self.basis_tree()
2286
2210
            basis.lock_read()
2287
2211
            try:
2288
 
                if (basis.inventory.root is None
2289
 
                    or basis.inventory.root.file_id != to_root_id):
2290
 
                    self.set_root_id(to_root_id)
 
2212
                to_tree = self.branch.basis_tree()
 
2213
                if basis.inventory.root is None:
 
2214
                    self.set_root_id(to_tree.get_root_id())
2291
2215
                    self.flush()
 
2216
                result += merge.merge_inner(
 
2217
                                      self.branch,
 
2218
                                      to_tree,
 
2219
                                      basis,
 
2220
                                      this_tree=self,
 
2221
                                      change_reporter=change_reporter)
2292
2222
            finally:
2293
2223
                basis.unlock()
2294
 
 
2295
 
            # determine the branch point
2296
 
            graph = self.branch.repository.get_graph()
2297
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2298
 
                                                last_rev)
2299
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2300
 
 
2301
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2302
 
                                             this_tree=self,
2303
 
                                             change_reporter=change_reporter)
2304
 
            self.set_last_revision(revision)
2305
2224
            # TODO - dedup parents list with things merged by pull ?
2306
2225
            # reuse the tree we've updated to to set the basis:
2307
 
            parent_trees = [(revision, to_tree)]
 
2226
            parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2227
            merges = self.get_parent_ids()[1:]
2309
2228
            # Ideally we ask the tree for the trees here, that way the working
2310
2229
            # tree can decide whether to give us the entire tree or give us a
2314
2233
            for parent in merges:
2315
2234
                parent_trees.append(
2316
2235
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2236
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2237
                parent_trees.append(
2319
2238
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2239
            self.set_parent_trees(parent_trees)
2321
2240
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2241
        else:
 
2242
            # the working tree had the same last-revision as the master
 
2243
            # branch did. We may still have pivot local work from the local
 
2244
            # branch into old_tip:
 
2245
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2246
                self.add_parent_tree_id(old_tip)
 
2247
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2248
            and old_tip != last_rev):
 
2249
            # our last revision was not the prior branch last revision
 
2250
            # and we have converted that last revision to a pending merge.
 
2251
            # base is somewhere between the branch tip now
 
2252
            # and the now pending merge
 
2253
 
 
2254
            # Since we just modified the working tree and inventory, flush out
 
2255
            # the current state, before we modify it again.
 
2256
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2257
            #       requires it only because TreeTransform directly munges the
 
2258
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2259
            #       should be able to remove this extra flush.
 
2260
            self.flush()
 
2261
            graph = self.branch.repository.get_graph()
 
2262
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2263
                                                old_tip)
 
2264
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2265
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2266
            result += merge.merge_inner(
 
2267
                                  self.branch,
 
2268
                                  other_tree,
 
2269
                                  base_tree,
 
2270
                                  this_tree=self,
 
2271
                                  change_reporter=change_reporter)
 
2272
        return result
2323
2273
 
2324
2274
    def _write_hashcache_if_dirty(self):
2325
2275
        """Write out the hashcache if it is dirty."""
2566
2516
        return un_resolved, resolved
2567
2517
 
2568
2518
    @needs_read_lock
2569
 
    def _check(self, references):
2570
 
        """Check the tree for consistency.
2571
 
 
2572
 
        :param references: A dict with keys matching the items returned by
2573
 
            self._get_check_refs(), and values from looking those keys up in
2574
 
            the repository.
2575
 
        """
 
2519
    def _check(self):
2576
2520
        tree_basis = self.basis_tree()
2577
2521
        tree_basis.lock_read()
2578
2522
        try:
2579
 
            repo_basis = references[('trees', self.last_revision())]
 
2523
            repo_basis = self.branch.repository.revision_tree(
 
2524
                self.last_revision())
2580
2525
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
2526
                raise errors.BzrCheckError(
2582
2527
                    "Mismatched basis inventory content.")
2595
2540
        """
2596
2541
        return
2597
2542
 
 
2543
    @needs_read_lock
2598
2544
    def _get_rules_searcher(self, default_searcher):
2599
2545
        """See Tree._get_rules_searcher."""
2600
2546
        if self._rules_searcher is None:
2627
2573
        if self._inventory is None:
2628
2574
            self.read_working_inventory()
2629
2575
 
2630
 
    def _get_check_refs(self):
2631
 
        """Return the references needed to perform a check of this tree."""
2632
 
        return [('trees', self.last_revision())]
2633
 
 
2634
2576
    def lock_tree_write(self):
2635
2577
        """See WorkingTree.lock_tree_write().
2636
2578
 
2693
2635
                mode=self.bzrdir._get_file_mode())
2694
2636
            return True
2695
2637
 
2696
 
    def _get_check_refs(self):
2697
 
        """Return the references needed to perform a check of this tree."""
2698
 
        return [('trees', self.last_revision())]
2699
 
 
2700
2638
    @needs_tree_write_lock
2701
2639
    def set_conflicts(self, conflicts):
2702
2640
        self._put_rio('conflicts', conflicts.to_stanzas(),
2779
2717
        """Return the format for the working tree object in a_bzrdir."""
2780
2718
        try:
2781
2719
            transport = a_bzrdir.get_workingtree_transport(None)
2782
 
            format_string = transport.get_bytes("format")
 
2720
            format_string = transport.get("format").read()
2783
2721
            return klass._formats[format_string]
2784
2722
        except errors.NoSuchFile:
2785
2723
            raise errors.NoWorkingTree(base=transport.base)
3049
2987
        return self.get_format_string()
3050
2988
 
3051
2989
 
3052
 
__default_format = WorkingTreeFormat6()
 
2990
__default_format = WorkingTreeFormat4()
3053
2991
WorkingTreeFormat.register_format(__default_format)
 
2992
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3054
2993
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
2994
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
2995
WorkingTreeFormat.set_default_format(__default_format)
3058
2996
# formats which have no format string are not discoverable