1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
import os
import unittest
from bzrlib.selftest import TestCaseInTempDir, TestCase
from bzrlib.branch import ScratchBranch, Branch
from bzrlib.errors import NotBranchError, NotVersionedError
class TestBranch(TestCaseInTempDir):
def test_unknowns(self):
b = Branch.initialize('.')
self.build_tree(['hello.txt',
'hello.txt~'])
self.assertEquals(list(b.unknowns()),
['hello.txt'])
def test_no_changes(self):
from bzrlib.errors import PointlessCommit
b = Branch.initialize('.')
self.build_tree(['hello.txt'])
self.assertRaises(PointlessCommit,
b.commit,
'commit without adding',
allow_pointless=False)
b.commit('commit pointless tree',
allow_pointless=True)
b.add('hello.txt')
b.commit('commit first added file',
allow_pointless=False)
self.assertRaises(PointlessCommit,
b.commit,
'commit after adding file',
allow_pointless=False)
b.commit('commit pointless revision with one file',
allow_pointless=True)
class TestRevisionId(TestCase):
def test_validate_revision_id(self):
from bzrlib.revision import validate_revision_id
validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
self.assertRaises(ValueError,
validate_revision_id,
' asdkjas')
self.assertRaises(ValueError,
validate_revision_id,
'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
self.assertRaises(ValueError,
validate_revision_id,
' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
self.assertRaises(ValueError,
validate_revision_id,
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
class MoreTests(TestCaseInTempDir):
def test_revert(self):
"""Test selected-file revert"""
b = Branch.initialize('.')
self.build_tree(['hello.txt'])
file('hello.txt', 'w').write('initial hello')
self.assertRaises(NotVersionedError,
b.revert, ['hello.txt'])
b.add(['hello.txt'])
b.commit('create initial hello.txt')
self.check_file_contents('hello.txt', 'initial hello')
file('hello.txt', 'w').write('new hello')
self.check_file_contents('hello.txt', 'new hello')
# revert file modified since last revision
b.revert(['hello.txt'])
self.check_file_contents('hello.txt', 'initial hello')
self.check_file_contents('hello.txt~', 'new hello')
# reverting again clobbers the backup
b.revert(['hello.txt'])
self.check_file_contents('hello.txt', 'initial hello')
self.check_file_contents('hello.txt~', 'initial hello')
def test_rename_dirs(self):
"""Test renaming directories and the files within them."""
b = Branch.initialize('.')
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
b.add(['dir', 'dir/sub', 'dir/sub/file'])
b.commit('create initial state')
# TODO: lift out to a test helper that checks the shape of
# an inventory
revid = b.revision_history()[0]
self.log('first revision_id is {%s}' % revid)
inv = b.get_revision_inventory(revid)
self.log('contents of inventory: %r' % inv.entries())
self.check_inventory_shape(inv,
['dir', 'dir/sub', 'dir/sub/file'])
b.rename_one('dir', 'newdir')
self.check_inventory_shape(b.inventory,
['newdir', 'newdir/sub', 'newdir/sub/file'])
b.rename_one('newdir/sub', 'newdir/newsub')
self.check_inventory_shape(b.inventory,
['newdir', 'newdir/newsub',
'newdir/newsub/file'])
def test_relpath(self):
"""test for branch path lookups
Branch.relpath and bzrlib.branch._relpath do a simple but subtle
job: given a path (either relative to cwd or absolute), work out
if it is inside a branch and return the path relative to the base.
"""
from bzrlib.branch import _relpath
import tempfile, shutil
savedir = os.getcwdu()
dtmp = tempfile.mkdtemp()
# On Mac OSX, /tmp actually expands to /private/tmp
dtmp = os.path.realpath(dtmp)
def rp(p):
return _relpath(dtmp, p)
try:
# check paths inside dtmp while standing outside it
self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
# root = nothing
self.assertEqual(rp(dtmp), '')
self.assertRaises(NotBranchError,
rp,
'/etc')
# now some near-miss operations -- note that
# os.path.commonprefix gets these wrong!
self.assertRaises(NotBranchError,
rp,
dtmp.rstrip('\\/') + '2')
self.assertRaises(NotBranchError,
rp,
dtmp.rstrip('\\/') + '2/foo')
# now operations based on relpath of files in current
# directory, or nearby
os.chdir(dtmp)
FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
self.assertEqual(rp('foo'), 'foo')
self.assertEqual(rp('./foo'), 'foo')
self.assertEqual(rp(os.path.abspath('foo')), 'foo')
self.assertRaises(NotBranchError,
rp, '../foo')
finally:
os.chdir(savedir)
shutil.rmtree(dtmp)
|