51
43
return "bzrlib.ahook bzrlib.ahook"
54
class CapturingReporter(NullCommitReporter):
55
"""This reporter captures the calls made to it for evaluation later."""
58
# a list of the calls this received
61
def snapshot_change(self, change, path):
62
self.calls.append(('change', change, path))
64
def deleted(self, file_id):
65
self.calls.append(('deleted', file_id))
67
def missing(self, path):
68
self.calls.append(('missing', path))
70
def renamed(self, change, old_path, new_path):
71
self.calls.append(('renamed', change, old_path, new_path))
74
class TestCommit(TestCaseWithTransport):
46
class TestCommit(TestCaseInTempDir):
76
48
def test_simple_commit(self):
77
49
"""Commit and check two versions of a single file."""
78
wt = self.make_branch_and_tree('.')
50
b = Branch.initialize('.')
80
51
file('hello', 'w').write('hello world')
82
wt.commit(message='add hello')
83
file_id = wt.path2id('hello')
53
b.working_tree().commit(message='add hello')
54
file_id = b.working_tree().path2id('hello')
85
56
file('hello', 'w').write('version 2')
86
wt.commit(message='commit 2')
57
b.working_tree().commit(message='commit 2')
88
59
eq = self.assertEquals
90
61
rh = b.revision_history()
91
rev = b.repository.get_revision(rh[0])
62
rev = b.get_revision(rh[0])
92
63
eq(rev.message, 'add hello')
94
tree1 = b.repository.revision_tree(rh[0])
65
tree1 = b.revision_tree(rh[0])
95
66
text = tree1.get_file_text(file_id)
96
67
eq(text, 'hello world')
98
tree2 = b.repository.revision_tree(rh[1])
69
tree2 = b.revision_tree(rh[1])
99
70
eq(tree2.get_file_text(file_id), 'version 2')
101
72
def test_delete_commit(self):
102
73
"""Test a commit with a deleted file"""
103
wt = self.make_branch_and_tree('.')
74
b = Branch.initialize('.')
105
75
file('hello', 'w').write('hello world')
106
wt.add(['hello'], ['hello-id'])
107
wt.commit(message='add hello')
76
b.add(['hello'], ['hello-id'])
77
b.working_tree().commit(message='add hello')
109
79
os.remove('hello')
110
wt.commit('removed hello', rev_id='rev2')
80
b.working_tree().commit('removed hello', rev_id='rev2')
112
tree = b.repository.revision_tree('rev2')
82
tree = b.revision_tree('rev2')
113
83
self.assertFalse(tree.has_id('hello-id'))
115
85
def test_pointless_commit(self):
116
86
"""Commit refuses unless there are changes or it's forced."""
117
wt = self.make_branch_and_tree('.')
87
b = Branch.initialize('.')
119
88
file('hello', 'w').write('hello')
121
wt.commit(message='add hello')
90
b.working_tree().commit(message='add hello')
122
91
self.assertEquals(b.revno(), 1)
123
92
self.assertRaises(PointlessCommit,
93
b.working_tree().commit,
126
95
allow_pointless=False)
127
96
self.assertEquals(b.revno(), 1)
129
98
def test_commit_empty(self):
130
99
"""Commiting an empty tree works."""
131
wt = self.make_branch_and_tree('.')
133
wt.commit(message='empty tree', allow_pointless=True)
100
b = Branch.initialize('.')
101
b.working_tree().commit(message='empty tree', allow_pointless=True)
134
102
self.assertRaises(PointlessCommit,
103
b.working_tree().commit,
136
104
message='empty tree',
137
105
allow_pointless=False)
138
wt.commit(message='empty tree', allow_pointless=True)
106
b.working_tree().commit(message='empty tree', allow_pointless=True)
139
107
self.assertEquals(b.revno(), 2)
141
110
def test_selective_delete(self):
142
111
"""Selective commit in tree with deletions"""
143
wt = self.make_branch_and_tree('.')
112
b = Branch.initialize('.')
145
113
file('hello', 'w').write('hello')
146
114
file('buongia', 'w').write('buongia')
147
wt.add(['hello', 'buongia'],
115
b.add(['hello', 'buongia'],
148
116
['hello-id', 'buongia-id'])
149
wt.commit(message='add files',
117
b.working_tree().commit(message='add files',
150
118
rev_id='test@rev-1')
152
120
os.remove('hello')
153
121
file('buongia', 'w').write('new text')
154
wt.commit(message='update text',
122
b.working_tree().commit(message='update text',
155
123
specific_files=['buongia'],
156
124
allow_pointless=False,
157
125
rev_id='test@rev-2')
159
wt.commit(message='remove hello',
127
b.working_tree().commit(message='remove hello',
160
128
specific_files=['hello'],
161
129
allow_pointless=False,
162
130
rev_id='test@rev-3')
193
161
ie = tree1.inventory['hello-id']
194
162
eq(ie.revision, 'test@rev-1')
196
tree2 = b.repository.revision_tree('test@rev-2')
164
tree2 = b.revision_tree('test@rev-2')
197
165
eq(tree2.id2path('hello-id'), 'fruity')
198
166
eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
199
167
self.check_inventory_shape(tree2.inventory, ['fruity'])
200
168
ie = tree2.inventory['hello-id']
201
169
eq(ie.revision, 'test@rev-2')
203
172
def test_reused_rev_id(self):
204
173
"""Test that a revision id cannot be reused in a branch"""
205
wt = self.make_branch_and_tree('.')
207
wt.commit('initial', rev_id='test@rev-1', allow_pointless=True)
174
b = Branch.initialize('.')
175
b.working_tree().commit('initial', rev_id='test@rev-1', allow_pointless=True)
208
176
self.assertRaises(Exception,
177
b.working_tree().commit,
210
178
message='reused id',
211
179
rev_id='test@rev-1',
212
180
allow_pointless=True)
214
184
def test_commit_move(self):
215
185
"""Test commit of revisions with moved files and directories"""
216
186
eq = self.assertEquals
217
wt = self.make_branch_and_tree('.')
187
b = Branch.initialize('.')
219
188
r1 = 'test@rev-1'
220
189
self.build_tree(['hello', 'a/', 'b/'])
221
wt.add(['hello', 'a', 'b'], ['hello-id', 'a-id', 'b-id'])
222
wt.commit('initial', rev_id=r1, allow_pointless=False)
223
wt.move(['hello'], 'a')
190
b.add(['hello', 'a', 'b'], ['hello-id', 'a-id', 'b-id'])
191
b.working_tree().commit('initial', rev_id=r1, allow_pointless=False)
193
b.move(['hello'], 'a')
224
194
r2 = 'test@rev-2'
225
wt.commit('two', rev_id=r2, allow_pointless=False)
228
self.check_inventory_shape(wt.read_working_inventory(),
229
['a', 'a/hello', 'b'])
195
b.working_tree().commit('two', rev_id=r2, allow_pointless=False)
196
self.check_inventory_shape(b.working_tree().read_working_inventory(),
197
['a', 'a/hello', 'b'])
234
200
r3 = 'test@rev-3'
235
wt.commit('three', rev_id=r3, allow_pointless=False)
238
self.check_inventory_shape(wt.read_working_inventory(),
239
['a', 'a/hello', 'a/b'])
240
self.check_inventory_shape(b.repository.get_revision_inventory(r3),
241
['a', 'a/hello', 'a/b'])
201
b.working_tree().commit('three', rev_id=r3, allow_pointless=False)
202
self.check_inventory_shape(b.working_tree().read_working_inventory(),
203
['a', 'a/hello', 'a/b'])
204
self.check_inventory_shape(b.get_revision_inventory(r3),
205
['a', 'a/hello', 'a/b'])
245
wt.move(['a/hello'], 'a/b')
207
b.move([os.sep.join(['a', 'hello'])],
208
os.sep.join(['a', 'b']))
246
209
r4 = 'test@rev-4'
247
wt.commit('four', rev_id=r4, allow_pointless=False)
250
self.check_inventory_shape(wt.read_working_inventory(),
251
['a', 'a/b/hello', 'a/b'])
210
b.working_tree().commit('four', rev_id=r4, allow_pointless=False)
211
self.check_inventory_shape(b.working_tree().read_working_inventory(),
212
['a', 'a/b/hello', 'a/b'])
255
inv = b.repository.get_revision_inventory(r4)
214
inv = b.get_revision_inventory(r4)
256
215
eq(inv['hello-id'].revision, r4)
257
216
eq(inv['a-id'].revision, r1)
258
217
eq(inv['b-id'].revision, r3)
260
220
def test_removed_commit(self):
261
221
"""Commit with a removed file"""
262
wt = self.make_branch_and_tree('.')
222
b = Branch.initialize('.')
223
wt = b.working_tree()
264
224
file('hello', 'w').write('hello world')
265
wt.add(['hello'], ['hello-id'])
266
wt.commit(message='add hello')
225
b.add(['hello'], ['hello-id'])
226
b.working_tree().commit(message='add hello')
228
wt = b.working_tree() # FIXME: kludge for aliasing of working inventory
267
229
wt.remove('hello')
268
wt.commit('removed hello', rev_id='rev2')
230
b.working_tree().commit('removed hello', rev_id='rev2')
270
tree = b.repository.revision_tree('rev2')
232
tree = b.revision_tree('rev2')
271
233
self.assertFalse(tree.has_id('hello-id'))
273
236
def test_committed_ancestry(self):
274
237
"""Test commit appends revisions to ancestry."""
275
wt = self.make_branch_and_tree('.')
238
b = Branch.initialize('.')
278
240
for i in range(4):
279
241
file('hello', 'w').write((str(i) * 4) + '\n')
281
wt.add(['hello'], ['hello-id'])
243
b.add(['hello'], ['hello-id'])
282
244
rev_id = 'test@rev-%d' % (i+1)
283
245
rev_ids.append(rev_id)
284
wt.commit(message='rev %d' % (i+1),
246
b.working_tree().commit(message='rev %d' % (i+1),
286
248
eq = self.assertEquals
287
249
eq(b.revision_history(), rev_ids)
288
250
for i in range(4):
289
anc = b.repository.get_ancestry(rev_ids[i])
251
anc = b.get_ancestry(rev_ids[i])
290
252
eq(anc, [None] + rev_ids[:i+1])
292
254
def test_commit_new_subdir_child_selective(self):
293
wt = self.make_branch_and_tree('.')
255
b = Branch.initialize('.')
295
256
self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
296
wt.add(['dir', 'dir/file1', 'dir/file2'],
257
b.add(['dir', 'dir/file1', 'dir/file2'],
297
258
['dirid', 'file1id', 'file2id'])
298
wt.commit('dir/file1', specific_files=['dir/file1'], rev_id='1')
299
inv = b.repository.get_inventory('1')
259
b.working_tree().commit('dir/file1', specific_files=['dir/file1'], rev_id='1')
260
inv = b.get_inventory('1')
300
261
self.assertEqual('1', inv['dirid'].revision)
301
262
self.assertEqual('1', inv['file1id'].revision)
302
263
# FIXME: This should raise a KeyError I think, rbc20051006
305
266
def test_strict_commit(self):
306
267
"""Try and commit with unknown files and strict = True, should fail."""
307
268
from bzrlib.errors import StrictCommitFailed
308
wt = self.make_branch_and_tree('.')
269
b = Branch.initialize('.')
310
270
file('hello', 'w').write('hello world')
312
272
file('goodbye', 'w').write('goodbye cruel world!')
313
self.assertRaises(StrictCommitFailed, wt.commit,
273
self.assertRaises(StrictCommitFailed, b.working_tree().commit,
314
274
message='add hello but not goodbye', strict=True)
316
276
def test_strict_commit_without_unknowns(self):
317
277
"""Try and commit with no unknown files and strict = True,
319
279
from bzrlib.errors import StrictCommitFailed
320
wt = self.make_branch_and_tree('.')
280
b = Branch.initialize('.')
322
281
file('hello', 'w').write('hello world')
324
wt.commit(message='add hello', strict=True)
283
b.working_tree().commit(message='add hello', strict=True)
326
285
def test_nonstrict_commit(self):
327
286
"""Try and commit with unknown files and strict = False, should work."""
328
wt = self.make_branch_and_tree('.')
287
b = Branch.initialize('.')
330
288
file('hello', 'w').write('hello world')
332
290
file('goodbye', 'w').write('goodbye cruel world!')
333
wt.commit(message='add hello but not goodbye', strict=False)
291
b.working_tree().commit(message='add hello but not goodbye', strict=False)
335
293
def test_nonstrict_commit_without_unknowns(self):
336
294
"""Try and commit with no unknown files and strict = False,
338
wt = self.make_branch_and_tree('.')
296
b = Branch.initialize('.')
340
297
file('hello', 'w').write('hello world')
342
wt.commit(message='add hello', strict=False)
299
b.working_tree().commit(message='add hello', strict=False)
344
301
def test_signed_commit(self):
345
302
import bzrlib.gpg
346
303
import bzrlib.commit as commit
347
304
oldstrategy = bzrlib.gpg.GPGStrategy
348
wt = self.make_branch_and_tree('.')
350
wt.commit("base", allow_pointless=True, rev_id='A')
351
self.failIf(branch.repository.has_signature_for_revision_id('A'))
305
branch = Branch.initialize('.')
306
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
307
self.failIf(branch.revision_store.has_id('A', 'sig'))
353
309
from bzrlib.testament import Testament
354
310
# monkey patch gpg signing mechanism
355
311
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
356
commit.Commit(config=MustSignConfig(branch)).commit(message="base",
312
commit.Commit(config=MustSignConfig(branch)).commit(branch, "base",
357
313
allow_pointless=True,
361
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
362
self.assertEqual(sign(Testament.from_revision(branch.repository,
363
'B').as_short_text()),
364
branch.repository.get_signature_text('B'))
315
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
316
branch.revision_store.get('B', 'sig').read())
366
318
bzrlib.gpg.GPGStrategy = oldstrategy
402
351
config = BranchWithHooks(branch)
403
352
commit.Commit(config=config).commit(
405
354
allow_pointless=True,
406
rev_id='A', working_tree = wt)
407
356
self.assertEqual(['called', 'called'], calls)
411
def test_commit_object_doesnt_set_nick(self):
412
# using the Commit object directly does not set the branch nick.
413
wt = self.make_branch_and_tree('.')
415
c.commit(working_tree=wt, message='empty tree', allow_pointless=True)
416
self.assertEquals(wt.branch.revno(), 1)
418
wt.branch.repository.get_revision(
419
wt.branch.last_revision()).properties)
421
def test_safe_master_lock(self):
423
master = BzrDirMetaFormat1().initialize('master')
424
master.create_repository()
425
master_branch = master.create_branch()
426
master.create_workingtree()
427
bound = master.sprout('bound')
428
wt = bound.open_workingtree()
429
wt.branch.set_bound_location(os.path.realpath('master'))
431
orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
432
master_branch.lock_write()
434
lockdir._DEFAULT_TIMEOUT_SECONDS = 1
435
self.assertRaises(LockContention, wt.commit, 'silly')
437
lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
438
master_branch.unlock()
440
def test_commit_bound_merge(self):
441
# see bug #43959; commit of a merge in a bound branch fails to push
442
# the new commit into the master
443
master_branch = self.make_branch('master')
444
bound_tree = self.make_branch_and_tree('bound')
445
bound_tree.branch.bind(master_branch)
447
self.build_tree_contents([('bound/content_file', 'initial contents\n')])
448
bound_tree.add(['content_file'])
449
bound_tree.commit(message='woo!')
451
other_bzrdir = master_branch.bzrdir.sprout('other')
452
other_tree = other_bzrdir.open_workingtree()
454
# do a commit to the the other branch changing the content file so
455
# that our commit after merging will have a merged revision in the
456
# content file history.
457
self.build_tree_contents([('other/content_file', 'change in other\n')])
458
other_tree.commit('change in other')
460
# do a merge into the bound branch from other, and then change the
461
# content file locally to force a new revision (rather than using the
462
# revision from other). This forces extra processing in commit.
463
bound_tree.merge_from_branch(other_tree.branch)
464
self.build_tree_contents([('bound/content_file', 'change in bound\n')])
466
# before #34959 was fixed, this failed with 'revision not present in
467
# weave' when trying to implicitly push from the bound branch to the master
468
bound_tree.commit(message='commit of merge in bound tree')
470
def test_commit_reporting_after_merge(self):
471
# when doing a commit of a merge, the reporter needs to still
472
# be called for each item that is added/removed/deleted.
473
this_tree = self.make_branch_and_tree('this')
474
# we need a bunch of files and dirs, to perform one action on each.
477
'this/dirtoreparent/',
480
'this/filetoreparent',
497
this_tree.commit('create_files')
498
other_dir = this_tree.bzrdir.sprout('other')
499
other_tree = other_dir.open_workingtree()
500
other_tree.lock_write()
501
# perform the needed actions on the files and dirs.
503
other_tree.rename_one('dirtorename', 'renameddir')
504
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
505
other_tree.rename_one('filetorename', 'renamedfile')
506
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
507
other_tree.remove(['dirtoremove', 'filetoremove'])
508
self.build_tree_contents([
510
('other/filetomodify', 'new content'),
511
('other/newfile', 'new file content')])
512
other_tree.add('newfile')
513
other_tree.add('newdir/')
514
other_tree.commit('modify all sample files and dirs.')
517
this_tree.merge_from_branch(other_tree.branch)
518
reporter = CapturingReporter()
519
this_tree.commit('do the commit', reporter=reporter)
521
('change', 'unchanged', ''),
522
('change', 'unchanged', 'dirtoleave'),
523
('change', 'unchanged', 'filetoleave'),
524
('change', 'modified', 'filetomodify'),
525
('change', 'added', 'newdir'),
526
('change', 'added', 'newfile'),
527
('renamed', 'renamed', 'dirtorename', 'renameddir'),
528
('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
529
('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
530
('renamed', 'renamed', 'filetorename', 'renamedfile'),
531
('deleted', 'dirtoremove'),
532
('deleted', 'filetoremove'),
536
def test_commit_removals_respects_filespec(self):
537
"""Commit respects the specified_files for removals."""
538
tree = self.make_branch_and_tree('.')
539
self.build_tree(['a', 'b'])
541
tree.commit('added a, b')
542
tree.remove(['a', 'b'])
543
tree.commit('removed a', specific_files='a')
544
basis = tree.basis_tree()
547
self.assertIs(None, basis.path2id('a'))
548
self.assertFalse(basis.path2id('b') is None)
552
def test_commit_saves_1ms_timestamp(self):
553
"""Passing in a timestamp is saved with 1ms resolution"""
554
tree = self.make_branch_and_tree('.')
555
self.build_tree(['a'])
557
tree.commit('added a', timestamp=1153248633.4186721, timezone=0,
560
rev = tree.branch.repository.get_revision('a1')
561
self.assertEqual(1153248633.419, rev.timestamp)
563
def test_commit_has_1ms_resolution(self):
564
"""Allowing commit to generate the timestamp also has 1ms resolution"""
565
tree = self.make_branch_and_tree('.')
566
self.build_tree(['a'])
568
tree.commit('added a', rev_id='a1')
570
rev = tree.branch.repository.get_revision('a1')
571
timestamp = rev.timestamp
572
timestamp_1ms = round(timestamp, 3)
573
self.assertEqual(timestamp_1ms, timestamp)
575
def assertBasisTreeKind(self, kind, tree, file_id):
576
basis = tree.basis_tree()
579
self.assertEqual(kind, basis.kind(file_id))
583
def test_commit_kind_changes(self):
584
if not osutils.has_symlinks():
585
raise tests.TestSkipped('Test requires symlink support')
586
tree = self.make_branch_and_tree('.')
587
os.symlink('target', 'name')
588
tree.add('name', 'a-file-id')
589
tree.commit('Added a symlink')
590
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
593
self.build_tree(['name'])
594
tree.commit('Changed symlink to file')
595
self.assertBasisTreeKind('file', tree, 'a-file-id')
598
os.symlink('target', 'name')
599
tree.commit('file to symlink')
600
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
604
tree.commit('symlink to directory')
605
self.assertBasisTreeKind('directory', tree, 'a-file-id')
608
os.symlink('target', 'name')
609
tree.commit('directory to symlink')
610
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
612
# prepare for directory <-> file tests
615
tree.commit('symlink to directory')
616
self.assertBasisTreeKind('directory', tree, 'a-file-id')
619
self.build_tree(['name'])
620
tree.commit('Changed directory to file')
621
self.assertBasisTreeKind('file', tree, 'a-file-id')
625
tree.commit('file to directory')
626
self.assertBasisTreeKind('directory', tree, 'a-file-id')
628
def test_commit_unversioned_specified(self):
629
"""Commit should raise if specified files isn't in basis or worktree"""
630
tree = self.make_branch_and_tree('.')
631
self.assertRaises(errors.PathsNotVersionedError, tree.commit,
632
'message', specific_files=['bogus'])
634
class Callback(object):
636
def __init__(self, message, testcase):
638
self.message = message
639
self.testcase = testcase
641
def __call__(self, commit_obj):
643
self.testcase.assertTrue(isinstance(commit_obj, Commit))
646
def test_commit_callback(self):
647
"""Commit should invoke a callback to get the message"""
649
tree = self.make_branch_and_tree('.')
653
self.assertTrue(isinstance(e, BzrError))
654
self.assertEqual('The message or message_callback keyword'
655
' parameter is required for commit().', str(e))
657
self.fail('exception not raised')
658
cb = self.Callback(u'commit 1', self)
659
tree.commit(message_callback=cb)
660
self.assertTrue(cb.called)
661
repository = tree.branch.repository
662
message = repository.get_revision(tree.last_revision()).message
663
self.assertEqual('commit 1', message)
665
def test_no_callback_pointless(self):
666
"""Callback should not be invoked for pointless commit"""
667
tree = self.make_branch_and_tree('.')
668
cb = self.Callback(u'commit 2', self)
669
self.assertRaises(PointlessCommit, tree.commit, message_callback=cb,
670
allow_pointless=False)
671
self.assertFalse(cb.called)
673
def test_no_callback_netfailure(self):
674
"""Callback should not be invoked if connectivity fails"""
675
tree = self.make_branch_and_tree('.')
676
cb = self.Callback(u'commit 2', self)
677
repository = tree.branch.repository
678
# simulate network failure
679
def raise_(self, arg, arg2):
680
raise errors.NoSuchFile('foo')
681
repository.add_inventory = raise_
682
self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
683
self.assertFalse(cb.called)
685
def test_selected_file_merge_commit(self):
686
"""Ensure the correct error is raised"""
687
tree = self.make_branch_and_tree('foo')
688
# pending merge would turn into a left parent
689
tree.commit('commit 1')
690
tree.add_parent_tree_id('example')
691
self.build_tree(['foo/bar', 'foo/baz'])
692
tree.add(['bar', 'baz'])
693
err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
694
tree.commit, 'commit 2', specific_files=['bar', 'baz'])
695
self.assertEqual(['bar', 'baz'], err.files)
696
self.assertEqual('Selected-file commit of merges is not supported'
697
' yet: files bar, baz', str(err))
added
removed
bzrlib/selftest/test_commit.py
