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
|
# Copyright (C) 2005 by 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
import shutil
from bzrlib.selftest import TestCaseInTempDir
from bzrlib.branch import Branch
from bzrlib.commit import commit
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
from bzrlib.selftest.testrevision import make_branches
from bzrlib.fetch import fetch
from bzrlib.check import check
class TestCommitMerge(TestCaseInTempDir):
"""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."""
os.mkdir('x')
os.mkdir('y')
bx = Branch.initialize('x')
by = Branch.initialize('y')
commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
fetch(from_branch=bx, to_branch=by)
# just having the history there does nothing
self.assertRaises(PointlessCommit,
commit,
by, 'no changes yet', rev_id='y@u-0-2',
allow_pointless=False)
by.add_pending_merge('x@u-0-1')
commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
self.assertEquals(by.revno(), 2)
self.assertEquals(list(by.revision_history()),
['y@u-0-1', 'y@u-0-2'])
rev = by.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."""
self.build_tree(['x/', 'x/ecks', 'y/', 'y/why'])
bx = Branch.initialize('x')
by = Branch.initialize('y')
bx.add(['ecks'], ['ecks-id'])
by.add(['why'], ['why-id'])
commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
fetch(from_branch=bx, to_branch=by)
# we haven't merged the texts, but let's fake it
shutil.copyfile('x/ecks', 'y/ecks')
by.add(['ecks'], ['ecks-id'])
by.add_pending_merge('x@u-0-1')
# 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,
commit,
by, 'partial commit', allow_pointless=False,
specific_files=['ecks'])
commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
tree = by.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')
check(bx, False)
check(by, False)
|