← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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,
23
24
    conflicts as _mod_conflicts,
24
25
    debug,
25
26
    generate_ids,
37
38
    versionedfile,
38
39
    workingtree,
39
40
    )
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 = OperationWithCleanups(merge_inner)
 
56
    operation = cleanup.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)
66
 
        self.create_hook(hooks.HookPoint('merge_file_content',
 
65
        hooks.Hooks.__init__(self, "bzrlib.merge", "Merger.hooks")
 
66
        self.add_hook('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), None))
 
76
            (2, 1))
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
464
461
        if self.this_rev_id is None:
465
462
            if self.this_basis_tree.get_file_sha1(file_id) != \
466
463
                self.this_tree.get_file_sha1(file_id):
467
464
                raise errors.WorkingTreeNotRevision(self.this_tree)
468
465
 
469
466
        trees = (self.this_basis_tree, self.other_tree)
470
 
        return [get_id(tree, file_id) for tree in trees]
 
467
        return [tree.get_file_revision(file_id) for tree in trees]
471
468
 
472
469
    @deprecated_method(deprecated_in((2, 1, 0)))
473
470
    def check_basis(self, check_clean, require_commits=True):
501
498
    def _add_parent(self):
502
499
        new_parents = self.this_tree.get_parent_ids() + [self.other_rev_id]
503
500
        new_parent_trees = []
504
 
        operation = OperationWithCleanups(self.this_tree.set_parent_trees)
 
501
        operation = cleanup.OperationWithCleanups(
 
502
            self.this_tree.set_parent_trees)
505
503
        for revision_id in new_parents:
506
504
            try:
507
505
                tree = self.revision_tree(revision_id)
582
580
            elif len(lcas) == 1:
583
581
                self.base_rev_id = list(lcas)[0]
584
582
            else: # len(lcas) > 1
 
583
                self._is_criss_cross = True
585
584
                if len(lcas) > 2:
586
585
                    # find_unique_lca can only handle 2 nodes, so we have to
587
586
                    # start back at the beginning. It is a shame to traverse
592
591
                else:
593
592
                    self.base_rev_id = self.revision_graph.find_unique_lca(
594
593
                                            *lcas)
595
 
                self._is_criss_cross = True
 
594
                sorted_lca_keys = self.revision_graph.find_merge_order(                
 
595
                    revisions[0], lcas)
 
596
                if self.base_rev_id == _mod_revision.NULL_REVISION:
 
597
                    self.base_rev_id = sorted_lca_keys[0]
 
598
                
596
599
            if self.base_rev_id == _mod_revision.NULL_REVISION:
597
600
                raise errors.UnrelatedBranches()
598
601
            if self._is_criss_cross:
599
602
                trace.warning('Warning: criss-cross merge encountered.  See bzr'
600
603
                              ' help criss-cross.')
601
604
                trace.mutter('Criss-cross lcas: %r' % lcas)
602
 
                interesting_revision_ids = [self.base_rev_id]
603
 
                interesting_revision_ids.extend(lcas)
 
605
                if self.base_rev_id in lcas:
 
606
                    trace.mutter('Unable to find unique lca. '
 
607
                                 'Fallback %r as best option.' % self.base_rev_id)
 
608
                interesting_revision_ids = set(lcas)
 
609
                interesting_revision_ids.add(self.base_rev_id)
604
610
                interesting_trees = dict((t.get_revision_id(), t)
605
611
                    for t in self.this_branch.repository.revision_trees(
606
612
                        interesting_revision_ids))
607
613
                self._cached_trees.update(interesting_trees)
608
 
                self.base_tree = interesting_trees.pop(self.base_rev_id)
609
 
                sorted_lca_keys = self.revision_graph.find_merge_order(
610
 
                    revisions[0], lcas)
 
614
                if self.base_rev_id in lcas:
 
615
                    self.base_tree = interesting_trees[self.base_rev_id]
 
616
                else:
 
617
                    self.base_tree = interesting_trees.pop(self.base_rev_id)
611
618
                self._lca_trees = [interesting_trees[key]
612
619
                                   for key in sorted_lca_keys]
613
620
            else:
692
699
        return merge
693
700
 
694
701
    def do_merge(self):
695
 
        operation = OperationWithCleanups(self._do_merge_to)
 
702
        operation = cleanup.OperationWithCleanups(self._do_merge_to)
696
703
        self.this_tree.lock_tree_write()
697
704
        operation.add_cleanup(self.this_tree.unlock)
698
705
        if self.base_tree is not None:
804
811
            warnings.warn("pb argument to Merge3Merger is deprecated")
805
812
 
806
813
    def do_merge(self):
807
 
        operation = OperationWithCleanups(self._do_merge)
 
814
        operation = cleanup.OperationWithCleanups(self._do_merge)
808
815
        self.this_tree.lock_tree_write()
809
816
        operation.add_cleanup(self.this_tree.unlock)
810
817
        self.base_tree.lock_read()
825
832
            pass
826
833
 
827
834
    def make_preview_transform(self):
828
 
        operation = OperationWithCleanups(self._make_preview_transform)
 
835
        operation = cleanup.OperationWithCleanups(self._make_preview_transform)
829
836
        self.base_tree.lock_read()
830
837
        operation.add_cleanup(self.base_tree.unlock)
831
838
        self.other_tree.lock_read()
894
901
        """
895
902
        result = []
896
903
        iterator = self.other_tree.iter_changes(self.base_tree,
897
 
                include_unchanged=True, specific_files=self.interesting_files,
 
904
                specific_files=self.interesting_files,
898
905
                extra_trees=[self.this_tree])
899
906
        this_entries = dict((e.file_id, e) for p, e in
900
907
                            self.this_tree.iter_entries_by_dir(
1085
1092
        return result
1086
1093
 
1087
1094
    def fix_root(self):
1088
 
        try:
1089
 
            self.tt.final_kind(self.tt.root)
1090
 
        except errors.NoSuchFile:
 
1095
        if self.tt.final_kind(self.tt.root) is None:
1091
1096
            self.tt.cancel_deletion(self.tt.root)
1092
1097
        if self.tt.final_file_id(self.tt.root) is None:
1093
1098
            self.tt.version_file(self.tt.tree_file_id(self.tt.root),
1102
1107
            # the other tree's root is a non-root in the current tree (as when
1103
1108
            # a previously unrelated branch is merged into another)
1104
1109
            return
1105
 
        try:
1106
 
            self.tt.final_kind(other_root)
 
1110
        if self.tt.final_kind(other_root) is not None:
1107
1111
            other_root_is_present = True
1108
 
        except errors.NoSuchFile:
 
1112
        else:
1109
1113
            # other_root doesn't have a physical representation. We still need
1110
1114
            # to move any references to the actual root of the tree.
1111
1115
            other_root_is_present = False
1112
1116
        # 'other_tree.inventory.root' is not present in this tree. We are
1113
1117
        # calling adjust_path for children which *want* to be present with a
1114
1118
        # correct place to go.
1115
 
        for thing, child in self.other_tree.inventory.root.children.iteritems():
 
1119
        for _, child in self.other_tree.inventory.root.children.iteritems():
1116
1120
            trans_id = self.tt.trans_id_file_id(child.file_id)
1117
1121
            if not other_root_is_present:
1118
 
                # FIXME: Make final_kind returns None instead of raising
1119
 
                # NoSuchFile to avoid the ugly construct below -- vila 20100402
1120
 
                try:
1121
 
                    self.tt.final_kind(trans_id)
 
1122
                if self.tt.final_kind(trans_id) is not None:
1122
1123
                    # The item exist in the final tree and has a defined place
1123
1124
                    # to go already.
1124
1125
                    continue
1125
 
                except errors.NoSuchFile, e:
1126
 
                    pass
1127
1126
            # Move the item into the root
1128
 
            self.tt.adjust_path(self.tt.final_name(trans_id),
1129
 
                                self.tt.root, trans_id)
 
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)
1130
1133
        if other_root_is_present:
1131
1134
            self.tt.cancel_creation(other_root)
1132
1135
            self.tt.cancel_versioning(other_root)
1405
1408
            self.tt.version_file(file_id, trans_id)
1406
1409
        # The merge has been performed, so the old contents should not be
1407
1410
        # retained.
1408
 
        try:
1409
 
            self.tt.delete_contents(trans_id)
1410
 
        except errors.NoSuchFile:
1411
 
            pass
 
1411
        self.tt.delete_contents(trans_id)
1412
1412
        return result
1413
1413
 
1414
1414
    def _default_other_winner_merge(self, merge_hook_params):
1586
1586
        if winner == 'this' and file_status != "modified":
1587
1587
            return
1588
1588
        trans_id = self.tt.trans_id_file_id(file_id)
1589
 
        try:
1590
 
            if self.tt.final_kind(trans_id) != "file":
1591
 
                return
1592
 
        except errors.NoSuchFile:
 
1589
        if self.tt.final_kind(trans_id) != "file":
1593
1590
            return
1594
1591
        if winner == "this":
1595
1592
            executability = this_executable