← Back to branch summary

~ubuntu-branches/ubuntu/maverick/bzr/maverick

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-03-24 22:27:38 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: james.westby@ubuntu.com-20100324222738-ceuthj3ypzvd173f
Tags: upstream-2.1.1
Import upstream version 2.1.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
1
 
# Copyright (C) 2005, 2006 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
73
73
                new_file(tt)
74
74
 
75
75
    def merge(self, merge_type=Merge3Merger, interesting_ids=None, **kwargs):
 
76
        merger = self.make_merger(merge_type, interesting_ids, **kwargs)
 
77
        merger.do_merge()
 
78
        return merger.cooked_conflicts
 
79
 
 
80
    def make_preview_transform(self):
 
81
        merger = self.make_merger(Merge3Merger, None, this_revision_tree=True)
 
82
        return merger.make_preview_transform()
 
83
 
 
84
    def make_merger(self, merge_type, interesting_ids,
 
85
            this_revision_tree=False, **kwargs):
76
86
        self.base_tt.apply()
77
87
        self.base.commit('base commit')
78
88
        for tt, wt in ((self.this_tt, self.this), (self.other_tt, self.other)):
89
99
                raise AssertionError()
90
100
        self.this.branch.fetch(self.other.branch)
91
101
        other_basis = self.other.branch.basis_tree()
92
 
        merger = merge_type(self.this, self.this, self.base, other_basis,
93
 
                            interesting_ids=interesting_ids, **kwargs)
94
 
        return merger.cooked_conflicts
 
102
        if this_revision_tree:
 
103
            self.this.commit('message')
 
104
            this_tree = self.this.basis_tree()
 
105
        else:
 
106
            this_tree = self.this
 
107
        merger = merge_type(this_tree, self.this, self.base, other_basis,
 
108
                            interesting_ids=interesting_ids, do_merge=False,
 
109
                            this_branch=self.this.branch, **kwargs)
 
110
        return merger
95
111
 
96
112
    def list_transforms(self):
97
113
        return [self.this_tt, self.base_tt, self.other_tt]