← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

(gz) Change minimum required testtools version for selftest to 0.9.5 for
 unicode fixes (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
20
20
lazy_import(globals(), """
21
21
from bzrlib import (
22
22
    branch as _mod_branch,
23
 
    cleanup,
24
23
    conflicts as _mod_conflicts,
25
24
    debug,
26
25
    generate_ids,
38
37
    versionedfile,
39
38
    workingtree,
40
39
    )
 
40
from bzrlib.cleanup import OperationWithCleanups
41
41
""")
42
42
from bzrlib import (
43
43
    decorators,
53
53
 
54
54
def transform_tree(from_tree, to_tree, interesting_ids=None):
55
55
    from_tree.lock_tree_write()
56
 
    operation = cleanup.OperationWithCleanups(merge_inner)
 
56
    operation = OperationWithCleanups(merge_inner)
57
57
    operation.add_cleanup(from_tree.unlock)
58
58
    operation.run_simple(from_tree.branch, to_tree, from_tree,
59
59
        ignore_zero=True, interesting_ids=interesting_ids, this_tree=from_tree)
62
62
class MergeHooks(hooks.Hooks):
63
63
 
64
64
    def __init__(self):
65
 
        hooks.Hooks.__init__(self, "bzrlib.merge", "Merger.hooks")
66
 
        self.add_hook('merge_file_content',
 
65
        hooks.Hooks.__init__(self)
 
66
        self.create_hook(hooks.HookPoint('merge_file_content',
67
67
            "Called with a bzrlib.merge.Merger object to create a per file "
68
68
            "merge object when starting a merge. "
69
69
            "Should return either None or a subclass of "
73
73
            "side has deleted the file and the other has changed it). "
74
74
            "See the AbstractPerFileMerger API docs for details on how it is "
75
75
            "used by merge.",
76
 
            (2, 1))
 
76
            (2, 1), None))
77
77
 
78
78
 
79
79
class AbstractPerFileMerger(object):
458
458
    @deprecated_method(deprecated_in((2, 1, 0)))
459
459
    def file_revisions(self, file_id):
460
460
        self.ensure_revision_trees()
 
461
        def get_id(tree, file_id):
 
462
            revision_id = tree.inventory[file_id].revision
 
463
            return revision_id
461
464
        if self.this_rev_id is None:
462
465
            if self.this_basis_tree.get_file_sha1(file_id) != \
463
466
                self.this_tree.get_file_sha1(file_id):
464
467
                raise errors.WorkingTreeNotRevision(self.this_tree)
465
468
 
466
469
        trees = (self.this_basis_tree, self.other_tree)
467
 
        return [tree.get_file_revision(file_id) for tree in trees]
 
470
        return [get_id(tree, file_id) for tree in trees]
468
471
 
469
472
    @deprecated_method(deprecated_in((2, 1, 0)))
470
473
    def check_basis(self, check_clean, require_commits=True):
498
501
    def _add_parent(self):
499
502
        new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
500
503
        new_parent_trees = []
501
 
        operation = cleanup.OperationWithCleanups(
502
 
            self.this_tree.set_parent_trees)
 
504
        operation = OperationWithCleanups(self.this_tree.set_parent_trees)
503
505
        for revision_id in new_parents:
504
506
            try:
505
507
                tree = self.revision_tree(revision_id)
699
701
        return merge
700
702
 
701
703
    def do_merge(self):
702
 
        operation = cleanup.OperationWithCleanups(self._do_merge_to)
 
704
        operation = OperationWithCleanups(self._do_merge_to)
703
705
        self.this_tree.lock_tree_write()
704
706
        operation.add_cleanup(self.this_tree.unlock)
705
707
        if self.base_tree is not None:
811
813
            warnings.warn("pb argument to Merge3Merger is deprecated")
812
814
 
813
815
    def do_merge(self):
814
 
        operation = cleanup.OperationWithCleanups(self._do_merge)
 
816
        operation = OperationWithCleanups(self._do_merge)
815
817
        self.this_tree.lock_tree_write()
816
818
        operation.add_cleanup(self.this_tree.unlock)
817
819
        self.base_tree.lock_read()
832
834
            pass
833
835
 
834
836
    def make_preview_transform(self):
835
 
        operation = cleanup.OperationWithCleanups(self._make_preview_transform)
 
837
        operation = OperationWithCleanups(self._make_preview_transform)
836
838
        self.base_tree.lock_read()
837
839
        operation.add_cleanup(self.base_tree.unlock)
838
840
        self.other_tree.lock_read()
901
903
        """
902
904
        result = []
903
905
        iterator = self.other_tree.iter_changes(self.base_tree,
904
 
                specific_files=self.interesting_files,
 
906
                include_unchanged=True, specific_files=self.interesting_files,
905
907
                extra_trees=[self.this_tree])
906
908
        this_entries = dict((e.file_id, e) for p, e in
907
909
                            self.this_tree.iter_entries_by_dir(
1116
1118
        # 'other_tree.inventory.root' is not present in this tree. We are
1117
1119
        # calling adjust_path for children which *want* to be present with a
1118
1120
        # correct place to go.
1119
 
        for _, child in self.other_tree.inventory.root.children.iteritems():
 
1121
        for thing, child in self.other_tree.inventory.root.children.iteritems():
1120
1122
            trans_id = self.tt.trans_id_file_id(child.file_id)
1121
1123
            if not other_root_is_present:
1122
1124
                if self.tt.final_kind(trans_id) is not None:
1124
1126
                    # to go already.
1125
1127
                    continue
1126
1128
            # Move the item into the root
1127
 
            try:
1128
 
                final_name = self.tt.final_name(trans_id)
1129
 
            except errors.NoFinalPath:
1130
 
                # This file is not present anymore, ignore it.
1131
 
                continue
1132
 
            self.tt.adjust_path(final_name, self.tt.root, trans_id)
 
1129
            self.tt.adjust_path(self.tt.final_name(trans_id),
 
1130
                                self.tt.root, trans_id)
1133
1131
        if other_root_is_present:
1134
1132
            self.tt.cancel_creation(other_root)
1135
1133
            self.tt.cancel_versioning(other_root)