← 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-06-22 12:52:39 UTC
  • mto: (4471.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4472.
  • Revision ID: v.ladeuil+lp@free.fr-20090622125239-kabo9smxt9c3vnir
Use a consistent scheme for naming pyrex source files.

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
42
48
import itertools
43
49
import operator
44
50
import stat
 
51
from time import time
 
52
import warnings
45
53
import re
46
54
 
47
55
import bzrlib
49
57
    branch,
50
58
    bzrdir,
51
59
    conflicts as _mod_conflicts,
 
60
    dirstate,
52
61
    errors,
53
62
    generate_ids,
54
63
    globbing,
55
 
    graph as _mod_graph,
56
64
    hashcache,
57
65
    ignores,
58
 
    inventory,
59
66
    merge,
60
67
    revision as _mod_revision,
61
68
    revisiontree,
 
69
    repository,
 
70
    textui,
62
71
    trace,
63
72
    transform,
64
73
    ui,
 
74
    urlutils,
65
75
    views,
66
76
    xml5,
 
77
    xml6,
67
78
    xml7,
68
79
    )
69
80
import bzrlib.branch
70
81
from bzrlib.transport import get_transport
 
82
import bzrlib.ui
71
83
from bzrlib.workingtree_4 import (
72
84
    WorkingTreeFormat4,
73
85
    WorkingTreeFormat5,
77
89
 
78
90
from bzrlib import symbol_versioning
79
91
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
92
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
80
93
from bzrlib.lockable_files import LockableFiles
81
94
from bzrlib.lockdir import LockDir
82
95
import bzrlib.mutabletree
83
96
from bzrlib.mutabletree import needs_tree_write_lock
84
97
from bzrlib import osutils
85
98
from bzrlib.osutils import (
 
99
    compact_date,
86
100
    file_kind,
87
101
    isdir,
88
102
    normpath,
89
103
    pathjoin,
 
104
    rand_chars,
90
105
    realpath,
91
106
    safe_unicode,
92
107
    splitpath,
95
110
from bzrlib.filters import filtered_input_file
96
111
from bzrlib.trace import mutter, note
97
112
from bzrlib.transport.local import LocalTransport
98
 
from bzrlib.revision import CURRENT_REVISION
 
113
from bzrlib.progress import DummyProgress, ProgressPhase
 
114
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
99
115
from bzrlib.rio import RioReader, rio_file, Stanza
100
 
from bzrlib.symbol_versioning import (
101
 
    deprecated_passed,
102
 
    DEPRECATED_PARAMETER,
103
 
    )
 
116
from bzrlib.symbol_versioning import (deprecated_passed,
 
117
        deprecated_method,
 
118
        deprecated_function,
 
119
        DEPRECATED_PARAMETER,
 
120
        )
104
121
 
105
122
 
106
123
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
124
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
125
 
112
126
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
181
        return ''
168
182
 
169
183
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
184
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
185
    """Working copy tree.
173
186
 
174
187
    The inventory is held in the `Branch` working-inventory, and the
247
260
        self._rules_searcher = None
248
261
        self.views = self._make_views()
249
262
 
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
263
    def _detect_case_handling(self):
259
264
        wt_trans = self.bzrdir.get_workingtree_transport(None)
260
265
        try:
285
290
        self._control_files.break_lock()
286
291
        self.branch.break_lock()
287
292
 
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
293
    def requires_rich_root(self):
299
294
        return self._format.requires_rich_root
300
295
 
492
487
        incorrectly attributed to CURRENT_REVISION (but after committing, the
493
488
        attribution will be correct).
494
489
        """
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
 
490
        basis = self.basis_tree()
 
491
        basis.lock_read()
 
492
        try:
 
493
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
 
494
                require_versioned=True).next()
 
495
            changed_content, kind = changes[2], changes[6]
 
496
            if not changed_content:
 
497
                return basis.annotate_iter(file_id)
 
498
            if kind[1] is None:
 
499
                return None
 
500
            import annotate
 
501
            if kind[0] != 'file':
 
502
                old_lines = []
 
503
            else:
 
504
                old_lines = list(basis.annotate_iter(file_id))
 
505
            old = [old_lines]
 
506
            for tree in self.branch.repository.revision_trees(
 
507
                self.get_parent_ids()[1:]):
 
508
                if file_id not in tree:
 
509
                    continue
 
510
                old.append(list(tree.annotate_iter(file_id)))
 
511
            return annotate.reannotate(old, self.get_file(file_id).readlines(),
 
512
                                       default_revision)
 
513
        finally:
 
514
            basis.unlock()
531
515
 
532
516
    def _get_ancestors(self, default_revision):
533
517
        ancestors = set([default_revision])
548
532
        else:
549
533
            parents = [last_rev]
550
534
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
535
            merges_file = self._transport.get('pending-merges')
552
536
        except errors.NoSuchFile:
553
537
            pass
554
538
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
539
            for l in merges_file.readlines():
556
540
                revision_id = l.rstrip('\n')
557
541
                parents.append(revision_id)
558
542
        return parents
617
601
 
618
602
    def get_file_size(self, file_id):
619
603
        """See Tree.get_file_size"""
620
 
        # XXX: this returns the on-disk size; it should probably return the
621
 
        # canonical size
622
604
        try:
623
605
            return os.path.getsize(self.id2abspath(file_id))
624
606
        except OSError, e:
640
622
 
641
623
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
624
        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
625
        return self._inventory[file_id].executable
648
626
 
649
627
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
759
737
            raise
760
738
        kind = _mapper(stat_result.st_mode)
761
739
        if kind == 'file':
762
 
            return self._file_content_summary(path, stat_result)
 
740
            size = stat_result.st_size
 
741
            # try for a stat cache lookup
 
742
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
743
            return (kind, size, executable, self._sha_from_stat(
 
744
                path, stat_result))
763
745
        elif kind == 'directory':
764
746
            # perhaps it looks like a plain directory, but it's really a
765
747
            # reference.
772
754
        else:
773
755
            return (kind, None, None, None)
774
756
 
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
757
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
783
758
        """Common ghost checking functionality from set_parent_*.
784
759
 
904
879
 
905
880
    @needs_write_lock # because merge pulls data into the branch.
906
881
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
 
                          merge_type=None, force=False):
 
882
        merge_type=None):
908
883
        """Merge from a branch into this working tree.
909
884
 
910
885
        :param branch: The branch to merge from.
914
889
            branch.last_revision().
915
890
        """
916
891
        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()
 
892
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
893
        try:
 
894
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
895
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
896
            merger.pp.next_phase()
 
897
            # check that there are no
 
898
            # local alterations
 
899
            merger.check_basis(check_clean=True, require_commits=False)
 
900
            if to_revision is None:
 
901
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
902
            merger.other_rev_id = to_revision
 
903
            if _mod_revision.is_null(merger.other_rev_id):
 
904
                raise errors.NoCommits(branch)
 
905
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
906
            merger.other_basis = merger.other_rev_id
 
907
            merger.other_tree = self.branch.repository.revision_tree(
 
908
                merger.other_rev_id)
 
909
            merger.other_branch = branch
 
910
            merger.pp.next_phase()
 
911
            if from_revision is None:
 
912
                merger.find_base()
 
913
            else:
 
914
                merger.set_base_revision(from_revision, branch)
 
915
            if merger.base_rev_id == merger.other_rev_id:
 
916
                raise errors.PointlessMerge
 
917
            merger.backup_files = False
 
918
            if merge_type is None:
 
919
                merger.merge_type = Merge3Merger
 
920
            else:
 
921
                merger.merge_type = merge_type
 
922
            merger.set_interesting_files(None)
 
923
            merger.show_base = False
 
924
            merger.reprocess = False
 
925
            conflicts = merger.do_merge()
 
926
            merger.set_pending()
 
927
        finally:
 
928
            pb.finished()
947
929
        return conflicts
948
930
 
949
931
    @needs_read_lock
1096
1078
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1079
        if tree_transport.base != branch_transport.base:
1098
1080
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1081
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1082
        else:
1102
1083
            tree_bzrdir = branch_bzrdir
1103
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1084
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1104
1085
        wt.set_parent_ids(self.get_parent_ids())
1105
1086
        my_inv = self.inventory
1106
 
        child_inv = inventory.Inventory(root_id=None)
 
1087
        child_inv = Inventory(root_id=None)
1107
1088
        new_root = my_inv[file_id]
1108
1089
        my_inv.remove_recursive_id(file_id)
1109
1090
        new_root.parent_id = None
1141
1122
        This does not include files that have been deleted in this
1142
1123
        tree. Skips the control directory.
1143
1124
 
1144
 
        :param include_root: if True, return an entry for the root
 
1125
        :param include_root: if True, do not return an entry for the root
1145
1126
        :param from_dir: start from this directory or None for the root
1146
1127
        :param recursive: whether to recurse into subdirectories or not
1147
1128
        """
1435
1416
        inv = self.inventory
1436
1417
        for entry in moved:
1437
1418
            try:
1438
 
                self._move_entry(WorkingTree._RenameEntry(
1439
 
                    entry.to_rel, entry.from_id,
 
1419
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1440
1420
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1441
1421
                    entry.from_tail, entry.from_parent_id,
1442
1422
                    entry.only_change_inv))
1493
1473
        from_tail = splitpath(from_rel)[-1]
1494
1474
        from_id = inv.path2id(from_rel)
1495
1475
        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]
 
