/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-02 08:26:00 UTC
  • mto: (4527.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4529.
  • Revision ID: ian.clatworthy@canonical.com-20090702082600-qwb1evvvfa8ctnye
first draft of a 2.0 Upgrade Guide

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
 
    transport,
65
73
    ui,
 
74
    urlutils,
66
75
    views,
67
76
    xml5,
 
77
    xml6,
68
78
    xml7,
69
79
    )
 
80
import bzrlib.branch
 
81
from bzrlib.transport import get_transport
 
82
import bzrlib.ui
70
83
from bzrlib.workingtree_4 import (
71
84
    WorkingTreeFormat4,
72
85
    WorkingTreeFormat5,
76
89
 
77
90
from bzrlib import symbol_versioning
78
91
from bzrlib.decorators import needs_read_lock, needs_write_lock
79
 
from bzrlib.lock import LogicalLockResult
 
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
176
189
 
177
190
    It is possible for a `WorkingTree` to have a filename which is
178
191
    not listed in the Inventory and vice versa.
179
 
 
180
 
    :ivar basedir: The root of the tree on disk. This is a unicode path object
181
 
        (as opposed to a URL).
182
192
    """
183
193
 
184
194
    # override this to set the strategy for storing views
250
260
        self._rules_searcher = None
251
261
        self.views = self._make_views()
252
262
 
253
 
    @property
254
 
    def user_transport(self):
255
 
        return self.bzrdir.user_transport
256
 
 
257
 
    @property
258
 
    def control_transport(self):
259
 
        return self._transport
260
 
 
261
263
    def _detect_case_handling(self):
262
264
        wt_trans = self.bzrdir.get_workingtree_transport(None)
263
265
        try:
288
290
        self._control_files.break_lock()
289
291
        self.branch.break_lock()
290
292
 
291
 
    def _get_check_refs(self):
292
 
        """Return the references needed to perform a check of this tree.
293
 
        
294
 
        The default implementation returns no refs, and is only suitable for
295
 
        trees that have no local caching and can commit on ghosts at any time.
296
 
 
297
 
        :seealso: bzrlib.check for details about check_refs.
298
 
        """
299
 
        return []
300
 
 
301
293
    def requires_rich_root(self):
302
294
        return self._format.requires_rich_root
303
295
 
371
363
                return True, None
372
364
            else:
373
365
                return True, tree
374
 
        t = transport.get_transport(location)
375
 
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
 
366
        transport = get_transport(location)
 
367
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
376
368
                                              list_current=list_current)
377
 
        return [tr for tr in iterator if tr is not None]
 
369
        return [t for t in iterator if t is not None]
378
370
 
379
371
    # should be deprecated - this is slow and in any case treating them as a
380
372
    # container is (we now know) bad style -- mbp 20070302
465
457
        return (file_obj, stat_value)
466
458
 
467
459
    def get_file_text(self, file_id, path=None, filtered=True):
468
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
469
 
        try:
470
 
            return my_file.read()
471
 
        finally:
472
 
            my_file.close()
 
460
        return self.get_file(file_id, path=path, filtered=filtered).read()
473
461
 
474
462
    def get_file_byname(self, filename, filtered=True):
475
463
        path = self.abspath(filename)
499
487
        incorrectly attributed to CURRENT_REVISION (but after committing, the
500
488
        attribution will be correct).
501
489
        """
502
 
        maybe_file_parent_keys = []
503
 
        for parent_id in self.get_parent_ids():
504
 
            try:
505
 
                parent_tree = self.revision_tree(parent_id)
506
 
            except errors.NoSuchRevisionInTree:
507
 
                parent_tree = self.branch.repository.revision_tree(parent_id)
508
 
            parent_tree.lock_read()
509
 
            try:
510
 
                if file_id not in parent_tree:
511
 
                    continue
512
 
                ie = parent_tree.inventory[file_id]
513
 
                if ie.kind != 'file':
514
 
                    # Note: this is slightly unnecessary, because symlinks and
515
 
                    # directories have a "text" which is the empty text, and we
516
 
                    # know that won't mess up annotations. But it seems cleaner
517
 
                    continue
518
 
                parent_text_key = (file_id, ie.revision)
519
 
                if parent_text_key not in maybe_file_parent_keys:
520
 
                    maybe_file_parent_keys.append(parent_text_key)
521
 
            finally:
522
 
                parent_tree.unlock()
523
 
        graph = _mod_graph.Graph(self.branch.repository.texts)
524
 
        heads = graph.heads(maybe_file_parent_keys)
525
 
        file_parent_keys = []
526
 
        for key in maybe_file_parent_keys:
527
 
            if key in heads:
528
 
                file_parent_keys.append(key)
529
 
 
530
 
        # Now we have the parents of this content
531
 
        annotator = self.branch.repository.texts.get_annotator()
532
 
        text = self.get_file_text(file_id)
533
 
        this_key =(file_id, default_revision)
534
 
        annotator.add_special_text(this_key, file_parent_keys, text)
535
 
        annotations = [(key[-1], line)
536
 
                       for key, line in annotator.annotate_flat(this_key)]
537
 
        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()
538
515
 
539
516
    def _get_ancestors(self, default_revision):
540
517
        ancestors = set([default_revision])
555
532
        else:
556
533
            parents = [last_rev]
557
534
        try:
558
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
535
            merges_file = self._transport.get('pending-merges')
559
536
        except errors.NoSuchFile:
560
537
            pass
561
538
        else:
562
 
            for l in osutils.split_lines(merges_bytes):
 
539
            for l in merges_file.readlines():
563
540
                revision_id = l.rstrip('\n')
564
541
                parents.append(revision_id)
565
542
        return parents
624
601
 
625
602
    def get_file_size(self, file_id):
626
603
        """See Tree.get_file_size"""
627
 
        # XXX: this returns the on-disk size; it should probably return the
628
 
        # canonical size
629
604
        try:
630
605
            return os.path.getsize(self.id2abspath(file_id))
631
606
        except OSError, e:
647
622
 
648
623
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
649
624
        file_id = self.path2id(path)
650
 
        if file_id is None:
651
 
            # For unversioned files on win32, we just assume they are not
652
 
            # executable
653
 
            return False
654
625
        return self._inventory[file_id].executable
655
626
 
656
627
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
766
737
            raise
767
738
        kind = _mapper(stat_result.st_mode)
768
739
        if kind == 'file':
769
 
            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))
