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
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
|
# (C) 2005 Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
from bzrlib.clone import copy_branch
from bzrlib.commit import commit
import bzrlib.errors as errors
from bzrlib.errors import NoSuchRevision, UnlistableBranch, NotBranchError
import bzrlib.gpg
from bzrlib.tests import TestCase, TestCaseInTempDir
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
from bzrlib.trace import mutter
import bzrlib.transactions as transactions
from bzrlib.revision import NULL_REVISION
# TODO: Make a branch using basis branch, and check that it
# doesn't request any files that could have been avoided, by
# hooking into the Transport.
class TestBranch(TestCaseInTempDir):
def test_append_revisions(self):
"""Test appending more than one revision"""
br = Branch.initialize(".")
br.append_revision("rev1")
self.assertEquals(br.revision_history(), ["rev1",])
br.append_revision("rev2", "rev3")
self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
def test_fetch_revisions(self):
"""Test fetch-revision operation."""
from bzrlib.fetch import Fetcher
os.mkdir('b1')
os.mkdir('b2')
b1 = Branch.initialize('b1')
b2 = Branch.initialize('b2')
file(os.sep.join(['b1', 'foo']), 'w').write('hello')
b1.working_tree().add(['foo'], ['foo-id'])
b1.working_tree().commit('lala!', rev_id='revision-1', allow_pointless=False)
mutter('start fetch')
f = Fetcher(from_branch=b1, to_branch=b2)
eq = self.assertEquals
eq(f.count_copied, 1)
eq(f.last_revision, 'revision-1')
rev = b2.get_revision('revision-1')
tree = b2.revision_tree('revision-1')
eq(tree.get_file_text('foo-id'), 'hello')
def test_revision_tree(self):
b1 = Branch.initialize('.')
b1.working_tree().commit('lala!', rev_id='revision-1', allow_pointless=True)
tree = b1.revision_tree('revision-1')
tree = b1.revision_tree(None)
self.assertEqual(len(tree.list_files()), 0)
tree = b1.revision_tree(NULL_REVISION)
self.assertEqual(len(tree.list_files()), 0)
def get_unbalanced_branch_pair(self):
"""Return two branches, a and b, with one file in a."""
os.mkdir('a')
br_a = Branch.initialize("a")
file('a/b', 'wb').write('b')
br_a.working_tree().add('b')
commit(br_a, "silly commit", rev_id='A')
os.mkdir('b')
br_b = Branch.initialize("b")
return br_a, br_b
def get_balanced_branch_pair(self):
"""Returns br_a, br_b as with one commit in a, and b has a's stores."""
br_a, br_b = self.get_unbalanced_branch_pair()
br_a.push_stores(br_b)
return br_a, br_b
def test_push_stores(self):
"""Copy the stores from one branch to another"""
br_a, br_b = self.get_unbalanced_branch_pair()
# ensure the revision is missing.
self.assertRaises(NoSuchRevision, br_b.get_revision,
br_a.revision_history()[0])
br_a.push_stores(br_b)
# check that b now has all the data from a's first commit.
rev = br_b.get_revision(br_a.revision_history()[0])
tree = br_b.revision_tree(br_a.revision_history()[0])
for file_id in tree:
if tree.inventory[file_id].kind == "file":
tree.get_file(file_id).read()
return br_a, br_b
def test_copy_branch(self):
"""Copy the stores from one branch to another"""
br_a, br_b = self.get_balanced_branch_pair()
commit(br_b, "silly commit")
os.mkdir('c')
br_c = copy_branch(br_a, 'c', basis_branch=br_b)
self.assertEqual(br_a.revision_history(), br_c.revision_history())
def test_copy_partial(self):
"""Copy only part of the history of a branch."""
self.build_tree(['a/', 'a/one'])
br_a = Branch.initialize('a')
br_a.working_tree().add(['one'])
br_a.working_tree().commit('commit one', rev_id='u@d-1')
self.build_tree(['a/two'])
br_a.working_tree().add(['two'])
br_a.working_tree().commit('commit two', rev_id='u@d-2')
br_b = copy_branch(br_a, 'b', revision='u@d-1')
self.assertEqual(br_b.last_revision(), 'u@d-1')
self.assertTrue(os.path.exists('b/one'))
self.assertFalse(os.path.exists('b/two'))
def test_record_initial_ghost_merge(self):
"""A pending merge with no revision present is still a merge."""
branch = Branch.initialize('.')
branch.working_tree().add_pending_merge('non:existent@rev--ision--0--2')
branch.working_tree().commit('pretend to merge nonexistent-revision', rev_id='first')
rev = branch.get_revision(branch.last_revision())
self.assertEqual(len(rev.parent_ids), 1)
# parent_sha1s is not populated now, WTF. rbc 20051003
self.assertEqual(len(rev.parent_sha1s), 0)
self.assertEqual(rev.parent_ids[0], 'non:existent@rev--ision--0--2')
def test_bad_revision(self):
branch = Branch.initialize('.')
self.assertRaises(errors.InvalidRevisionId, branch.get_revision, None)
# TODO 20051003 RBC:
# compare the gpg-to-sign info for a commit with a ghost and
# an identical tree without a ghost
# fetch missing should rewrite the TOC of weaves to list newly available parents.
def test_pending_merges(self):
"""Tracking pending-merged revisions."""
b = Branch.initialize('.')
wt = b.working_tree()
self.assertEquals(wt.pending_merges(), [])
wt.add_pending_merge('foo@azkhazan-123123-abcabc')
self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc'])
wt.add_pending_merge('foo@azkhazan-123123-abcabc')
self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc'])
wt.add_pending_merge('wibble@fofof--20050401--1928390812')
self.assertEquals(wt.pending_merges(),
['foo@azkhazan-123123-abcabc',
'wibble@fofof--20050401--1928390812'])
b.working_tree().commit("commit from base with two merges")
rev = b.get_revision(b.revision_history()[0])
self.assertEquals(len(rev.parent_ids), 2)
self.assertEquals(rev.parent_ids[0],
'foo@azkhazan-123123-abcabc')
self.assertEquals(rev.parent_ids[1],
'wibble@fofof--20050401--1928390812')
# list should be cleared when we do a commit
self.assertEquals(wt.pending_merges(), [])
def test_sign_existing_revision(self):
branch = Branch.initialize('.')
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
from bzrlib.testament import Testament
branch.sign_revision('A', bzrlib.gpg.LoopbackGPGStrategy(None))
self.assertEqual(Testament.from_revision(branch, 'A').as_short_text(),
branch.revision_store.get('A', 'sig').read())
def test_store_signature(self):
branch = Branch.initialize('.')
branch.store_revision_signature(bzrlib.gpg.LoopbackGPGStrategy(None),
'FOO', 'A')
self.assertEqual('FOO', branch.revision_store.get('A', 'sig').read())
def test__relcontrolfilename(self):
branch = Branch.initialize('.')
self.assertEqual('.bzr/%25', branch._rel_controlfilename('%'))
def test__relcontrolfilename_empty(self):
branch = Branch.initialize('.')
self.assertEqual('.bzr', branch._rel_controlfilename(''))
def test_nicks(self):
"""Branch nicknames"""
os.mkdir('bzr.dev')
branch = Branch.initialize('bzr.dev')
self.assertEqual(branch.nick, 'bzr.dev')
os.rename('bzr.dev', 'bzr.ab')
branch = Branch.open('bzr.ab')
self.assertEqual(branch.nick, 'bzr.ab')
branch.nick = "Aaron's branch"
branch.nick = "Aaron's branch"
self.failUnless(os.path.exists(branch.controlfilename("branch.conf")))
self.assertEqual(branch.nick, "Aaron's branch")
os.rename('bzr.ab', 'integration')
branch = Branch.open('integration')
self.assertEqual(branch.nick, "Aaron's branch")
branch.nick = u"\u1234"
self.assertEqual(branch.nick, u"\u1234")
def test_commit_nicks(self):
"""Nicknames are committed to the revision"""
os.mkdir('bzr.dev')
branch = Branch.initialize('bzr.dev')
branch.nick = "My happy branch"
branch.working_tree().commit('My commit respect da nick.')
committed = branch.get_revision(branch.last_revision())
self.assertEqual(committed.properties["branch-nick"],
"My happy branch")
class TestRemote(TestCaseWithWebserver):
def test_open_containing(self):
self.assertRaises(NotBranchError, Branch.open_containing,
self.get_remote_url(''))
self.assertRaises(NotBranchError, Branch.open_containing,
self.get_remote_url('g/p/q'))
b = Branch.initialize('.')
branch, relpath = Branch.open_containing(self.get_remote_url(''))
self.assertEqual('', relpath)
branch, relpath = Branch.open_containing(self.get_remote_url('g/p/q'))
self.assertEqual('g/p/q', relpath)
# TODO: rewrite this as a regular unittest, without relying on the displayed output
# >>> from bzrlib.commit import commit
# >>> bzrlib.trace.silent = True
# >>> br1 = ScratchBranch(files=['foo', 'bar'])
# >>> br1.working_tree().add('foo')
# >>> br1.working_tree().add('bar')
# >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
# >>> br2 = ScratchBranch()
# >>> br2.update_revisions(br1)
# Added 2 texts.
# Added 1 inventories.
# Added 1 revisions.
# >>> br2.revision_history()
# [u'REVISION-ID-1']
# >>> br2.update_revisions(br1)
# Added 0 revisions.
# >>> br1.text_store.total_size() == br2.text_store.total_size()
# True
class InstrumentedTransaction(object):
def finish(self):
self.calls.append('finish')
def __init__(self):
self.calls = []
class TestDecorator(object):
def __init__(self):
self._calls = []
def lock_read(self):
self._calls.append('lr')
def lock_write(self):
self._calls.append('lw')
def unlock(self):
self._calls.append('ul')
@needs_read_lock
def do_with_read(self):
return 1
@needs_read_lock
def except_with_read(self):
raise RuntimeError
@needs_write_lock
def do_with_write(self):
return 2
@needs_write_lock
def except_with_write(self):
raise RuntimeError
class TestDecorators(TestCase):
def test_needs_read_lock(self):
branch = TestDecorator()
self.assertEqual(1, branch.do_with_read())
self.assertEqual(['lr', 'ul'], branch._calls)
def test_excepts_in_read_lock(self):
branch = TestDecorator()
self.assertRaises(RuntimeError, branch.except_with_read)
self.assertEqual(['lr', 'ul'], branch._calls)
def test_needs_write_lock(self):
branch = TestDecorator()
self.assertEqual(2, branch.do_with_write())
self.assertEqual(['lw', 'ul'], branch._calls)
def test_excepts_in_write_lock(self):
branch = TestDecorator()
self.assertRaises(RuntimeError, branch.except_with_write)
self.assertEqual(['lw', 'ul'], branch._calls)
class TestBranchTransaction(TestCaseInTempDir):
def setUp(self):
super(TestBranchTransaction, self).setUp()
self.branch = Branch.initialize('.')
def test_default_get_transaction(self):
"""branch.get_transaction on a new branch should give a PassThrough."""
self.failUnless(isinstance(self.branch.get_transaction(),
transactions.PassThroughTransaction))
def test__set_new_transaction(self):
self.branch._set_transaction(transactions.ReadOnlyTransaction())
def test__set_over_existing_transaction_raises(self):
self.branch._set_transaction(transactions.ReadOnlyTransaction())
self.assertRaises(errors.LockError,
self.branch._set_transaction,
transactions.ReadOnlyTransaction())
def test_finish_no_transaction_raises(self):
self.assertRaises(errors.LockError, self.branch._finish_transaction)
def test_finish_readonly_transaction_works(self):
self.branch._set_transaction(transactions.ReadOnlyTransaction())
self.branch._finish_transaction()
self.assertEqual(None, self.branch._transaction)
def test_unlock_calls_finish(self):
self.branch.lock_read()
transaction = InstrumentedTransaction()
self.branch._transaction = transaction
self.branch.unlock()
self.assertEqual(['finish'], transaction.calls)
def test_lock_read_acquires_ro_transaction(self):
self.branch.lock_read()
self.failUnless(isinstance(self.branch.get_transaction(),
transactions.ReadOnlyTransaction))
self.branch.unlock()
def test_lock_write_acquires_passthrough_transaction(self):
self.branch.lock_write()
# cannot use get_transaction as its magic
self.failUnless(isinstance(self.branch._transaction,
transactions.PassThroughTransaction))
self.branch.unlock()
class TestBranchPushLocations(TestCaseInTempDir):
def setUp(self):
super(TestBranchPushLocations, self).setUp()
self.branch = Branch.initialize('.')
def test_get_push_location_unset(self):
self.assertEqual(None, self.branch.get_push_location())
def test_get_push_location_exact(self):
self.build_tree(['.bazaar/'])
print >> open('.bazaar/branches.conf', 'wt'), ("[%s]\n"
"push_location=foo" %
os.getcwdu())
self.assertEqual("foo", self.branch.get_push_location())
def test_set_push_location(self):
self.branch.set_push_location('foo')
self.assertFileEqual("[%s]\n"
"push_location = foo" % os.getcwdu(),
'.bazaar/branches.conf')
# TODO RBC 20051029 test getting a push location from a branch in a
# recursive section - that is, it appends the branch name.
|