1476
            raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1477
                errors.NotVersionedError(path=str(from_rel)))
 
1478
        from_entry = inv[from_id]
1507
1479
        from_parent_id = from_entry.parent_id
1508
1480
        to_dir, to_tail = os.path.split(to_rel)
1509
1481
        to_dir_id = inv.path2id(to_dir)
1601
1573
    @needs_write_lock
1602
1574
    def pull(self, source, overwrite=False, stop_revision=None,
1603
1575
             change_reporter=None, possible_transports=None, local=False):
 
1576
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1604
1577
        source.lock_read()
1605
1578
        try:
 
1579
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1580
            pp.next_phase()
1606
1581
            old_revision_info = self.branch.last_revision_info()
1607
1582
            basis_tree = self.basis_tree()
1608
1583
            count = self.branch.pull(source, overwrite, stop_revision,
1610
1585
                                     local=local)
1611
1586
            new_revision_info = self.branch.last_revision_info()
1612
1587
            if new_revision_info != old_revision_info:
 
1588
                pp.next_phase()
1613
1589
                repository = self.branch.repository
 
1590
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1614
1591
                basis_tree.lock_read()
1615
1592
                try:
1616
1593
                    new_basis_tree = self.branch.basis_tree()
1619
1596
                                new_basis_tree,
