23
class NoChanges(InTempDir):
25
from bzrlib.errors import PointlessCommit
27
b = Branch('.', init=True)
29
self.build_tree(['hello.txt'])
31
self.assertRaises(PointlessCommit,
33
'commit without adding',
34
allow_pointless=False)
36
b.commit('commit pointless tree',
41
b.commit('commit first added file',
42
allow_pointless=False)
44
self.assertRaises(PointlessCommit,
46
'commit after adding file',
47
allow_pointless=False)
49
b.commit('commit pointless revision with one file',
52
b.add_pending_merge('mbp@892739123-2005-123123')
53
b.commit('commit new merge with no text changes',
54
allow_pointless=False)
58
23
class ValidateRevisionId(TestBase):
60
25
from bzrlib.revision import validate_revision_id
83
class PendingMerges(InTempDir):
84
"""Tracking pending-merged revisions."""
86
b = Branch('.', init=True)
88
self.assertEquals(b.pending_merges(), [])
90
b.add_pending_merge('foo@azkhazan-123123-abcabc')
92
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
94
b.add_pending_merge('foo@azkhazan-123123-abcabc')
96
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
98
b.add_pending_merge('wibble@fofof--20050401--1928390812')
99
self.assertEquals(b.pending_merges(),
100
['foo@azkhazan-123123-abcabc',
101
'wibble@fofof--20050401--1928390812'])
103
b.commit("commit from base with two merges")
105
rev = b.get_revision(b.revision_history()[0])
106
self.assertEquals(len(rev.parents), 2)
107
self.assertEquals(rev.parents[0].revision_id,
108
'foo@azkhazan-123123-abcabc')
109
self.assertEquals(rev.parents[1].revision_id,
110
'wibble@fofof--20050401--1928390812')
112
# list should be cleared when we do a commit
113
self.assertEquals(b.pending_merges(), [])
118
48
class Revert(InTempDir):
119
49
"""Test selected-file revert"""
120
50
def runTest(self):
added
removed
bzrlib/selftest/whitebox.py
