6
from bzrlib.selftest import TestCaseInTempDir, TestCase
6
from bzrlib.selftest import InTempDir, TestBase
7
7
from bzrlib.branch import ScratchBranch, Branch
8
8
from bzrlib.errors import NotBranchError, NotVersionedError
11
class TestBranch(TestCaseInTempDir):
13
def test_unknowns(self):
11
class Unknowns(InTempDir):
14
13
b = Branch('.', init=True)
16
15
self.build_tree(['hello.txt',
19
18
self.assertEquals(list(b.unknowns()),
22
def test_no_changes(self):
23
from bzrlib.errors import PointlessCommit
25
b = Branch('.', init=True)
27
self.build_tree(['hello.txt'])
29
self.assertRaises(PointlessCommit,
31
'commit without adding',
32
allow_pointless=False)
34
b.commit('commit pointless tree',
39
b.commit('commit first added file',
40
allow_pointless=False)
42
self.assertRaises(PointlessCommit,
44
'commit after adding file',
45
allow_pointless=False)
47
b.commit('commit pointless revision with one file',
50
b.add_pending_merge('mbp@892739123-2005-123123')
51
b.commit('commit new merge with no text changes',
52
allow_pointless=False)
56
class TestRevisionId(TestCase):
58
def test_validate_revision_id(self):
23
class ValidateRevisionId(TestBase):
59
25
from bzrlib.revision import validate_revision_id
60
26
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
61
28
self.assertRaises(ValueError,
62
29
validate_revision_id,
64
33
self.assertRaises(ValueError,
65
34
validate_revision_id,
66
35
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
67
38
self.assertRaises(ValueError,
68
39
validate_revision_id,
69
40
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
70
42
self.assertRaises(ValueError,
71
43
validate_revision_id,
72
44
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
75
class PendingMerges(TestCaseInTempDir):
77
def test_pending_merges(self):
78
"""Tracking pending-merged revisions."""
48
class PendingMerges(InTempDir):
49
"""Tracking pending-merged revisions."""
79
51
b = Branch('.', init=True)
81
53
self.assertEquals(b.pending_merges(), [])
82
b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
84
b.add_pending_merge('foo@azkhazan-123123-abcabc')
85
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
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'])
86
63
b.add_pending_merge('wibble@fofof--20050401--1928390812')
87
64
self.assertEquals(b.pending_merges(),
88
65
['foo@azkhazan-123123-abcabc',
89
66
'wibble@fofof--20050401--1928390812'])
90
68
b.commit("commit from base with two merges")
91
70
rev = b.get_revision(b.revision_history()[0])
92
71
self.assertEquals(len(rev.parents), 2)
93
72
self.assertEquals(rev.parents[0].revision_id,
94
73
'foo@azkhazan-123123-abcabc')
95
74
self.assertEquals(rev.parents[1].revision_id,
96
75
'wibble@fofof--20050401--1928390812')
97
77
# list should be cleared when we do a commit
98
78
self.assertEquals(b.pending_merges(), [])
100
def test_revert(self):
101
"""Test selected-file revert"""
83
class Revert(InTempDir):
84
"""Test selected-file revert"""
102
86
b = Branch('.', init=True)
104
88
self.build_tree(['hello.txt'])
124
108
self.check_file_contents('hello.txt', 'initial hello')
125
109
self.check_file_contents('hello.txt~', 'initial hello')
127
def test_rename_dirs(self):
128
"""Test renaming directories and the files within them."""
113
class RenameDirs(InTempDir):
114
"""Test renaming directories and the files within them."""
129
116
b = Branch('.', init=True)
130
117
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
131
118
b.add(['dir', 'dir/sub', 'dir/sub/file'])
154
141
['newdir', 'newdir/newsub',
155
142
'newdir/newsub/file'])
157
def test_relpath(self):
158
"""test for branch path lookups
160
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
161
job: given a path (either relative to cwd or absolute), work out
162
if it is inside a branch and return the path relative to the base.
147
class BranchPathTestCase(TestBase):
148
"""test for branch path lookups
150
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
151
job: given a path (either relative to cwd or absolute), work out
152
if it is inside a branch and return the path relative to the base.
164
156
from bzrlib.branch import _relpath
165
157
import tempfile, shutil
167
159
savedir = os.getcwdu()
168
160
dtmp = tempfile.mkdtemp()
169
# On Mac OSX, /tmp actually expands to /private/tmp
170
dtmp = os.path.realpath(dtmp)
173
163
return _relpath(dtmp, p)
added
removed
bzrlib/selftest/whitebox.py