770
745
        elif kind == 'directory':
771
746
            # perhaps it looks like a plain directory, but it's really a
772
747
            # reference.
779
754
        else:
780
755
            return (kind, None, None, None)
781
756
 
782
 
    def _file_content_summary(self, path, stat_result):
783
 
        size = stat_result.st_size
784
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
785
 
        # try for a stat cache lookup
786
 
        return ('file', size, executable, self._sha_from_stat(
787
 
            path, stat_result))
788
 
 
789
757
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
790
758
        """Common ghost checking functionality from set_parent_*.
791
759
 
911
879
 
912
880
    @needs_write_lock # because merge pulls data into the branch.
913
881
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
914
 
                          merge_type=None, force=False):
 
882
        merge_type=None):
915
883
        """Merge from a branch into this working tree.
916
884
 
917
885
        :param branch: The branch to merge from.
921
889
            branch.last_revision().
922
890
        """
923
891
        from bzrlib.merge import Merger, Merge3Merger
924
 
        merger = Merger(self.branch, this_tree=self)
925
 
        # check that there are no local alterations
926
 
        if not force and self.has_changes():
927
 
            raise errors.UncommittedChanges(self)
928
 
        if to_revision is None:
929
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
930
 
        merger.other_rev_id = to_revision
931
 
        if _mod_revision.is_null(merger.other_rev_id):
932
 
            raise errors.NoCommits(branch)
933
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
934
 
        merger.other_basis = merger.other_rev_id
935
 
        merger.other_tree = self.branch.repository.revision_tree(
936
 
            merger.other_rev_id)
937
 
        merger.other_branch = branch
938
 
        if from_revision is None:
939
 
            merger.find_base()
940
 
        else:
941
 
            merger.set_base_revision(from_revision, branch)
942
 
        if merger.base_rev_id == merger.other_rev_id:
943
 
            raise errors.PointlessMerge
944
 
        merger.backup_files = False
945
 
        if merge_type is None:
946
 
            merger.merge_type = Merge3Merger
947
 
        else:
948
 
            merger.merge_type = merge_type
949
 
        merger.set_interesting_files(None)
950
 
        merger.show_base = False
951
 
        merger.reprocess = False
952
 
        conflicts = merger.do_merge()
953
 
        merger.set_pending()
 
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()
954
929
        return conflicts
955
930
 
956
931
    @needs_read_lock
1103
1078
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1104
1079
        if tree_transport.base != branch_transport.base:
1105
1080
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1106
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1107
 
                target_branch=new_branch)
 
1081
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1108
1082
        else:
1109
1083
            tree_bzrdir = branch_bzrdir
1110
 
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
 
1084
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
1111
1085
        wt.set_parent_ids(self.get_parent_ids())
1112
1086
        my_inv = self.inventory
1113
 
        child_inv = inventory.Inventory(root_id=None)
 
1087
        child_inv = Inventory(root_id=None)
1114
1088
        new_root = my_inv[file_id]
1115
1089
        my_inv.remove_recursive_id(file_id)
1116
1090
        new_root.parent_id = None
1148
1122
        This does not include files that have been deleted in this
1149
1123
        tree. Skips the control directory.
1150
1124
 
1151
 
        :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
1152
1126
        :param from_dir: start from this directory or None for the root
1153
1127
        :param recursive: whether to recurse into subdirectories or not
1154
1128
        """
