21
from bzrlib.tests import TestCaseInTempDir
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.branch import Branch
23
from bzrlib.commit import commit
24
23
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
25
24
from bzrlib.tests.test_revision import make_branches
26
25
from bzrlib.fetch import fetch
27
26
from bzrlib.check import check
30
class TestCommitMerge(TestCaseInTempDir):
29
class TestCommitMerge(TestCaseWithTransport):
31
30
"""Tests for committing the results of a merge.
33
32
These don't currently test the merge code, which is intentional to
37
36
def test_merge_commit_empty(self):
38
37
"""Simple commit of two-way merge of empty trees."""
41
bx = Branch.initialize('x')
42
by = Branch.initialize('y')
38
wtx = self.make_branch_and_tree('x')
40
wty = self.make_branch_and_tree('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)
43
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
44
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
47
46
fetcher = fetch(from_branch=bx, to_branch=by)
48
47
self.assertEqual(1, fetcher.count_copied)
49
48
self.assertEqual([], fetcher.failed_revisions)
50
49
# just having the history there does nothing
51
50
self.assertRaises(PointlessCommit,
53
by, 'no changes yet', rev_id='y@u-0-2',
52
'no changes yet', rev_id='y@u-0-2',
54
53
allow_pointless=False)
55
by.working_tree().add_pending_merge('x@u-0-1')
56
commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
54
wty.add_pending_merge('x@u-0-1')
55
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
58
57
self.assertEquals(by.revno(), 2)
59
58
self.assertEquals(list(by.revision_history()),
65
64
def test_merge_new_file(self):
66
65
"""Commit merge of two trees with no overlapping files."""
67
self.build_tree(['x/', 'x/ecks', 'y/', 'y/why'])
69
bx = Branch.initialize('x')
70
by = Branch.initialize('y')
71
bx.working_tree().add(['ecks'], ['ecks-id'])
72
by.working_tree().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)
66
wtx = self.make_branch_and_tree('x')
68
wty = self.make_branch_and_tree('y')
71
self.build_tree(['x/ecks', 'y/why'])
73
wtx.add(['ecks'], ['ecks-id'])
74
wty.add(['why'], ['why-id'])
76
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
77
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
77
79
fetch(from_branch=bx, to_branch=by)
78
80
# we haven't merged the texts, but let's fake it
79
81
shutil.copyfile('x/ecks', 'y/ecks')
80
by.working_tree().add(['ecks'], ['ecks-id'])
81
by.working_tree().add_pending_merge('x@u-0-1')
82
wty.add(['ecks'], ['ecks-id'])
83
wty.add_pending_merge('x@u-0-1')
83
85
# partial commit of merges is currently not allowed, because
84
86
# it would give different merge graphs for each file which
85
87
# might be complex. it can be allowed in the future.
86
88
self.assertRaises(Exception,
88
by, 'partial commit', allow_pointless=False,
90
'partial commit', allow_pointless=False,
89
91
specific_files=['ecks'])
91
commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
93
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
92
94
tree = by.repository.revision_tree('y@u-0-2')
93
95
inv = tree.inventory
94
96
self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
added
removed
bzrlib/tests/test_commit_merge.py
