6
from bzrlib.selftest import InTempDir, TestCase
7
from bzrlib.branch import ScratchBranch, Branch
8
from bzrlib.errors import NotBranchError, NotVersionedError
11
class TestBranch(InTempDir):
13
def test_unknowns(self):
14
b = Branch('.', init=True)
16
self.build_tree(['hello.txt',
19
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):
59
from bzrlib.revision import validate_revision_id
60
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
61
self.assertRaises(ValueError,
64
self.assertRaises(ValueError,
66
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
67
self.assertRaises(ValueError,
69
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
70
self.assertRaises(ValueError,
72
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
75
class PendingMerges(InTempDir):
76
def test_pending_merges(self):
77
"""Tracking pending-merged revisions."""
78
b = Branch('.', init=True)
79
self.assertEquals(b.pending_merges(), [])
80
b.add_pending_merge('foo@azkhazan-123123-abcabc')
81
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
82
b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
84
b.add_pending_merge('wibble@fofof--20050401--1928390812')
85
self.assertEquals(b.pending_merges(),
86
['foo@azkhazan-123123-abcabc',
87
'wibble@fofof--20050401--1928390812'])
88
b.commit("commit from base with two merges")
89
rev = b.get_revision(b.revision_history()[0])
90
self.assertEquals(len(rev.parents), 2)
91
self.assertEquals(rev.parents[0].revision_id,
92
'foo@azkhazan-123123-abcabc')
93
self.assertEquals(rev.parents[1].revision_id,
94
'wibble@fofof--20050401--1928390812')
95
# list should be cleared when we do a commit
96
self.assertEquals(b.pending_merges(), [])
98
def test_revert(self):
99
"""Test selected-file revert"""
100
b = Branch('.', init=True)
102
self.build_tree(['hello.txt'])
103
file('hello.txt', 'w').write('initial hello')
105
self.assertRaises(NotVersionedError,
106
b.revert, ['hello.txt'])
109
b.commit('create initial hello.txt')
111
self.check_file_contents('hello.txt', 'initial hello')
112
file('hello.txt', 'w').write('new hello')
113
self.check_file_contents('hello.txt', 'new hello')
115
# revert file modified since last revision
116
b.revert(['hello.txt'])
117
self.check_file_contents('hello.txt', 'initial hello')
118
self.check_file_contents('hello.txt~', 'new hello')
120
# reverting again clobbers the backup
121
b.revert(['hello.txt'])
122
self.check_file_contents('hello.txt', 'initial hello')
123
self.check_file_contents('hello.txt~', 'initial hello')
125
def test_rename_dirs(self):
126
"""Test renaming directories and the files within them."""
127
b = Branch('.', init=True)
128
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
129
b.add(['dir', 'dir/sub', 'dir/sub/file'])
131
b.commit('create initial state')
133
# TODO: lift out to a test helper that checks the shape of
136
revid = b.revision_history()[0]
137
self.log('first revision_id is {%s}' % revid)
139
inv = b.get_revision_inventory(revid)
140
self.log('contents of inventory: %r' % inv.entries())
142
self.check_inventory_shape(inv,
143
['dir', 'dir/sub', 'dir/sub/file'])
145
b.rename_one('dir', 'newdir')
147
self.check_inventory_shape(b.inventory,
148
['newdir', 'newdir/sub', 'newdir/sub/file'])
150
b.rename_one('newdir/sub', 'newdir/newsub')
151
self.check_inventory_shape(b.inventory,
152
['newdir', 'newdir/newsub',
153
'newdir/newsub/file'])
155
def test_relpath(self):
156
"""test for branch path lookups
158
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
159
job: given a path (either relative to cwd or absolute), work out
160
if it is inside a branch and return the path relative to the base.
162
from bzrlib.branch import _relpath
163
import tempfile, shutil
165
savedir = os.getcwdu()
166
dtmp = tempfile.mkdtemp()
167
# On Mac OSX, /tmp actually expands to /private/tmp
168
dtmp = os.path.realpath(dtmp)
171
return _relpath(dtmp, p)
174
# check paths inside dtmp while standing outside it
175
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
178
self.assertEqual(rp(dtmp), '')
180
self.assertRaises(NotBranchError,
184
# now some near-miss operations -- note that
185
# os.path.commonprefix gets these wrong!
186
self.assertRaises(NotBranchError,
188
dtmp.rstrip('\\/') + '2')
190
self.assertRaises(NotBranchError,
192
dtmp.rstrip('\\/') + '2/foo')
194
# now operations based on relpath of files in current
195
# directory, or nearby
198
self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
200
self.assertEqual(rp('foo'), 'foo')
202
self.assertEqual(rp('./foo'), 'foo')
204
self.assertEqual(rp(os.path.abspath('foo')), 'foo')
206
self.assertRaises(NotBranchError,
added
removed
bzrlib/selftest/whitebox.py