1442
1416
        inv = self.inventory
1443
1417
        for entry in moved:
1444
1418
            try:
1445
 
                self._move_entry(WorkingTree._RenameEntry(
1446
 
                    entry.to_rel, entry.from_id,
 
1419
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1447
1420
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1448
1421
                    entry.from_tail, entry.from_parent_id,
1449
1422
                    entry.only_change_inv))
1500
1473
        from_tail = splitpath(from_rel)[-1]
1501
1474
        from_id = inv.path2id(from_rel)
1502
1475
        if from_id is None:
1503
 
            # if file is missing in the inventory maybe it's in the basis_tree
1504
 
            basis_tree = self.branch.basis_tree()
1505
 
            from_id = basis_tree.path2id(from_rel)
1506
 
            if from_id is None:
1507
 
                raise errors.BzrRenameFailedError(from_rel,to_rel,
1508
 
                    errors.NotVersionedError(path=str(from_rel)))
1509
 
            # put entry back in the inventory so we can rename it
1510
 
            from_entry = basis_tree.inventory[from_id].copy()
1511
 
            inv.add(from_entry)
1512
 
        else:
1513
 
            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]
1514
1479
        from_parent_id = from_entry.parent_id
1515
1480
        to_dir, to_tail = os.path.split(to_rel)
1516
1481
        to_dir_id = inv.path2id(to_dir)
1608
1573
    @needs_write_lock
1609
1574
    def pull(self, source, overwrite=False, stop_revision=None,
1610
1575
             change_reporter=None, possible_transports=None, local=False):
 
1576
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1611
1577
        source.lock_read()
1612
1578
        try:
 
1579
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1580
            pp.next_phase()
1613
1581
            old_revision_info = self.branch.last_revision_info()
1614
1582
            basis_tree = self.basis_tree()
