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
391
392
393
394
|
# Copyright (C) 2005 by 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
import bzrlib
from bzrlib.tests import TestCaseWithTransport
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
from bzrlib.workingtree import WorkingTree
from bzrlib.commit import Commit
from bzrlib.config import BranchConfig
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed,
LockContention)
# TODO: Test commit with some added, and added-but-missing files
class MustSignConfig(BranchConfig):
def signature_needed(self):
return True
def gpg_signing_command(self):
return ['cat', '-']
class BranchWithHooks(BranchConfig):
def post_commit(self):
return "bzrlib.ahook bzrlib.ahook"
class TestCommit(TestCaseWithTransport):
def test_simple_commit(self):
"""Commit and check two versions of a single file."""
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
wt.commit(message='add hello')
file_id = wt.path2id('hello')
file('hello', 'w').write('version 2')
wt.commit(message='commit 2')
eq = self.assertEquals
eq(b.revno(), 2)
rh = b.revision_history()
rev = b.repository.get_revision(rh[0])
eq(rev.message, 'add hello')
tree1 = b.repository.revision_tree(rh[0])
text = tree1.get_file_text(file_id)
eq(text, 'hello world')
tree2 = b.repository.revision_tree(rh[1])
eq(tree2.get_file_text(file_id), 'version 2')
def test_delete_commit(self):
"""Test a commit with a deleted file"""
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add(['hello'], ['hello-id'])
wt.commit(message='add hello')
os.remove('hello')
wt.commit('removed hello', rev_id='rev2')
tree = b.repository.revision_tree('rev2')
self.assertFalse(tree.has_id('hello-id'))
def test_pointless_commit(self):
"""Commit refuses unless there are changes or it's forced."""
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello')
wt.add(['hello'])
wt.commit(message='add hello')
self.assertEquals(b.revno(), 1)
self.assertRaises(PointlessCommit,
wt.commit,
message='fails',
allow_pointless=False)
self.assertEquals(b.revno(), 1)
def test_commit_empty(self):
"""Commiting an empty tree works."""
wt = self.make_branch_and_tree('.')
b = wt.branch
wt.commit(message='empty tree', allow_pointless=True)
self.assertRaises(PointlessCommit,
wt.commit,
message='empty tree',
allow_pointless=False)
wt.commit(message='empty tree', allow_pointless=True)
self.assertEquals(b.revno(), 2)
def test_selective_delete(self):
"""Selective commit in tree with deletions"""
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello')
file('buongia', 'w').write('buongia')
wt.add(['hello', 'buongia'],
['hello-id', 'buongia-id'])
wt.commit(message='add files',
rev_id='test@rev-1')
os.remove('hello')
file('buongia', 'w').write('new text')
wt.commit(message='update text',
specific_files=['buongia'],
allow_pointless=False,
rev_id='test@rev-2')
wt.commit(message='remove hello',
specific_files=['hello'],
allow_pointless=False,
rev_id='test@rev-3')
eq = self.assertEquals
eq(b.revno(), 3)
tree2 = b.repository.revision_tree('test@rev-2')
self.assertTrue(tree2.has_filename('hello'))
self.assertEquals(tree2.get_file_text('hello-id'), 'hello')
self.assertEquals(tree2.get_file_text('buongia-id'), 'new text')
tree3 = b.repository.revision_tree('test@rev-3')
self.assertFalse(tree3.has_filename('hello'))
self.assertEquals(tree3.get_file_text('buongia-id'), 'new text')
def test_commit_rename(self):
"""Test commit of a revision where a file is renamed."""
tree = self.make_branch_and_tree('.')
b = tree.branch
self.build_tree(['hello'], line_endings='binary')
tree.add(['hello'], ['hello-id'])
tree.commit(message='one', rev_id='test@rev-1', allow_pointless=False)
tree.rename_one('hello', 'fruity')
tree.commit(message='renamed', rev_id='test@rev-2', allow_pointless=False)
eq = self.assertEquals
tree1 = b.repository.revision_tree('test@rev-1')
eq(tree1.id2path('hello-id'), 'hello')
eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
self.assertFalse(tree1.has_filename('fruity'))
self.check_inventory_shape(tree1.inventory, ['hello'])
ie = tree1.inventory['hello-id']
eq(ie.revision, 'test@rev-1')
tree2 = b.repository.revision_tree('test@rev-2')
eq(tree2.id2path('hello-id'), 'fruity')
eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
self.check_inventory_shape(tree2.inventory, ['fruity'])
ie = tree2.inventory['hello-id']
eq(ie.revision, 'test@rev-2')
def test_reused_rev_id(self):
"""Test that a revision id cannot be reused in a branch"""
wt = self.make_branch_and_tree('.')
b = wt.branch
wt.commit('initial', rev_id='test@rev-1', allow_pointless=True)
self.assertRaises(Exception,
wt.commit,
message='reused id',
rev_id='test@rev-1',
allow_pointless=True)
def test_commit_move(self):
"""Test commit of revisions with moved files and directories"""
eq = self.assertEquals
wt = self.make_branch_and_tree('.')
b = wt.branch
r1 = 'test@rev-1'
self.build_tree(['hello', 'a/', 'b/'])
wt.add(['hello', 'a', 'b'], ['hello-id', 'a-id', 'b-id'])
wt.commit('initial', rev_id=r1, allow_pointless=False)
wt.move(['hello'], 'a')
r2 = 'test@rev-2'
wt.commit('two', rev_id=r2, allow_pointless=False)
self.check_inventory_shape(wt.read_working_inventory(),
['a', 'a/hello', 'b'])
wt.move(['b'], 'a')
r3 = 'test@rev-3'
wt.commit('three', rev_id=r3, allow_pointless=False)
self.check_inventory_shape(wt.read_working_inventory(),
['a', 'a/hello', 'a/b'])
self.check_inventory_shape(b.repository.get_revision_inventory(r3),
['a', 'a/hello', 'a/b'])
wt.move(['a/hello'], 'a/b')
r4 = 'test@rev-4'
wt.commit('four', rev_id=r4, allow_pointless=False)
self.check_inventory_shape(wt.read_working_inventory(),
['a', 'a/b/hello', 'a/b'])
inv = b.repository.get_revision_inventory(r4)
eq(inv['hello-id'].revision, r4)
eq(inv['a-id'].revision, r1)
eq(inv['b-id'].revision, r3)
def test_removed_commit(self):
"""Commit with a removed file"""
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add(['hello'], ['hello-id'])
wt.commit(message='add hello')
wt.remove('hello')
wt.commit('removed hello', rev_id='rev2')
tree = b.repository.revision_tree('rev2')
self.assertFalse(tree.has_id('hello-id'))
def test_committed_ancestry(self):
"""Test commit appends revisions to ancestry."""
wt = self.make_branch_and_tree('.')
b = wt.branch
rev_ids = []
for i in range(4):
file('hello', 'w').write((str(i) * 4) + '\n')
if i == 0:
wt.add(['hello'], ['hello-id'])
rev_id = 'test@rev-%d' % (i+1)
rev_ids.append(rev_id)
wt.commit(message='rev %d' % (i+1),
rev_id=rev_id)
eq = self.assertEquals
eq(b.revision_history(), rev_ids)
for i in range(4):
anc = b.repository.get_ancestry(rev_ids[i])
eq(anc, [None] + rev_ids[:i+1])
def test_commit_new_subdir_child_selective(self):
wt = self.make_branch_and_tree('.')
b = wt.branch
self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
wt.add(['dir', 'dir/file1', 'dir/file2'],
['dirid', 'file1id', 'file2id'])
wt.commit('dir/file1', specific_files=['dir/file1'], rev_id='1')
inv = b.repository.get_inventory('1')
self.assertEqual('1', inv['dirid'].revision)
self.assertEqual('1', inv['file1id'].revision)
# FIXME: This should raise a KeyError I think, rbc20051006
self.assertRaises(BzrError, inv.__getitem__, 'file2id')
def test_strict_commit(self):
"""Try and commit with unknown files and strict = True, should fail."""
from bzrlib.errors import StrictCommitFailed
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
file('goodbye', 'w').write('goodbye cruel world!')
self.assertRaises(StrictCommitFailed, wt.commit,
message='add hello but not goodbye', strict=True)
def test_strict_commit_without_unknowns(self):
"""Try and commit with no unknown files and strict = True,
should work."""
from bzrlib.errors import StrictCommitFailed
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
wt.commit(message='add hello', strict=True)
def test_nonstrict_commit(self):
"""Try and commit with unknown files and strict = False, should work."""
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
file('goodbye', 'w').write('goodbye cruel world!')
wt.commit(message='add hello but not goodbye', strict=False)
def test_nonstrict_commit_without_unknowns(self):
"""Try and commit with no unknown files and strict = False,
should work."""
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
wt.commit(message='add hello', strict=False)
def test_signed_commit(self):
import bzrlib.gpg
import bzrlib.commit as commit
oldstrategy = bzrlib.gpg.GPGStrategy
wt = self.make_branch_and_tree('.')
branch = wt.branch
wt.commit("base", allow_pointless=True, rev_id='A')
self.failIf(branch.repository.has_signature_for_revision_id('A'))
try:
from bzrlib.testament import Testament
# monkey patch gpg signing mechanism
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
commit.Commit(config=MustSignConfig(branch)).commit(message="base",
allow_pointless=True,
rev_id='B',
working_tree=wt)
self.assertEqual(Testament.from_revision(branch.repository,
'B').as_short_text(),
branch.repository.get_signature_text('B'))
finally:
bzrlib.gpg.GPGStrategy = oldstrategy
def test_commit_failed_signature(self):
import bzrlib.gpg
import bzrlib.commit as commit
oldstrategy = bzrlib.gpg.GPGStrategy
wt = self.make_branch_and_tree('.')
branch = wt.branch
wt.commit("base", allow_pointless=True, rev_id='A')
self.failIf(branch.repository.has_signature_for_revision_id('A'))
try:
from bzrlib.testament import Testament
# monkey patch gpg signing mechanism
bzrlib.gpg.GPGStrategy = bzrlib.gpg.DisabledGPGStrategy
config = MustSignConfig(branch)
self.assertRaises(SigningFailed,
commit.Commit(config=config).commit,
message="base",
allow_pointless=True,
rev_id='B',
working_tree=wt)
branch = Branch.open(self.get_url('.'))
self.assertEqual(branch.revision_history(), ['A'])
self.failIf(branch.repository.has_revision('B'))
finally:
bzrlib.gpg.GPGStrategy = oldstrategy
def test_commit_invokes_hooks(self):
import bzrlib.commit as commit
wt = self.make_branch_and_tree('.')
branch = wt.branch
calls = []
def called(branch, rev_id):
calls.append('called')
bzrlib.ahook = called
try:
config = BranchWithHooks(branch)
commit.Commit(config=config).commit(
message = "base",
allow_pointless=True,
rev_id='A', working_tree = wt)
self.assertEqual(['called', 'called'], calls)
finally:
del bzrlib.ahook
def test_commit_object_doesnt_set_nick(self):
# using the Commit object directly does not set the branch nick.
wt = self.make_branch_and_tree('.')
c = Commit()
c.commit(working_tree=wt, message='empty tree', allow_pointless=True)
self.assertEquals(wt.branch.revno(), 1)
self.assertEqual({},
wt.branch.repository.get_revision(
wt.branch.last_revision()).properties)
def test_safe_master_lock(self):
os.mkdir('master')
master = BzrDirMetaFormat1().initialize('master')
master.create_repository()
master_branch = master.create_branch()
master.create_workingtree()
bound = master.sprout('bound')
wt = bound.open_workingtree()
wt.branch.set_bound_location(os.path.realpath('master'))
master_branch.lock_write()
try:
self.assertRaises(LockContention, wt.commit, 'silly')
finally:
master_branch.unlock()
|