← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Robert Collins
  • Date: 2007-03-08 04:06:06 UTC
  • mfrom: (2323.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070308040606-84gsniv56huiyjt4
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
 
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
1
17
import os
2
18
from StringIO import StringIO
3
19
 
 
20
from bzrlib import (
 
21
    conflicts,
 
22
    merge as _mod_merge,
 
23
    option,
 
24
    )
4
25
from bzrlib.branch import Branch
5
26
from bzrlib.builtins import merge
6
 
from bzrlib.commit import commit
 
27
from bzrlib.conflicts import ConflictList, TextConflict
7
28
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
8
29
from bzrlib.merge import transform_tree, merge_inner
9
 
from bzrlib.osutils import pathjoin
 
30
from bzrlib.osutils import pathjoin, file_kind
10
31
from bzrlib.revision import common_ancestor
11
32
from bzrlib.tests import TestCaseWithTransport
12
33
from bzrlib.trace import (enable_test_log, disable_test_log)
18
39
 
19
40
    def test_pending(self):
20
41
        wt = self.make_branch_and_tree('.')
21
 
        wt.commit("lala!")
22
 
        self.assertEquals(len(wt.pending_merges()), 0)
 
42
        rev_a = wt.commit("lala!")
 
43
        self.assertEqual([rev_a], wt.get_parent_ids())
23
44
        merge([u'.', -1], [None, None])
24
 
        self.assertEquals(len(wt.pending_merges()), 0)
 
45
        self.assertEqual([rev_a], wt.get_parent_ids())
25
46
 
26
47
    def test_undo(self):
27
48
        wt = self.make_branch_and_tree('.')
44
65
                          [None, None])
45
66
        return wt2
46
67
 
47
 
    def test_merge_one(self):
 
68
    def test_merge_one_file(self):
 
69
        """Do a partial merge of a tree which should not affect tree parents."""
48
70
        wt1 = self.make_branch_and_tree('branch1')
49
 
        wt1.commit('empty commit')
 
71
        tip = wt1.commit('empty commit')
50
72
        wt2 = self.make_branch_and_tree('branch2')
51
73
        wt2.pull(wt1.branch)
52
74
        file('branch1/foo', 'wb').write('foo')
59
81
        self.run_bzr('merge', '../branch1/foo')
60
82
        self.failUnlessExists('foo')
61
83
        self.failIfExists('bar')
62
 
        wt2 = WorkingTree.open_containing('branch2')[0]
63
 
        self.assertEqual(wt2.pending_merges(), [])
64
 
 
 
84
        wt2 = WorkingTree.open('.') # opens branch2
 
85
        self.assertEqual([tip], wt2.get_parent_ids())
 
86
        
65
87
    def test_pending_with_null(self):
66
 
        """When base is forced to revno 0, pending_merges is set"""
 
88
        """When base is forced to revno 0, parent_ids are set"""
67
89
        wt2 = self.test_unrelated()
68
90
        wt1 = WorkingTree.open('.')
69
91
        br1 = wt1.branch
70
92
        br1.fetch(wt2.branch)
71
93
        # merge all of branch 2 into branch 1 even though they 
72
94
        # are not related.
73
 
        self.assertRaises(BzrCommandError, merge, ['branch2', -1], 
 
95
        self.assertRaises(BzrCommandError, merge, ['branch2', -1],
74
96
                          ['branch2', 0], reprocess=True, show_base=True)
75
97
        merge(['branch2', -1], ['branch2', 0], reprocess=True)
76
 
        self.assertEquals(len(wt1.pending_merges()), 1)
 
98
        self.assertEqual([br1.last_revision(), wt2.branch.last_revision()],
 
99
            wt1.get_parent_ids())
77
100
        return (wt1, wt2.branch)
78
101
 
79
102
    def test_two_roots(self):
81
104
        wt1, br2 = self.test_pending_with_null()
82
105
        wt1.commit("blah")
83
106
        last = wt1.branch.last_revision()
84
 
        self.assertEquals(common_ancestor(last, last, wt1.branch.repository), last)
 
107
        self.assertEqual(common_ancestor(last, last, wt1.branch.repository), last)
85
108
 
86
109
    def test_create_rename(self):
87
110
        """Rename an inventory entry while creating the file"""
108
131
        transform_tree(tree, tree.branch.basis_tree())
109
132
 
110
133
    def test_ignore_zero_merge_inner(self):
111
 
        # Test that merge_inner's ignore zero paramter is effective
 
134
        # Test that merge_inner's ignore zero parameter is effective
112
135
        tree_a =self.make_branch_and_tree('a')
113
136
        tree_a.commit(message="hello")
114
137
        dir_b = tree_a.bzrdir.sprout('b')
117
140
        log = StringIO()
118
141
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
119
142
                    this_tree=tree_b, ignore_zero=True)
120
 
        log = self._get_log()
 
143
        log = self._get_log(keep_log_file=True)
121
144
        self.failUnless('All changes applied successfully.\n' not in log)
122
145
        tree_b.revert([])
123
146
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
124
147
                    this_tree=tree_b, ignore_zero=False)
125
 
        log = self._get_log()
 