1615
1583
            count = self.branch.pull(source, overwrite, stop_revision,
1617
1585
                                     local=local)
1618
1586
            new_revision_info = self.branch.last_revision_info()
1619
1587
            if new_revision_info != old_revision_info:
 
1588
                pp.next_phase()
1620
1589
                repository = self.branch.repository
 
1590
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1621
1591
                basis_tree.lock_read()
1622
1592
                try:
1623
1593
                    new_basis_tree = self.branch.basis_tree()
1626
1596
                                new_basis_tree,
1627
1597
                                basis_tree,
1628
1598
                                this_tree=self,
1629
 
                                pb=None,
 
1599
                                pb=pb,
1630
1600
                                change_reporter=change_reporter)
1631
 
                    basis_root_id = basis_tree.get_root_id()
1632
 
                    new_root_id = new_basis_tree.get_root_id()
1633
 
                    if basis_root_id != new_root_id:
1634
 
                        self.set_root_id(new_root_id)
 
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())
1635
1604
                finally:
 
1605
                    pb.finished()
1636
1606
                    basis_tree.unlock()
1637
1607
                # TODO - dedup parents list with things merged by pull ?
1638
1608
                # reuse the revisiontree we merged against to set the new
1651
1621
            return count
1652
1622
        finally:
1653
1623
            source.unlock()
 
1624
            top_pb.finished()
1654
1625
 
1655
1626
    @needs_write_lock
1656
1627
    def put_file_bytes_non_atomic(self, file_id, bytes):
1741
1712
        r"""Check whether the filename matches an ignore pattern.
1742
1713
 
1743
1714
        Patterns containing '/' or '\' need to match the whole path;
1744
 
        others match against only the last component.  Patterns starting
1745
 
        with '!' are ignore exceptions.  Exceptions take precedence
1746
 
        over regular patterns and cause the filename to not be ignored.
 
1715
        others match against only the last component.
1747
1716
 
1748
1717
        If the file is ignored, returns the pattern which caused it to
1749
1718
        be ignored, otherwise None.  So this can simply be used as a
1750
1719
        boolean if desired."""
1751
1720
        if getattr(self, '_ignoreglobster', None) is None:
1752
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1721
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1753
1722
        return self._ignoreglobster.match(filename)
1754
1723
 
1755
1724
    def kind(self, file_id):
1805
1774
            raise errors.ObjectNotLocked(self)
1806
1775
 
1807
1776
    def lock_read(self):
1808
 
        """Lock the tree for reading.
1809
 
 
1810
 
        This also locks the branch, and can be unlocked via self.unlock().
1811
 
 
1812
 
        :return: A bzrlib.lock.LogicalLockResult.
1813
 
        """
 
1777
        """See Branch.lock_read, and WorkingTree.unlock."""
1814
1778
        if not self.is_locked():
1815
1779
            self._reset_data()
1816
1780
        self.branch.lock_read()
1817
1781
        try:
1818
 
            self._control_files.lock_read()
1819
 
            return LogicalLockResult(self.unlock)
 
1782
            return self._control_files.lock_read()
1820
1783
        except:
1821
1784
            self.branch.unlock()
1822
1785
            raise
1823
1786
 
1824
1787
    def lock_tree_write(self):
1825
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1826
 
 
1827
 
        :return: A bzrlib.lock.LogicalLockResult.
1828
 
        """
 
1788
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1829
1789
        if not self.is_locked():
1830
1790
            self._reset_data()
1831
1791
        self.branch.lock_read()
1832
1792
        try:
1833
 
            self._control_files.lock_write()
1834
 
            return LogicalLockResult(self.unlock)
 
1793
            return self._control_files.lock_write()
1835
1794
        except:
1836
1795
            self.branch.unlock()
1837
1796
            raise
1838
1797
 
1839
1798
    def lock_write(self):
1840
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1841
 
 
1842
 
        :return: A bzrlib.lock.LogicalLockResult.
1843
 
        """
 
