← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2009-08-04 11:40:59 UTC
  • mfrom: (4584 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4586.
  • Revision ID: mbp@sourcefrog.net-20090804114059-xptutagbs5jev3ry
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
48
48
import itertools
49
49
import operator
50
50
import stat
51
 
from time import time
52
 
import warnings
53
51
import re
54
52
 
55
53
import bzrlib
57
55
    branch,
58
56
    bzrdir,
59
57
    conflicts as _mod_conflicts,
60
 
    dirstate,
61
58
    errors,
62
59
    generate_ids,
63
60
    globbing,
 
61
    graph as _mod_graph,
64
62
    hashcache,
65
63
    ignores,
 
64
    inventory,
66
65
    merge,
67
66
    revision as _mod_revision,
68
67
    revisiontree,
69
 
    repository,
70
68
    textui,
71
69
    trace,
72
70
    transform,
73
71
    ui,
74
 
    urlutils,
75
72
    views,
76
73
    xml5,
77
 
    xml6,
78
74
    xml7,
79
75
    )
80
76
import bzrlib.branch
81
77
from bzrlib.transport import get_transport
82
 
import bzrlib.ui
83
78
from bzrlib.workingtree_4 import (
84
79
    WorkingTreeFormat4,
85
80
    WorkingTreeFormat5,
89
84
 
90
85
from bzrlib import symbol_versioning
91
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
92
 
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
93
87
from bzrlib.lockable_files import LockableFiles
94
88
from bzrlib.lockdir import LockDir
95
89
import bzrlib.mutabletree
96
90
from bzrlib.mutabletree import needs_tree_write_lock
97
91
from bzrlib import osutils
98
92
from bzrlib.osutils import (
99
 
    compact_date,
100
93
    file_kind,
101
94
    isdir,
102
95
    normpath,
103
96
    pathjoin,
104
 
    rand_chars,
105
97
    realpath,
106
98
    safe_unicode,
107
99
    splitpath,
111
103
from bzrlib.trace import mutter, note
112
104
from bzrlib.transport.local import LocalTransport
113
105
from bzrlib.progress import DummyProgress, ProgressPhase
114
 
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
 
106
from bzrlib.revision import CURRENT_REVISION
115
107
from bzrlib.rio import RioReader, rio_file, Stanza
116
 
from bzrlib.symbol_versioning import (deprecated_passed,
117
 
        deprecated_method,
118
 
        deprecated_function,
119
 
        DEPRECATED_PARAMETER,
120
 
        )
 
108
from bzrlib.symbol_versioning import (
 
109
    deprecated_passed,
 
110
    DEPRECATED_PARAMETER,
 
111
    )
121
112
 
122
113
 
123
114
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
487
478
        incorrectly attributed to CURRENT_REVISION (but after committing, the
488
479
        attribution will be correct).
489
480
        """
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()
 
481
        maybe_file_parent_keys = []
 
482
        for parent_id in self.get_parent_ids():
 
483
            try:
 
484
                parent_tree = self.revision_tree(parent_id)
 
485
            except errors.NoSuchRevisionInTree:
 
486
                parent_tree = self.branch.repository.revision_tree(parent_id)
 
487
            parent_tree.lock_read()
 
488
            try:
 
489
                if file_id not in parent_tree:
 
490
                    continue
 
491
                ie = parent_tree.inventory[file_id]
 
492
                if ie.kind != 'file':
 
493
                    # Note: this is slightly unnecessary, because symlinks and
 
494
                    # directories have a "text" which is the empty text, and we
 
495
                    # know that won't mess up annotations. But it seems cleaner
 
496
                    continue
 
497
                parent_text_key = (file_id, ie.revision)
 
498
                if parent_text_key not in maybe_file_parent_keys:
 
499
                    maybe_file_parent_keys.append(parent_text_key)
 
500
            finally:
 
501
                parent_tree.unlock()
 
502
        graph = _mod_graph.Graph(self.branch.repository.texts)
 
503
        heads = graph.heads(maybe_file_parent_keys)
 
504
        file_parent_keys = []
 
505
        for key in maybe_file_parent_keys:
 
506
            if key in heads:
 
507
                file_parent_keys.append(key)
 
508
 
 
509
        # Now we have the parents of this content
 
510
        annotator = self.branch.repository.texts.get_annotator()
 
511
        text = self.get_file(file_id).read()
 
512
        this_key =(file_id, default_revision)
 
513
        annotator.add_special_text(this_key, file_parent_keys, text)
 
514
        annotations = [(key[-1], line)
 
515
                       for key, line in annotator.annotate_flat(this_key)]
 
516
        return annotations
515
517
 
516
518
    def _get_ancestors(self, default_revision):
517
519
        ancestors = set([default_revision])
889
891
            branch.last_revision().
890
892
        """
891
893
        from bzrlib.merge import Merger, Merge3Merger
892
 
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
894
        pb = ui.ui_factory.nested_progress_bar()
893
895
        try:
894
896
            merger = Merger(self.branch, this_tree=self, pb=pb)
895
897
            merger.pp = ProgressPhase("Merge phase", 5, pb)
1081
1083
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1082
1084
        else:
1083
1085
            tree_bzrdir = branch_bzrdir
1084
 
        wt = tree_bzrdir.create_workingtree(NULL_REVISION)
 
1086
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1085
1087
        wt.set_parent_ids(self.get_parent_ids())
1086
1088
        my_inv = self.inventory
1087
 
        child_inv = Inventory(root_id=None)
 
1089
        child_inv = inventory.Inventory(root_id=None)
1088
1090
        new_root = my_inv[file_id]
1089
1091
        my_inv.remove_recursive_id(file_id)
1090
1092
        new_root.parent_id = None
1416
1418
        inv = self.inventory
1417
1419
        for entry in moved:
1418
1420
            try:
1419
 
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
 
1421
                self._move_entry(WorkingTree._RenameEntry(
 
1422
                    entry.to_rel, entry.from_id,
1420
1423
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1421
1424
                    entry.from_tail, entry.from_parent_id,
1422
1425
                    entry.only_change_inv))
1473
1476
        from_tail = splitpath(from_rel)[-1]
1474
1477
        from_id = inv.path2id(from_rel)
1475
1478
        if from_id is None:
1476
 
            raise errors.BzrRenameFailedError(from_rel,to_rel,
1477
 
                errors.NotVersionedError(path=str(from_rel)))
1478
 
        from_entry = inv[from_id]
 
1479
            # if file is missing in the inventory maybe it's in the basis_tree
 
1480
            basis_tree = self.branch.basis_tree()
 
1481
            from_id = basis_tree.path2id(from_rel)
 
1482
            if from_id is None:
 
1483
                raise errors.BzrRenameFailedError(from_rel,to_rel,
 
1484
                    errors.NotVersionedError(path=str(from_rel)))
 
1485
            # put entry back in the inventory so we can rename it
 
1486
            from_entry = basis_tree.inventory[from_id].copy()
 
1487
            inv.add(from_entry)
 
1488
        else:
 
1489
            from_entry = inv[from_id]
1479
1490
        from_parent_id = from_entry.parent_id
1480
1491
        to_dir, to_tail = os.path.split(to_rel)
1481
1492
        to_dir_id = inv.path2id(to_dir)
1573
1584
    @needs_write_lock
1574
1585
    def pull(self, source, overwrite=False, stop_revision=None,
1575
1586
             change_reporter=None, possible_transports=None, local=False):
1576
 
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1587
        top_pb = ui.ui_factory.nested_progress_bar()
1577
1588
        source.lock_read()
1578
1589
        try:
1579
1590
            pp = ProgressPhase("Pull phase", 2, top_pb)
1587
1598
            if new_revision_info != old_revision_info:
1588
1599
                pp.next_phase()
1589
1600
                repository = self.branch.repository
1590
 
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1601
                pb = ui.ui_factory.nested_progress_bar()
1591
1602
                basis_tree.lock_read()
1592
1603
                try:
1593
1604
                    new_basis_tree = self.branch.basis_tree()
2042
2053
            if filenames is None and len(self.get_parent_ids()) > 1:
2043
2054
                parent_trees = []
2044
2055
                last_revision = self.last_revision()
2045
 
                if last_revision != NULL_REVISION:
 
2056
                if last_revision != _mod_revision.NULL_REVISION:
2046
2057
                    if basis_tree is None:
2047
2058
                        basis_tree = self.basis_tree()
2048
2059
                        basis_tree.lock_read()
2086
2097
    def set_inventory(self, new_inventory_list):
2087
2098
        from bzrlib.inventory import (Inventory,
2088
2099
                                      InventoryDirectory,
2089
 
                                      InventoryEntry,
2090
2100
                                      InventoryFile,
2091
2101
                                      InventoryLink)
2092
2102
        inv = Inventory(self.get_root_id())
2634
2644
 
2635
2645
    def _change_last_revision(self, revision_id):
2636
2646
        """See WorkingTree._change_last_revision."""
2637
 
        if revision_id is None or revision_id == NULL_REVISION:
 
2647
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
2638
2648
            try:
2639
2649
                self._transport.delete('last-revision')
2640
2650
            except errors.NoSuchFile:
2804
2814
        no working tree.  (See bug #43064).
2805
2815
        """
2806
2816
        sio = StringIO()
2807
 
        inv = Inventory()
 
2817
        inv = inventory.Inventory()
2808
2818
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2809
2819
        sio.seek(0)
2810
2820
        transport.put_file('inventory', sio, file_mode)
2826
2836
            branch.generate_revision_history(revision_id)
2827
2837
        finally:
2828
2838
            branch.unlock()
2829
 
        inv = Inventory()
 
2839
        inv = inventory.Inventory()
2830
2840
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
2831
2841
                         branch,
2832
2842
                         inv,
2949
2959
            # only set an explicit root id if there is one to set.
2950
2960
            if basis_tree.inventory.root is not None:
2951
2961
                wt.set_root_id(basis_tree.get_root_id())
2952
 
            if revision_id == NULL_REVISION:
 
2962
            if revision_id == _mod_revision.NULL_REVISION:
2953
2963
                wt.set_parent_trees([])
2954
2964
            else:
2955
2965
                wt.set_parent_trees([(revision_id, basis_tree)])
2962
2972
        return wt
2963
2973
 
2964
2974
    def _initial_inventory(self):
2965
 
        return Inventory()
 
2975
        return inventory.Inventory()
2966
2976
 
2967
2977
    def __init__(self):
2968
2978
        super(WorkingTreeFormat3, self).__init__()