1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
# Copyright (C) 2005, 2006 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import os
import shutil
from bzrlib.tests import (
SymlinkFeature,
TestCaseWithTransport,
)
from bzrlib.branch import Branch
from bzrlib.errors import PointlessCommit, BzrError
from bzrlib.tests.test_revision import make_branches
from bzrlib import osutils
class TestCommitMerge(TestCaseWithTransport):
"""Tests for committing the results of a merge.
These don't currently test the merge code, which is intentional to
reduce the scope of testing. We just mark the revision as merged
without bothering about the contents much."""
def test_merge_commit_empty(self):
"""Simple commit of two-way merge of empty trees."""
wtx = self.make_branch_and_tree('x')
base_rev = wtx.commit('common parent')
bx = wtx.branch
wty = wtx.bzrdir.sprout('y').open_workingtree()
by = wty.branch
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
by.fetch(bx)
# just having the history there does nothing
self.assertRaises(PointlessCommit,
wty.commit,
'no changes yet', rev_id='y@u-0-2',
allow_pointless=False)
wty.merge_from_branch(bx)
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
self.assertEquals(by.revno(), 3)
self.assertEquals(list(by.revision_history()),
[base_rev, 'y@u-0-1', 'y@u-0-2'])
rev = by.repository.get_revision('y@u-0-2')
self.assertEquals(rev.parent_ids,
['y@u-0-1', 'x@u-0-1'])
def test_merge_new_file(self):
"""Commit merge of two trees with no overlapping files."""
wtx = self.make_branch_and_tree('x')
base_rev = wtx.commit('common parent')
bx = wtx.branch
wtx.commit('establish root id')
wty = wtx.bzrdir.sprout('y').open_workingtree()
self.assertEqual(wtx.get_root_id(), wty.get_root_id())
by = wty.branch
self.build_tree(['x/ecks', 'y/why'])
wtx.add(['ecks'], ['ecks-id'])
wty.add(['why'], ['why-id'])
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
wty.merge_from_branch(bx)
# partial commit of merges is currently not allowed, because
# it would give different merge graphs for each file which
# might be complex. it can be allowed in the future.
self.assertRaises(Exception,
wty.commit,
'partial commit', allow_pointless=False,
specific_files=['ecks'])
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
tree = by.repository.revision_tree('y@u-0-2')
inv = tree.inventory
self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
bx.check()
by.check()
bx.repository.check([bx.last_revision()])
by.repository.check([by.last_revision()])
def test_merge_with_symlink(self):
self.requireFeature(SymlinkFeature)
tree_a = self.make_branch_and_tree('tree_a')
os.symlink('target', osutils.pathjoin('tree_a', 'link'))
tree_a.add('link')
tree_a.commit('added link')
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
self.build_tree(['tree_a/file'])
tree_a.add('file')
tree_a.commit('added file')
self.build_tree(['tree_b/another_file'])
tree_b.add('another_file')
tree_b.commit('add another file')
tree_b.merge_from_branch(tree_a.branch)
tree_b.commit('merge')
|