1799
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1844
1800
        if not self.is_locked():
1845
1801
            self._reset_data()
1846
1802
        self.branch.lock_write()
1847
1803
        try:
1848
 
            self._control_files.lock_write()
1849
 
            return LogicalLockResult(self.unlock)
 
1804
            return self._control_files.lock_write()
1850
1805
        except:
1851
1806
            self.branch.unlock()
1852
1807
            raise
1860
1815
    def _reset_data(self):
1861
1816
        """Reset transient data that cannot be revalidated."""
1862
1817
        self._inventory_is_modified = False
1863
 
        f = self._transport.get('inventory')
1864
 
        try:
1865
 
            result = self._deserialize(f)
1866
 
        finally:
1867
 
            f.close()
 
1818
        result = self._deserialize(self._transport.get('inventory'))
1868
1819
        self._set_inventory(result, dirty=False)
1869
1820
 
1870
1821
    @needs_tree_write_lock
1917
1868
            # revision_id is set. We must check for this full string, because a
1918
1869
            # root node id can legitimately look like 'revision_id' but cannot
1919
1870
            # contain a '"'.
1920
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1871
            xml = self.branch.repository.get_inventory_xml(new_revision)
1921
1872
            firstline = xml.split('\n', 1)[0]
1922
1873
            if (not 'revision_id="' in firstline or
1923
1874
                'format="7"' not in firstline):
1924
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1925
 
                    xml, new_revision)
 
1875
                inv = self.branch.repository.deserialise_inventory(
 
1876
                    new_revision, xml)
1926
1877
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1927
1878
            self._write_basis_inventory(xml)
1928
1879
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1946
1897
        # binary.
1947
1898
        if self._inventory_is_modified:
1948
1899
            raise errors.InventoryModified(self)
1949
 
        f = self._transport.get('inventory')
1950
 
        try:
1951
 
            result = self._deserialize(f)
1952
 
        finally:
1953
 
            f.close()
 
1900
        result = self._deserialize(self._transport.get('inventory'))
1954
1901
        self._set_inventory(result, dirty=False)
1955
1902
        return result
1956
1903
 
1971
1918
 
1972
1919
        new_files=set()
1973
1920
        unknown_nested_files=set()
1974
 
        if to_file is None:
1975
 
            to_file = sys.stdout
1976
1921
 
1977
1922
        def recurse_directory_to_add_files(directory):
1978
1923
            # Recurse directory and add all files
1979
1924
            # so we can check if they have changed.
1980
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1925
            for parent_info, file_infos in\
 
1926
                self.walkdirs(directory):
1981
1927
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1982
1928
                    # Is it versioned or ignored?
1983
1929
                    if self.path2id(relpath) or self.is_ignored(relpath):
2018
1964
                            # ... but not ignored
2019
1965
                            has_changed_files = True
2020
1966
                            break
2021
 
                    elif (content_change and (kind[1] is not None) and
2022
 
                            osutils.is_inside_any(files, path[1])):
2023
 
                        # Versioned and changed, but not deleted, and still
2024
 
                        # in one of the dirs to be deleted.
 
1967
                    elif content_change and (kind[1] is not None):
 
1968
                        # Versioned and changed, but not deleted
2025
1969
                        has_changed_files = True
2026
1970
                        break
2027
1971
 
2049
1993
                        new_status = 'I'
2050
1994
                    else:
2051
1995
                        new_status = '?'
2052
 
                    # XXX: Really should be a more abstract reporter interface
2053
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2054
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
1996
                    textui.show_status(new_status, self.kind(fid), f,
 
1997
                                       to_file=to_file)
2055
1998
                # Unversion file
2056
1999
                inv_delta.append((f, None, fid, None))
2057
2000
                message = "removed %s" % (f,)
2080
2023
 
2081
2024
    @needs_tree_write_lock
