23
class ValidateRevisionId(TestBase):
25
from bzrlib.revision import validate_revision_id
26
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
28
self.assertRaises(ValueError,
33
self.assertRaises(ValueError,
35
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
38
self.assertRaises(ValueError,
40
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
42
self.assertRaises(ValueError,
44
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
48
class PendingMerges(InTempDir):
49
"""Tracking pending-merged revisions."""
51
b = Branch('.', init=True)
53
self.assertEquals(b.pending_merges(), [])
55
b.add_pending_merge('foo@azkhazan-123123-abcabc')
57
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
59
b.add_pending_merge('foo@azkhazan-123123-abcabc')
61
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
63
b.add_pending_merge('wibble@fofof--20050401--1928390812')
64
self.assertEquals(b.pending_merges(),
65
['foo@azkhazan-123123-abcabc',
66
'wibble@fofof--20050401--1928390812'])
68
b.commit("commit from base with two merges")
70
rev = b.get_revision(b.revision_history()[0])
71
self.assertEquals(len(rev.parents), 2)
72
self.assertEquals(rev.parents[0].revision_id,
73
'foo@azkhazan-123123-abcabc')
74
self.assertEquals(rev.parents[1].revision_id,
75
'wibble@fofof--20050401--1928390812')
77
# list should be cleared when we do a commit
78
self.assertEquals(b.pending_merges(), [])
83
22
class Revert(InTempDir):
84
23
"""Test selected-file revert"""
added
removed
bzrlib/selftest/whitebox.py
