1
# Copyright (C) 2005, 2006 by Canonical Ltd
1
# Copyright (C) 2005 by Canonical Ltd
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
from bzrlib.tests import TestCaseWithTransport
21
from bzrlib.selftest import TestCaseInTempDir
22
22
from bzrlib.branch import Branch
23
from bzrlib.errors import PointlessCommit, BzrError
24
from bzrlib.tests.test_revision import make_branches
27
class TestCommitMerge(TestCaseWithTransport):
23
from bzrlib.commit import commit
24
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
25
from bzrlib.selftest.testrevision import make_branches
26
from bzrlib.fetch import fetch
27
from bzrlib.check import check
30
class TestCommitMerge(TestCaseInTempDir):
28
31
"""Tests for committing the results of a merge.
30
33
These don't currently test the merge code, which is intentional to
34
37
def test_merge_commit_empty(self):
35
38
"""Simple commit of two-way merge of empty trees."""
36
wtx = self.make_branch_and_tree('x')
37
base_rev = wtx.commit('common parent')
39
wty = wtx.bzrdir.sprout('y').open_workingtree()
42
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
43
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
45
self.assertEqual((1, []), by.fetch(bx))
41
bx = Branch.initialize('x')
42
by = Branch.initialize('y')
44
commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
45
commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
47
fetch(from_branch=bx, to_branch=by)
46
48
# just having the history there does nothing
47
49
self.assertRaises(PointlessCommit,
49
'no changes yet', rev_id='y@u-0-2',
51
by, 'no changes yet', rev_id='y@u-0-2',
50
52
allow_pointless=False)
51
wty.merge_from_branch(bx)
52
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
53
by.add_pending_merge('x@u-0-1')
54
commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
54
self.assertEquals(by.revno(), 3)
56
self.assertEquals(by.revno(), 2)
55
57
self.assertEquals(list(by.revision_history()),
56
[base_rev, 'y@u-0-1', 'y@u-0-2'])
57
rev = by.repository.get_revision('y@u-0-2')
58
['y@u-0-1', 'y@u-0-2'])
59
rev = by.get_revision('y@u-0-2')
58
60
self.assertEquals(rev.parent_ids,
59
61
['y@u-0-1', 'x@u-0-1'])
61
65
def test_merge_new_file(self):
62
66
"""Commit merge of two trees with no overlapping files."""
63
wtx = self.make_branch_and_tree('x')
64
base_rev = wtx.commit('common parent')
66
wty = wtx.bzrdir.sprout('y').open_workingtree()
69
self.build_tree(['x/ecks', 'y/why'])
71
wtx.add(['ecks'], ['ecks-id'])
72
wty.add(['why'], ['why-id'])
74
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
75
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
77
wty.merge_from_branch(bx)
67
self.build_tree(['x/', 'x/ecks', 'y/', 'y/why'])
69
bx = Branch.initialize('x')
70
by = Branch.initialize('y')
71
bx.add(['ecks'], ['ecks-id'])
72
by.add(['why'], ['why-id'])
74
commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
75
commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
77
fetch(from_branch=bx, to_branch=by)
78
# we haven't merged the texts, but let's fake it
79
shutil.copyfile('x/ecks', 'y/ecks')
80
by.add(['ecks'], ['ecks-id'])
81
by.add_pending_merge('x@u-0-1')
79
83
# partial commit of merges is currently not allowed, because
80
84
# it would give different merge graphs for each file which
81
85
# might be complex. it can be allowed in the future.
82
86
self.assertRaises(Exception,
84
'partial commit', allow_pointless=False,
88
by, 'partial commit', allow_pointless=False,
85
89
specific_files=['ecks'])
87
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
88
tree = by.repository.revision_tree('y@u-0-2')
91
commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
92
tree = by.revision_tree('y@u-0-2')
89
93
inv = tree.inventory
90
94
self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
91
95
self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
95
bx.repository.check([bx.last_revision()])
96
by.repository.check([by.last_revision()])