2082
2025
    def revert(self, filenames=None, old_tree=None, backups=True,
2083
 
               pb=None, report_changes=False):
 
2026
               pb=DummyProgress(), report_changes=False):
2084
2027
        from bzrlib.conflicts import resolve
2085
2028
        if filenames == []:
2086
2029
            filenames = None
2099
2042
            if filenames is None and len(self.get_parent_ids()) > 1:
2100
2043
                parent_trees = []
2101
2044
                last_revision = self.last_revision()
2102
 
                if last_revision != _mod_revision.NULL_REVISION:
 
2045
                if last_revision != NULL_REVISION:
2103
2046
                    if basis_tree is None:
2104
2047
                        basis_tree = self.basis_tree()
2105
2048
                        basis_tree.lock_read()
2143
2086
    def set_inventory(self, new_inventory_list):
2144
2087
        from bzrlib.inventory import (Inventory,
2145
2088
                                      InventoryDirectory,
 
2089
                                      InventoryEntry,
2146
2090
                                      InventoryFile,
2147
2091
                                      InventoryLink)
2148
2092
        inv = Inventory(self.get_root_id())
2208
2152
        """
2209
2153
        raise NotImplementedError(self.unlock)
2210
2154
 
2211
 
    _marker = object()
2212
 
 
2213
 
    def update(self, change_reporter=None, possible_transports=None,
2214
 
               revision=None, old_tip=_marker):
 
2155
    def update(self, change_reporter=None, possible_transports=None):
2215
2156
        """Update a working tree along its branch.
2216
2157
 
2217
2158
        This will update the branch if its bound too, which means we have
2235
2176
        - Merge current state -> basis tree of the master w.r.t. the old tree
2236
2177
          basis.
2237
2178
        - Do a 'normal' merge of the old branch basis if it is relevant.
2238
 
 
2239
 
        :param revision: The target revision to update to. Must be in the
2240
 
            revision history.
2241
 
        :param old_tip: If branch.update() has already been run, the value it
2242
 
            returned (old tip of the branch or None). _marker is used
2243
 
            otherwise.
2244
2179
        """
2245
2180
        if self.branch.get_bound_location() is not None:
2246
2181
            self.lock_write()
2247
 
            update_branch = (old_tip is self._marker)
 
2182
            update_branch = True
2248
2183
        else:
2249
2184
            self.lock_tree_write()
2250
2185
            update_branch = False
2252
2187
            if update_branch:
2253
2188
                old_tip = self.branch.update(possible_transports)
2254
2189
            else:
2255
 
                if old_tip is self._marker:
2256
 
                    old_tip = None
2257
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2190
                old_tip = None
 
2191
            return self._update_tree(old_tip, change_reporter)
2258
2192
        finally:
2259
2193
            self.unlock()
2260
2194
 
2261
2195
    @needs_tree_write_lock
2262
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2196
    def _update_tree(self, old_tip=None, change_reporter=None):
2263
2197
        """Update a tree to the master branch.
2264
2198
 
2265
2199
        :param old_tip: if supplied, the previous tip revision the branch,
2275
2209
        # We MUST save it even if an error occurs, because otherwise the users
2276
2210
        # local work is unreferenced and will appear to have been lost.
2277
2211
        #
2278
 
        nb_conflicts = 0
 
2212
        result = 0
2279
2213
        try:
2280
2214
            last_rev = self.get_parent_ids()[0]
2281
2215
        except IndexError:
2282
2216
            last_rev = _mod_revision.NULL_REVISION
2283
 
        if revision is None:
2284
 
            revision = self.branch.last_revision()
2285
 
 
2286
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2287
 
 
2288
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2289
 
            # the branch we are bound to was updated
2290
 
            # merge those changes in first
2291
 
            base_tree  = self.basis_tree()
2292
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2293
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2294
 
                                             base_tree, this_tree=self,
2295
 
                                             change_reporter=change_reporter)
2296
 
            if nb_conflicts:
