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
18
from bzrlib.branch import Branch
19
from bzrlib.clone import copy_branch
20
from bzrlib.commit import commit
21
from bzrlib.errors import NoSuchRevision, UnlistableBranch
17
22
from bzrlib.selftest import TestCaseInTempDir
20
class TestAppendRevisions(TestCaseInTempDir):
21
"""Test appending more than one revision"""
23
from bzrlib.trace import mutter
26
class TestBranch(TestCaseInTempDir):
22
28
def test_append_revisions(self):
23
from bzrlib.branch import Branch
24
br = Branch(".", init=True)
29
"""Test appending more than one revision"""
30
br = Branch.initialize(".")
25
31
br.append_revision("rev1")
26
32
self.assertEquals(br.revision_history(), ["rev1",])
27
33
br.append_revision("rev2", "rev3")
28
34
self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
36
def test_fetch_revisions(self):
37
"""Test fetch-revision operation."""
38
from bzrlib.fetch import Fetcher
41
b1 = Branch.initialize('b1')
42
b2 = Branch.initialize('b2')
43
file(os.sep.join(['b1', 'foo']), 'w').write('hello')
44
b1.add(['foo'], ['foo-id'])
45
b1.commit('lala!', rev_id='revision-1', allow_pointless=False)
48
f = Fetcher(from_branch=b1, to_branch=b2)
49
eq = self.assertEquals
51
eq(f.last_revision, 'revision-1')
53
rev = b2.get_revision('revision-1')
54
tree = b2.revision_tree('revision-1')
55
eq(tree.get_file_text('foo-id'), 'hello')
57
def test_push_stores(self):
58
"""Copy the stores from one branch to another"""
60
br_a = Branch.initialize("a")
61
file('a/b', 'wb').write('b')
63
commit(br_a, "silly commit")
66
br_b = Branch.initialize("b")
67
self.assertRaises(NoSuchRevision, br_b.get_revision,
68
br_a.revision_history()[0])
69
br_a.push_stores(br_b)
70
rev = br_b.get_revision(br_a.revision_history()[0])
71
tree = br_b.revision_tree(br_a.revision_history()[0])
73
if tree.inventory[file_id].kind == "file":
74
tree.get_file(file_id).read()
77
def test_copy_branch(self):
78
"""Copy the stores from one branch to another"""
79
br_a, br_b = self.test_push_stores()
80
commit(br_b, "silly commit")
82
br_c = copy_branch(br_a, 'c', basis_branch=br_b)
83
self.assertEqual(br_a.revision_history(), br_c.revision_history())
84
## # basis branches currently disabled for weave format
85
## self.assertFalse(br_b.last_revision() in br_c.revision_history())
86
## br_c.get_revision(br_b.last_revision())
88
def test_copy_partial(self):
89
"""Copy only part of the history of a branch."""
90
self.build_tree(['a/', 'a/one'])
91
br_a = Branch.initialize('a')
93
br_a.commit('commit one', rev_id='u@d-1')
94
self.build_tree(['a/two'])
96
br_a.commit('commit two', rev_id='u@d-2')
97
br_b = copy_branch(br_a, 'b', revision='u@d-1')
98
self.assertEqual(br_b.last_revision(), 'u@d-1')
99
self.assertTrue(os.path.exists('b/one'))
100
self.assertFalse(os.path.exists('b/two'))
103
def test_record_initial_ghost_merge(self):
104
"""A pending merge with no revision present is still a merge."""
105
branch = Branch.initialize('.')
106
branch.add_pending_merge('non:existent@rev--ision--0--2')
107
branch.commit('pretend to merge nonexistent-revision', rev_id='first')
108
rev = branch.get_revision(branch.last_revision())
109
self.assertEqual(len(rev.parent_ids), 1)
110
# parent_sha1s is not populated now, WTF. rbc 20051003
111
self.assertEqual(len(rev.parent_sha1s), 0)
112
self.assertEqual(rev.parent_ids[0], 'non:existent@rev--ision--0--2')
115
# compare the gpg-to-sign info for a commit with a ghost and
116
# an identical tree without a ghost
117
# fetch missing should rewrite the TOC of weaves to list newly available parents.
119
def test_pending_merges(self):
120
"""Tracking pending-merged revisions."""
121
b = Branch.initialize('.')
123
self.assertEquals(b.pending_merges(), [])
124
b.add_pending_merge('foo@azkhazan-123123-abcabc')
125
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
126
b.add_pending_merge('foo@azkhazan-123123-abcabc')
127
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
128
b.add_pending_merge('wibble@fofof--20050401--1928390812')
129
self.assertEquals(b.pending_merges(),
130
['foo@azkhazan-123123-abcabc',
131
'wibble@fofof--20050401--1928390812'])
132
b.commit("commit from base with two merges")
133
rev = b.get_revision(b.revision_history()[0])
134
self.assertEquals(len(rev.parent_ids), 2)
135
self.assertEquals(rev.parent_ids[0],
136
'foo@azkhazan-123123-abcabc')
137
self.assertEquals(rev.parent_ids[1],
138
'wibble@fofof--20050401--1928390812')
139
# list should be cleared when we do a commit
140
self.assertEquals(b.pending_merges(), [])
31
143
# TODO: rewrite this as a regular unittest, without relying on the displayed output
32
144
# >>> from bzrlib.commit import commit
added
removed
bzrlib/selftest/testbranch.py
