4
from bzrlib.tests import TestCaseInTempDir, TestCase
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
5
from bzrlib.branch import ScratchBranch, Branch
6
from bzrlib.errors import PathNotChild
7
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
6
from bzrlib.errors import NotBranchError, NotVersionedError
10
9
class TestBranch(TestCaseInTempDir):
11
def test_unknowns(self):
12
b = Branch.initialize('.')
14
self.build_tree(['hello.txt',
17
self.assertEquals(list(b.unknowns()),
12
20
def test_no_changes(self):
13
21
from bzrlib.errors import PointlessCommit
15
b = Branch.initialize(u'.')
23
b = Branch.initialize('.')
17
25
self.build_tree(['hello.txt'])
19
27
self.assertRaises(PointlessCommit,
20
b.working_tree().commit,
21
29
'commit without adding',
22
30
allow_pointless=False)
24
b.working_tree().commit('commit pointless tree',
32
b.commit('commit pointless tree',
25
33
allow_pointless=True)
27
b.working_tree().add('hello.txt')
29
b.working_tree().commit('commit first added file',
37
b.commit('commit first added file',
30
38
allow_pointless=False)
32
40
self.assertRaises(PointlessCommit,
33
b.working_tree().commit,
34
42
'commit after adding file',
35
43
allow_pointless=False)
37
b.working_tree().commit('commit pointless revision with one file',
45
b.commit('commit pointless revision with one file',
38
46
allow_pointless=True)
51
class TestRevisionId(TestCase):
53
def test_validate_revision_id(self):
54
from bzrlib.revision import validate_revision_id
55
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
56
self.assertRaises(ValueError,
59
self.assertRaises(ValueError,
61
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
62
self.assertRaises(ValueError,
64
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
65
self.assertRaises(ValueError,
67
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
41
70
class MoreTests(TestCaseInTempDir):
72
def test_revert(self):
73
"""Test selected-file revert"""
74
b = Branch.initialize('.')
76
self.build_tree(['hello.txt'])
77
file('hello.txt', 'w').write('initial hello')
79
self.assertRaises(NotVersionedError,
80
b.revert, ['hello.txt'])
83
b.commit('create initial hello.txt')
85
self.check_file_contents('hello.txt', 'initial hello')
86
file('hello.txt', 'w').write('new hello')
87
self.check_file_contents('hello.txt', 'new hello')
89
# revert file modified since last revision
90
b.revert(['hello.txt'])
91
self.check_file_contents('hello.txt', 'initial hello')
92
self.check_file_contents('hello.txt~', 'new hello')
94
# reverting again clobbers the backup
95
b.revert(['hello.txt'])
96
self.check_file_contents('hello.txt', 'initial hello')
97
self.check_file_contents('hello.txt~', 'initial hello')
43
99
def test_rename_dirs(self):
44
100
"""Test renaming directories and the files within them."""
45
b = Branch.initialize(u'.')
101
b = Branch.initialize('.')
46
102
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
47
b.working_tree().add(['dir', 'dir/sub', 'dir/sub/file'])
103
b.add(['dir', 'dir/sub', 'dir/sub/file'])
49
b.working_tree().commit('create initial state')
105
b.commit('create initial state')
51
107
# TODO: lift out to a test helper that checks the shape of
60
116
self.check_inventory_shape(inv,
61
117
['dir', 'dir/sub', 'dir/sub/file'])
63
b.working_tree().rename_one('dir', 'newdir')
119
b.rename_one('dir', 'newdir')
65
self.check_inventory_shape(b.working_tree().read_working_inventory(),
121
self.check_inventory_shape(b.inventory,
66
122
['newdir', 'newdir/sub', 'newdir/sub/file'])
68
b.working_tree().rename_one('newdir/sub', 'newdir/newsub')
69
self.check_inventory_shape(b.working_tree().read_working_inventory(),
124
b.rename_one('newdir/sub', 'newdir/newsub')
125
self.check_inventory_shape(b.inventory,
70
126
['newdir', 'newdir/newsub',
71
127
'newdir/newsub/file'])
73
129
def test_relpath(self):
74
130
"""test for branch path lookups
76
bzrlib.osutils._relpath do a simple but subtle
132
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
77
133
job: given a path (either relative to cwd or absolute), work out
78
134
if it is inside a branch and return the path relative to the base.
136
from bzrlib.branch import _relpath
80
137
import tempfile, shutil
82
139
savedir = os.getcwdu()
83
140
dtmp = tempfile.mkdtemp()
84
141
# On Mac OSX, /tmp actually expands to /private/tmp
142
dtmp = os.path.realpath(dtmp)
88
return relpath(dtmp, p)
145
return _relpath(dtmp, p)
91
148
# check paths inside dtmp while standing outside it
92
self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
149
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
95
152
self.assertEqual(rp(dtmp), '')
97
self.assertRaises(PathNotChild,
154
self.assertRaises(NotBranchError,
101
158
# now some near-miss operations -- note that
102
159
# os.path.commonprefix gets these wrong!
103
self.assertRaises(PathNotChild,
160
self.assertRaises(NotBranchError,
105
162
dtmp.rstrip('\\/') + '2')
107
self.assertRaises(PathNotChild,
164
self.assertRaises(NotBranchError,
109
166
dtmp.rstrip('\\/') + '2/foo')
112
169
# directory, or nearby
115
self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
172
FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
173
self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
117
175
self.assertEqual(rp('foo'), 'foo')
119
177
self.assertEqual(rp('./foo'), 'foo')
121
self.assertEqual(rp(abspath('foo')), 'foo')
179
self.assertEqual(rp(os.path.abspath('foo')), 'foo')
123
self.assertRaises(PathNotChild,
181
self.assertRaises(NotBranchError,
added
removed
bzrlib/selftest/whitebox.py