2297
 
                self.add_parent_tree((old_tip, other_tree))
2298
 
                trace.note('Rerun update after fixing the conflicts.')
2299
 
                return nb_conflicts
2300
 
 
2301
 
        if last_rev != _mod_revision.ensure_null(revision):
2302
 
            # the working tree is up to date with the branch
2303
 
            # we can merge the specified revision from master
2304
 
            to_tree = self.branch.repository.revision_tree(revision)
2305
 
            to_root_id = to_tree.get_root_id()
2306
 
 
 
2217
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2218
            # merge tree state up to new branch tip.
2307
2219
            basis = self.basis_tree()
2308
2220
            basis.lock_read()
2309
2221
            try:
2310
 
                if (basis.inventory.root is None
2311
 
                    or basis.inventory.root.file_id != to_root_id):
2312
 
                    self.set_root_id(to_root_id)
 
2222
                to_tree = self.branch.basis_tree()
 
2223
                if basis.inventory.root is None:
 
2224
                    self.set_root_id(to_tree.get_root_id())
2313
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)
2314
2232
            finally:
2315
2233
                basis.unlock()
2316
 
 
2317
 
            # determine the branch point
2318
 
            graph = self.branch.repository.get_graph()
2319
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2320
 
                                                last_rev)
2321
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2322
 
 
2323
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2324
 
                                             this_tree=self,
2325
 
                                             change_reporter=change_reporter)
2326
 
            self.set_last_revision(revision)
2327
2234
            # TODO - dedup parents list with things merged by pull ?
2328
2235
            # reuse the tree we've updated to to set the basis:
2329
 
            parent_trees = [(revision, to_tree)]
 
2236
            parent_trees = [(self.branch.last_revision(), to_tree)]
2330
2237
            merges = self.get_parent_ids()[1:]
2331
2238
            # Ideally we ask the tree for the trees here, that way the working
2332
2239
            # tree can decide whether to give us the entire tree or give us a
2336
2243
            for parent in merges:
2337
2244
                parent_trees.append(
2338
2245
                    (parent, self.branch.repository.revision_tree(parent)))
2339
 
            if not _mod_revision.is_null(old_tip):
 
