32
33
br.append_revision("rev2", "rev3")
33
34
self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
36
class TestFetch(TestCaseInTempDir):
38
36
def test_fetch_revisions(self):
39
37
"""Test fetch-revision operation."""
40
38
from bzrlib.fetch import Fetcher
101
99
self.assertTrue(os.path.exists('b/one'))
102
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(), [])
105
143
# TODO: rewrite this as a regular unittest, without relying on the displayed output
106
144
# >>> from bzrlib.commit import commit
107
145
# >>> bzrlib.trace.silent = True
added
removed
bzrlib/selftest/testbranch.py