1620
1597
                                basis_tree,
1621
1598
                                this_tree=self,
1622
 
                                pb=None,
 
1599
                                pb=pb,
1623
1600
                                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)
 
1601
                    if (basis_tree.inventory.root is None and
 
1602
                        new_basis_tree.inventory.root is not None):
 
1603
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1604
                finally:
 
1605
                    pb.finished()
1629
1606
                    basis_tree.unlock()
1630
1607
                # TODO - dedup parents list with things merged by pull ?
1631
1608
                # reuse the revisiontree we merged against to set the new
1644
1621
            return count
1645
1622
        finally:
1646
1623
            source.unlock()
 
1624
            top_pb.finished()
1647
1625
 
1648
1626
    @needs_write_lock
1649
1627
    def put_file_bytes_non_atomic(self, file_id, bytes):
1734
1712
        r"""Check whether the filename matches an ignore pattern.
1735
1713
 
1736
1714
        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.
 
1715
        others match against only the last component.
1740
1716
 
1741
1717
        If the file is ignored, returns the pattern which caused it to
1742
1718
        be ignored, otherwise None.  So this can simply be used as a
1743
1719
        boolean if desired."""
1744
1720
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1721
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1722
        return self._ignoreglobster.match(filename)
1747
1723
 
1748
1724
    def kind(self, file_id):