2246
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2340
2247
                parent_trees.append(
2341
2248
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2342
2249
            self.set_parent_trees(parent_trees)
2343
2250
            last_rev = parent_trees[0][0]
2344
 
        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
2345
2283
 
2346
2284
    def _write_hashcache_if_dirty(self):
2347
2285
        """Write out the hashcache if it is dirty."""
2588
2526
        return un_resolved, resolved
2589
2527
 
2590
2528
    @needs_read_lock
2591
 
    def _check(self, references):
2592
 
        """Check the tree for consistency.
2593
 
 
2594
 
        :param references: A dict with keys matching the items returned by
2595
 
            self._get_check_refs(), and values from looking those keys up in
2596
 
            the repository.
2597
 
        """
 
2529
    def _check(self):
2598
2530
        tree_basis = self.basis_tree()
2599
2531
        tree_basis.lock_read()
2600
2532
        try:
2601
 
            repo_basis = references[('trees', self.last_revision())]
 
2533
            repo_basis = self.branch.repository.revision_tree(
 
2534
                self.last_revision())
2602
2535
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2603
2536
                raise errors.BzrCheckError(
2604
2537
                    "Mismatched basis inventory content.")
2617
2550
        """
2618
2551
        return
2619
2552
 
 
2553
    @needs_read_lock
2620
2554
    def _get_rules_searcher(self, default_searcher):
2621
2555
        """See Tree._get_rules_searcher."""
2622
2556
        if self._rules_searcher is None:
2649
2583
        if self._inventory is None:
2650
2584
            self.read_working_inventory()
2651
2585
 
2652
 
    def _get_check_refs(self):
2653
 
        """Return the references needed to perform a check of this tree."""
2654
 
        return [('trees', self.last_revision())]
2655
 
 
2656
2586
    def lock_tree_write(self):
2657
2587
        """See WorkingTree.lock_tree_write().
2658
2588
 
2659
2589
        In Format2 WorkingTrees we have a single lock for the branch and tree
2660
2590
        so lock_tree_write() degrades to lock_write().
2661
 
 
2662
 
        :return: An object with an unlock method which will release the lock
2663
 
            obtained.
2664
2591
        """
2665
2592
        self.branch.lock_write()
2666
2593
        try:
2667
 
            self._control_files.lock_write()
2668
 
            return self
 
2594
            return self._control_files.lock_write()
2669
2595
        except:
2670
2596
            self.branch.unlock()
2671
2597
            raise
2708
2634
 
2709
2635
    def _change_last_revision(self, revision_id):
2710
2636
        """See WorkingTree._change_last_revision."""
2711
 
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
 
2637
        if revision_id is None or revision_id == NULL_REVISION:
2712
2638
            try:
2713
2639
                self._transport.delete('last-revision')
2714
2640
            except errors.NoSuchFile:
2719
2645
                mode=self.bzrdir._get_file_mode())
2720
2646
            return True
2721
2647
 
2722
 
    def _get_check_refs(self):
2723
 
        """Return the references needed to perform a check of this tree."""
2724
 
        return [('trees', self.last_revision())]
2725
 
 
2726
2648
    @needs_tree_write_lock
2727
2649
    def set_conflicts(self, conflicts):
2728
2650
        self._put_rio('conflicts', conflicts.to_stanzas(),
2805
2727
        """Return the format for the working tree object in a_bzrdir."""
2806
2728
        try:
2807
2729
            transport = a_bzrdir.get_workingtree_transport(None)
2808
 
            format_string = transport.get_bytes("format")
 
2730
            format_string = transport.get("format").read()
2809
2731
            return klass._formats[format_string]
2810
2732
        except errors.NoSuchFile:
2811
2733
            raise errors.NoWorkingTree(base=transport.base)
2882
2804
        no working tree.  (See bug #43064).
2883
2805
        """
2884
2806
        sio = StringIO()
2885
 
        inv = inventory.Inventory()
 
2807
        inv = Inventory()
2886
2808
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2887
2809
        sio.seek(0)
2888
2810
        transport.put_file('inventory', sio, file_mode)
2904
2826
            branch.generate_revision_history(revision_id)
2905
2827
        finally:
2906
2828
            branch.unlock()
2907
 
        inv = inventory.Inventory()
 
2829
        inv = Inventory()
2908
2830
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2909
2831
                         branch,
2910
2832
                         inv,
3027
2949
            # only set an explicit root id if there is one to set.
3028
2950
            if basis_tree.inventory.root is not None:
3029
2951
                wt.set_root_id(basis_tree.get_root_id())
3030
 
            if revision_id == _mod_revision.NULL_REVISION:
 
2952
            if revision_id == NULL_REVISION:
3031
2953
                wt.set_parent_trees([])
3032
2954
            else:
3033
2955
                wt.set_parent_trees([(revision_id, basis_tree)])
3040
2962
        return wt
3041
2963
 
3042
2964
    def _initial_inventory(self):
3043
 
        return inventory.Inventory()
 
2965
        return Inventory()
3044
2966
 
3045
2967
    def __init__(self):
3046
2968
        super(WorkingTreeFormat3, self).__init__()
3075
2997
        return self.get_format_string()
3076
2998
 
3077
2999
 
3078
 
__default_format = WorkingTreeFormat6()
 
3000
__default_format = WorkingTreeFormat4()
3079
3001
WorkingTreeFormat.register_format(__default_format)
 
3002
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3080
3003
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3081
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3082
3004
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3083
3005
WorkingTreeFormat.set_default_format(__default_format)
3084
3006
# formats which have no format string are not discoverable