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
|
import os
from bzrlib.branch import Branch
from bzrlib.commit import commit
from bzrlib.tests import TestCaseInTempDir
from bzrlib.merge import merge, transform_tree
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
from bzrlib.revision import common_ancestor
from bzrlib.fetch import fetch
class TestMerge(TestCaseInTempDir):
"""Test appending more than one revision"""
def test_pending(self):
br = Branch.initialize(u".")
commit(br, "lala!")
self.assertEquals(len(br.working_tree().pending_merges()), 0)
merge([u'.', -1], [None, None])
self.assertEquals(len(br.working_tree().pending_merges()), 0)
def test_nocommits(self):
self.test_pending()
os.mkdir('branch2')
br2 = Branch.initialize('branch2')
self.assertRaises(NoCommits, merge, ['branch2', -1],
[None, None])
return br2
def test_unrelated(self):
br2 = self.test_nocommits()
commit(br2, "blah")
self.assertRaises(UnrelatedBranches, merge, ['branch2', -1],
[None, None])
return br2
def test_pending_with_null(self):
"""When base is forced to revno 0, pending_merges is set"""
br2 = self.test_unrelated()
br1 = Branch.open(u'.')
fetch(from_branch=br2, to_branch=br1)
# merge all of branch 2 into branch 1 even though they
# are not related.
self.assertRaises(BzrCommandError, merge, ['branch2', -1],
['branch2', 0], reprocess=True, show_base=True)
merge(['branch2', -1], ['branch2', 0], reprocess=True)
self.assertEquals(len(br1.working_tree().pending_merges()), 1)
return (br1, br2)
def test_two_roots(self):
"""Merge base is sane when two unrelated branches are merged"""
br1, br2 = self.test_pending_with_null()
commit(br1, "blah")
last = br1.last_revision()
self.assertEquals(common_ancestor(last, last, br1), last)
def test_create_rename(self):
"""Rename an inventory entry while creating the file"""
b = Branch.initialize(u'.')
file('name1', 'wb').write('Hello')
tree = b.working_tree()
tree.add('name1')
tree.commit(message="hello")
tree.rename_one('name1', 'name2')
os.unlink('name2')
transform_tree(tree, b.basis_tree())
def test_layered_rename(self):
"""Rename both child and parent at same time"""
b = Branch.initialize(u'.')
tree = b.working_tree()
os.mkdir('dirname1')
tree.add('dirname1')
filename = os.path.join('dirname1', 'name1')
file(filename, 'wb').write('Hello')
tree.add(filename)
tree.commit(message="hello")
filename2 = os.path.join('dirname1', 'name2')
tree.rename_one(filename, filename2)
tree.rename_one('dirname1', 'dirname2')
transform_tree(tree, b.basis_tree())
|