1839
1815
    def _reset_data(self):
1840
1816
        """Reset transient data that cannot be revalidated."""
1841
1817
        self._inventory_is_modified = False
1842
 
        f = self._transport.get('inventory')
1843
 
        try:
1844
 
            result = self._deserialize(f)
1845
 
        finally:
1846
 
            f.close()
 
1818
        result = self._deserialize(self._transport.get('inventory'))
1847
1819
        self._set_inventory(result, dirty=False)
1848
1820
 
1849
1821
    @needs_tree_write_lock
1896
1868
            # revision_id is set. We must check for this full string, because a
1897
1869
            # root node id can legitimately look like 'revision_id' but cannot
1898
1870
            # contain a '"'.
1899
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1871
            xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1872
            firstline = xml.split('\n', 1)[0]
1901
1873
            if (not 'revision_id="' in firstline or
1902
1874
                'format="7"' not in firstline):
1903
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1904
 
                    xml, new_revision)
 
1875
                inv = self.branch.repository.deserialise_inventory(
 
1876
                    new_revision, xml)
1905
1877
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1906
1878
            self._write_basis_inventory(xml)
1907
1879
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1925
1897
        # binary.
1926
1898
        if self._inventory_is_modified:
1927
1899
            raise errors.InventoryModified(self)
1928
 
        f = self._transport.get('inventory')
1929
 
        try:
1930
 
            result = self._deserialize(f)
1931
 
        finally:
1932
 
            f.close()
 
1900
        result = self._deserialize(self._transport.get('inventory'))
1933
1901
        self._set_inventory(result, dirty=False)
1934
1902
        return result
1935
1903
 
1950
1918
 
1951
1919
        new_files=set()
1952
1920
        unknown_nested_files=set()
1953
 
        if to_file is None:
1954
 
            to_file = sys.stdout
1955
1921
 
1956
1922
        def recurse_directory_to_add_files(directory):
1957
1923
            # Recurse directory and add all files
2027
1993
                        new_status = 'I'
2028
1994
                    else:
2029
1995
                        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')
 
1996
                    textui.show_status(new_status, self.kind(fid), f,
 
1997
                                       to_file=to_file)
2033
1998
                # Unversion file
2034
1999
                inv_delta.append((f, None, fid, None))
2035
2000
                message = "removed %s" % (f,)
2058
2023
 
2059
2024
    @needs_tree_write_lock
2060
2025
    def revert(self, filenames=None, old_tree=None, backups=True,
2061
 
               pb=None, report_changes=False):
 
2026
               pb=DummyProgress(), report_changes=False):
2062
2027
        from bzrlib.conflicts import resolve
2063
2028
        if filenames == []:
2064
2029
            filenames = None
2077
2042
            if filenames is None and len(self.get_parent_ids()) > 1:
2078
2043
                parent_trees = []
2079
2044
                last_revision = self.last_revision()
2080
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2045
                if last_revision != NULL_REVISION:
2081
2046
                    if basis_tree is None:
2082
2047
                        basis_tree = self.basis_tree()
2083
2048
                        basis_tree.lock_read()
2121
2086
    def set_inventory(self, new_inventory_list):
2122
2087
        from bzrlib.inventory import (Inventory,
2123
2088
                                      InventoryDirectory,
 
2089
                                      InventoryEntry,
2124
2090
                                      InventoryFile,
2125
2091
                                      InventoryLink)
2126
2092
        inv = Inventory(self.get_root_id())
2186
2152
        """
2187
2153
        raise NotImplementedError(self.unlock)
2188
2154
 
2189
 
    _marker = object()
2190
 
 
2191
 
    def update(self, change_reporter=None, possible_transports=None,
2192
 
               revision=None, old_tip=_marker):
 
2155
    def update(self, change_reporter=None, possible_transports=None):
2193
2156
        """Update a working tree along its branch.
2194
2157
 
2195
2158
        This will update the branch if its bound too, which means we have
2213
2176
        - Merge current state -> basis tree of the master w.r.t. the old tree