148
        log = self._get_log(keep_log_file=True)
126
149
        self.failUnless('All changes applied successfully.\n' in log)
 
150
 
 
151
    def test_merge_inner_conflicts(self):
 
152
        tree_a = self.make_branch_and_tree('a')
 
153
        tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
 
154
        merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
 
155
        self.assertEqual(1, len(tree_a.conflicts()))
 
156
 
 
157
    def test_rmdir_conflict(self):
 
158
        tree_a = self.make_branch_and_tree('a')
 
159
        self.build_tree(['a/b/'])
 
160
        tree_a.add('b', 'b-id')
 
161
        tree_a.commit('added b')
 
162
        # basis_tree() is only guaranteed to be valid as long as it is actually
 
163
        # the basis tree. This mutates the tree after grabbing basis, so go to
 
164
        # the repository.
 
165
        base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
 
166
        tree_z = tree_a.bzrdir.sprout('z').open_workingtree()
 
167
        self.build_tree(['a/b/c'])
 
168
        tree_a.add('b/c')
 
169
        tree_a.commit('added c')
 
170
        os.rmdir('z/b')
 
171
        tree_z.commit('removed b')
 
172
        merge_inner(tree_z.branch, tree_a, base_tree, this_tree=tree_z)
 
173
        self.assertEqual([
 
174
            conflicts.MissingParent('Created directory', 'b', 'b-id'),
 
175
            conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
 
176
            tree_z.conflicts())
 
177
        merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree,
 
178
                    this_tree=tree_a)
 
179
        self.assertEqual([
 
180
            conflicts.DeletingParent('Not deleting', 'b', 'b-id'),
 
181
            conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
 
182
            tree_a.conflicts())
 
183
 
 
184
    def test_nested_merge(self):
 
185
        tree = self.make_branch_and_tree('tree',
 
186
            format='dirstate-with-subtree')
 
187
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
 
188
            format='dirstate-with-subtree')
 
189
        sub_tree.set_root_id('sub-tree-root')
 
190
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
 
191
        sub_tree.add('file')
 
192
        sub_tree.commit('foo')
 
193
        tree.add_reference(sub_tree)
 
194
        tree.commit('set text to 1')
 
195
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
196
        # modify the file in the subtree
 
197
        self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
 
198
        # and merge the changes from the diverged subtree into the containing
 
199
        # tree
 
200
        tree2.commit('changed file text')
 
201
        tree.merge_from_branch(tree2.branch)
 
202
        self.assertFileEqual('text2', 'tree/sub-tree/file')
 
203
 
 
204
    def test_merge_with_missing(self):
 
205
        tree_a = self.make_branch_and_tree('tree_a')
 
206
        self.build_tree_contents([('tree_a/file', 'content_1')])
 
207
        tree_a.add('file')
 
208
        tree_a.commit('commit base')
 
209
        # basis_tree() is only guaranteed to be valid as long as it is actually
 
210
        # the basis tree. This mutates the tree after grabbing basis, so go to
 
211
        # the repository.
 
212
        base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
 
213
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
214
        self.build_tree_contents([('tree_a/file', 'content_2')])
 
215
        tree_a.commit('commit other')
 
216
        other_tree = tree_a.basis_tree()
 
217
        os.unlink('tree_b/file')
 
218
        merge_inner(tree_b.branch, other_tree, base_tree, this_tree=tree_b)
 
219
 
 
220
    def test_merge_kind_change(self):
 
221
        tree_a = self.make_branch_and_tree('tree_a')
 
222
        self.build_tree_contents([('tree_a/file', 'content_1')])
 
223
        tree_a.add('file', 'file-id')
 
224
        tree_a.commit('added file')
 
225
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
226
        os.unlink('tree_a/file')
 
227
        self.build_tree(['tree_a/file/'])
 
228
        tree_a.commit('changed file to directory')
 
229
        tree_b.merge_from_branch(tree_a.branch)
 
230
        self.assertEqual('directory', file_kind('tree_b/file'))
 
231
        tree_b.revert([])
 
232
        self.assertEqual('file', file_kind('tree_b/file'))
 
233
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
234
        tree_b.commit('content change')
 
235
        tree_b.merge_from_branch(tree_a.branch)
 
236
        self.assertEqual(tree_b.conflicts(),
 
237
                         [conflicts.ContentsConflict('file',
 
238
                          file_id='file-id')])
 
239
    
 
240
    def test_merge_type_registry(self):
 
241
        merge_type_option = option.Option.OPTIONS['merge-type']
 
242
        self.assertFalse('merge4' in [x[0] for x in 
 
243
                        merge_type_option.iter_switches()])
 
244
        registry = _mod_merge.get_merge_type_registry()
 
245
        registry.register_lazy('merge4', 'bzrlib.merge', 'Merge4Merger',
 
246
                               'time-travelling merge')
 
247
        self.assertTrue('merge4' in [x[0] for x in 
 
248
                        merge_type_option.iter_switches()])
 
249
        registry.remove('merge4')
 
250
        self.assertFalse('merge4' in [x[0] for x in 
 
251
                        merge_type_option.iter_switches()])