2214
2177
          basis.
2215
2178
        - 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
2179
        """
2223
2180
        if self.branch.get_bound_location() is not None:
2224
2181
            self.lock_write()
2225
 
            update_branch = (old_tip is self._marker)
 
2182
            update_branch = True
2226
2183
        else:
2227
2184
            self.lock_tree_write()
2228
2185
            update_branch = False
2230
2187
            if update_branch:
2231
2188
                old_tip = self.branch.update(possible_transports)
2232
2189
            else:
2233
 
                if old_tip is self._marker:
2234
 
                    old_tip = None
2235
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2190
                old_tip = None
 
2191
            return self._update_tree(old_tip, change_reporter)
2236
2192
        finally:
2237
2193
            self.unlock()
2238
2194
 
2239
2195
    @needs_tree_write_lock
2240
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2196
    def _update_tree(self, old_tip=None, change_reporter=None):
2241
2197
        """Update a tree to the master branch.
2242
2198
 
2243
2199
        :param old_tip: if supplied, the previous tip revision the branch,
2253
2209
        # We MUST save it even if an error occurs, because otherwise the users
2254
2210
        # local work is unreferenced and will appear to have been lost.
2255
2211
        #
2256
 
        nb_conflicts = 0
 
2212
        result = 0
2257
2213
        try:
2258
2214
            last_rev = self.get_parent_ids()[0]
2259
2215
        except IndexError:
2260
2216
            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
 
 
 
2217
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2218
            # merge tree state up to new branch tip.
2285
2219
            basis = self.basis_tree()
2286
2220
            basis.lock_read()
2287
2221
            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)
 
2222
                to_tree = self.branch.basis_tree()
 
2223
                if basis.inventory.root is None:
 
2224
                    self.set_root_id(to_tree.get_root_id())
2291
2225
                    self.flush()
 
2226
                result += merge.merge_inner(
 
2227
                                      self.branch,
 
2228
                                      to_tree,
 
2229
                                      basis,
 
2230
                                      this_tree=self,
 
2231
                                      change_reporter=change_reporter)
2292
2232
            finally:
2293
2233
                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
2234
            # TODO - dedup parents list with things merged by pull ?
2306
2235
            # reuse the tree we've updated to to set the basis:
2307
 
            parent_trees = [(revision, to_tree)]
 
2236
            parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2237
            merges = self.get_parent_ids()[1:]
2309
2238
            # Ideally we ask the tree for the trees here, that way the working
2310
2239
            # tree can decide whether to give us the entire tree or give us a
2314
2243
            for parent in merges:
2315
2244
                parent_trees.append(
2316
2245
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2246
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2247
                parent_trees.append(
2319
2248
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2249
            self.set_parent_trees(parent_trees)
2321
2250
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2251
        else:
 
2252
            # the working tree had the same last-revision as the master
 
2253
            # branch did. We may still have pivot local work from the local
 
2254
            # branch into old_tip:
 
2255
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2256
                self.add_parent_tree_id(old_tip)
 
2257
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2258
            and old_tip != last_rev):
 
2259
            # our last revision was not the prior branch last revision
 
2260
            # and we have converted that last revision to a pending merge.
 
2261
            # base is somewhere between the branch tip now
 
2262
            # and the now pending merge
 
2263
 
 
2264
            # Since we just modified the working tree and inventory, flush out
 
2265
            # the current state, before we modify it again.
 
2266
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2267
            #       requires it only because TreeTransform directly munges the
 
2268
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2269
            #       should be able to remove this extra flush.
 
2270
            self.flush()
 
2271
            graph = self.branch.repository.get_graph()
 
2272
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2273
                                                old_tip)
 
2274
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2275
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2276
            result += merge.merge_inner(
 
2277
                                  self.branch,
 
2278
                                  other_tree,
 
2279
                                  base_tree,
 
2280
                                  this_tree=self,
 
2281
                                  change_reporter=change_reporter)
 
2282
        return result
2323
2283
 
2324
2284
    def _write_hashcache_if_dirty(self):
2325
2285
        """Write out the hashcache if it is dirty."""
2566
2526
        return un_resolved, resolved
2567
2527
 
2568
2528
    @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
 
        """
 
2529
    def _check(self):
2576
2530
        tree_basis = self.basis_tree()
2577
2531
        tree_basis.lock_read()
2578
2532
        try:
2579
 
            repo_basis = references[('trees', self.last_revision())]
 
2533
            repo_basis = self.branch.repository.revision_tree(
 
2534
                self.last_revision())
2580
2535
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2581
2536
                raise errors.BzrCheckError(
2582
2537
                    "Mismatched basis inventory content.")
2595
2550
        """
2596
2551
        return
2597
2552
 
 
2553
    @needs_read_lock
2598
2554
    def _get_rules_searcher(self, default_searcher):
2599
2555
        """See Tree._get_rules_searcher."""
2600
2556
        if self._rules_searcher is None:
2627
2583
        if self._inventory is None:
2628
2584
            self.read_working_inventory()
2629
2585
 
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
2586
    def lock_tree_write(self):
2635
2587
        """See WorkingTree.lock_tree_write().
2636
2588
 
2682
2634
 
2683
2635
    def _change_last_revision(self, revision_id):
2684
2636
        """See WorkingTree._change_last_revision."""
2685
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2637
        if revision_id is None or revision_id == NULL_REVISION:
2686
2638
            try:
2687
2639
                self._transport.delete('last-revision')
2688
2640
            except errors.NoSuchFile:
2693
2645
                mode=self.bzrdir._get_file_mode())
2694
2646
            return True
2695
2647
 
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
2648
    @needs_tree_write_lock
2701
2649
    def set_conflicts(self, conflicts):
2702
2650
        self._put_rio('conflicts', conflicts.to_stanzas(),
2779
2727
        """Return the format for the working tree object in a_bzrdir."""
2780
2728
        try:
2781
2729
            transport = a_bzrdir.get_workingtree_transport(None)
2782
 
            format_string = transport.get_bytes("format")
 
2730
            format_string = transport.get("format").read()
2783
2731
            return klass._formats[format_string]
2784
2732
        except errors.NoSuchFile:
2785
2733
            raise errors.NoWorkingTree(base=transport.base)
2856
2804
        no working tree.  (See bug #43064).
2857
2805
        """
2858
2806
        sio = StringIO()
2859
 
        inv = inventory.Inventory()
 
2807
        inv = Inventory()
2860
2808
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2861
2809
        sio.seek(0)
2862
2810
        transport.put_file('inventory', sio, file_mode)
2878
2826
            branch.generate_revision_history(revision_id)
2879
2827
        finally:
2880
2828
            branch.unlock()
2881
 
        inv = inventory.Inventory()
 
2829
        inv = Inventory()
2882
2830
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2883
2831
                         branch,
2884
2832
                         inv,
3001
2949
            # only set an explicit root id if there is one to set.
3002
2950
            if basis_tree.inventory.root is not None:
3003
2951
                wt.set_root_id(basis_tree.get_root_id())
3004
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2952
            if revision_id == NULL_REVISION:
3005
2953
                wt.set_parent_trees([])
3006
2954
            else:
3007
2955
                wt.set_parent_trees([(revision_id, basis_tree)])
3014
2962
        return wt
3015
2963
 
3016
2964
    def _initial_inventory(self):
3017
 
        return inventory.Inventory()
 
2965
        return Inventory()
3018
2966
 
3019
2967
    def __init__(self):
3020
2968
        super(WorkingTreeFormat3, self).__init__()
3049
2997
        return self.get_format_string()
3050
2998
 
3051
2999
 
3052
 
__default_format = WorkingTreeFormat6()
 
3000
__default_format = WorkingTreeFormat4()
3053
3001
WorkingTreeFormat.register_format(__default_format)
 
3002
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3054
3003
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3055
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3056
3004
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3057
3005
WorkingTreeFormat.set_default_format(__default_format)
3058
3006
# formats which have no format string are not discoverable