63
96
eq(rev.message, 'add hello')
65
98
tree1 = b.repository.revision_tree(rh[0])
66
100
text = tree1.get_file_text(file_id)
67
eq(text, 'hello world')
102
self.assertEqual('hello world', text)
69
104
tree2 = b.repository.revision_tree(rh[1])
70
eq(tree2.get_file_text(file_id), 'version 2')
106
text = tree2.get_file_text(file_id)
108
self.assertEqual('version 2', text)
72
110
def test_delete_commit(self):
73
111
"""Test a commit with a deleted file"""
74
b = Branch.initialize(u'.')
112
wt = self.make_branch_and_tree('.')
75
114
file('hello', 'w').write('hello world')
76
b.working_tree().add(['hello'], ['hello-id'])
77
b.working_tree().commit(message='add hello')
115
wt.add(['hello'], ['hello-id'])
116
wt.commit(message='add hello')
79
118
os.remove('hello')
80
b.working_tree().commit('removed hello', rev_id='rev2')
119
wt.commit('removed hello', rev_id='rev2')
82
121
tree = b.repository.revision_tree('rev2')
83
122
self.assertFalse(tree.has_id('hello-id'))
124
def test_partial_commit_move(self):
125
"""Test a partial commit where a file was renamed but not committed.
127
https://bugs.launchpad.net/bzr/+bug/83039
129
If not handled properly, commit will try to snapshot
130
dialog.py with olive/ as a parent, while
131
olive/ has not been snapshotted yet.
133
wt = self.make_branch_and_tree('.')
135
self.build_tree(['annotate/', 'annotate/foo.py',
136
'olive/', 'olive/dialog.py'
138
wt.add(['annotate', 'olive', 'annotate/foo.py', 'olive/dialog.py'])
139
wt.commit(message='add files')
140
wt.rename_one("olive/dialog.py", "aaa")
141
self.build_tree_contents([('annotate/foo.py', 'modified\n')])
142
wt.commit('renamed hello', specific_files=["annotate"])
85
144
def test_pointless_commit(self):
86
145
"""Commit refuses unless there are changes or it's forced."""
87
b = Branch.initialize(u'.')
146
wt = self.make_branch_and_tree('.')
88
148
file('hello', 'w').write('hello')
89
b.working_tree().add(['hello'])
90
b.working_tree().commit(message='add hello')
150
wt.commit(message='add hello')
91
151
self.assertEquals(b.revno(), 1)
92
152
self.assertRaises(PointlessCommit,
93
b.working_tree().commit,
95
155
allow_pointless=False)
96
156
self.assertEquals(b.revno(), 1)
98
158
def test_commit_empty(self):
99
159
"""Commiting an empty tree works."""
100
b = Branch.initialize(u'.')
101
b.working_tree().commit(message='empty tree', allow_pointless=True)
160
wt = self.make_branch_and_tree('.')
162
wt.commit(message='empty tree', allow_pointless=True)
102
163
self.assertRaises(PointlessCommit,
103
b.working_tree().commit,
104
165
message='empty tree',
105
166
allow_pointless=False)
106
b.working_tree().commit(message='empty tree', allow_pointless=True)
167
wt.commit(message='empty tree', allow_pointless=True)
107
168
self.assertEquals(b.revno(), 2)
110
170
def test_selective_delete(self):
111
171
"""Selective commit in tree with deletions"""
112
b = Branch.initialize(u'.')
172
wt = self.make_branch_and_tree('.')
113
174
file('hello', 'w').write('hello')
114
175
file('buongia', 'w').write('buongia')
115
b.working_tree().add(['hello', 'buongia'],
176
wt.add(['hello', 'buongia'],
116
177
['hello-id', 'buongia-id'])
117
b.working_tree().commit(message='add files',
178
wt.commit(message='add files',
118
179
rev_id='test@rev-1')
120
181
os.remove('hello')
121
182
file('buongia', 'w').write('new text')
122
b.working_tree().commit(message='update text',
183
wt.commit(message='update text',
123
184
specific_files=['buongia'],
124
185
allow_pointless=False,
125
186
rev_id='test@rev-2')
127
b.working_tree().commit(message='remove hello',
188
wt.commit(message='remove hello',
128
189
specific_files=['hello'],
129
190
allow_pointless=False,
130
191
rev_id='test@rev-3')
182
251
def test_commit_move(self):
183
252
"""Test commit of revisions with moved files and directories"""
184
253
eq = self.assertEquals
185
b = Branch.initialize(u'.')
254
wt = self.make_branch_and_tree('.')
186
256
r1 = 'test@rev-1'
187
257
self.build_tree(['hello', 'a/', 'b/'])
188
b.working_tree().add(['hello', 'a', 'b'], ['hello-id', 'a-id', 'b-id'])
189
b.working_tree().commit('initial', rev_id=r1, allow_pointless=False)
190
b.working_tree().move(['hello'], 'a')
258
wt.add(['hello', 'a', 'b'], ['hello-id', 'a-id', 'b-id'])
259
wt.commit('initial', rev_id=r1, allow_pointless=False)
260
wt.move(['hello'], 'a')
191
261
r2 = 'test@rev-2'
192
b.working_tree().commit('two', rev_id=r2, allow_pointless=False)
193
self.check_inventory_shape(b.working_tree().read_working_inventory(),
194
['a', 'a/hello', 'b'])
262
wt.commit('two', rev_id=r2, allow_pointless=False)
265
self.check_inventory_shape(wt.read_working_inventory(),
266
['a/', 'a/hello', 'b/'])
196
b.working_tree().move(['b'], 'a')
197
271
r3 = 'test@rev-3'
198
b.working_tree().commit('three', rev_id=r3, allow_pointless=False)
199
self.check_inventory_shape(b.working_tree().read_working_inventory(),
200
['a', 'a/hello', 'a/b'])
201
self.check_inventory_shape(b.repository.get_revision_inventory(r3),
202
['a', 'a/hello', 'a/b'])
272
wt.commit('three', rev_id=r3, allow_pointless=False)
275
self.check_inventory_shape(wt.read_working_inventory(),
276
['a/', 'a/hello', 'a/b/'])
277
self.check_inventory_shape(b.repository.get_revision_inventory(r3),
278
['a/', 'a/hello', 'a/b/'])
204
b.working_tree().move(['a/hello'], 'a/b')
282
wt.move(['a/hello'], 'a/b')
205
283
r4 = 'test@rev-4'
206
b.working_tree().commit('four', rev_id=r4, allow_pointless=False)
207
self.check_inventory_shape(b.working_tree().read_working_inventory(),
208
['a', 'a/b/hello', 'a/b'])
284
wt.commit('four', rev_id=r4, allow_pointless=False)
287
self.check_inventory_shape(wt.read_working_inventory(),
288
['a/', 'a/b/hello', 'a/b/'])
210
292
inv = b.repository.get_revision_inventory(r4)
211
293
eq(inv['hello-id'].revision, r4)
212
294
eq(inv['a-id'].revision, r1)
213
295
eq(inv['b-id'].revision, r3)
215
297
def test_removed_commit(self):
216
298
"""Commit with a removed file"""
217
b = Branch.initialize(u'.')
218
wt = b.working_tree()
299
wt = self.make_branch_and_tree('.')
219
301
file('hello', 'w').write('hello world')
220
b.working_tree().add(['hello'], ['hello-id'])
221
b.working_tree().commit(message='add hello')
223
wt = b.working_tree() # FIXME: kludge for aliasing of working inventory
302
wt.add(['hello'], ['hello-id'])
303
wt.commit(message='add hello')
224
304
wt.remove('hello')
225
b.working_tree().commit('removed hello', rev_id='rev2')
305
wt.commit('removed hello', rev_id='rev2')
227
307
tree = b.repository.revision_tree('rev2')
228
308
self.assertFalse(tree.has_id('hello-id'))
231
310
def test_committed_ancestry(self):
232
311
"""Test commit appends revisions to ancestry."""
233
b = Branch.initialize(u'.')
312
wt = self.make_branch_and_tree('.')
235
315
for i in range(4):
236
316
file('hello', 'w').write((str(i) * 4) + '\n')
238
b.working_tree().add(['hello'], ['hello-id'])
318
wt.add(['hello'], ['hello-id'])
239
319
rev_id = 'test@rev-%d' % (i+1)
240
320
rev_ids.append(rev_id)
241
b.working_tree().commit(message='rev %d' % (i+1),
321
wt.commit(message='rev %d' % (i+1),
243
323
eq = self.assertEquals
244
324
eq(b.revision_history(), rev_ids)
261
342
def test_strict_commit(self):
262
343
"""Try and commit with unknown files and strict = True, should fail."""
263
344
from bzrlib.errors import StrictCommitFailed
264
b = Branch.initialize(u'.')
345
wt = self.make_branch_and_tree('.')
265
347
file('hello', 'w').write('hello world')
266
b.working_tree().add('hello')
267
349
file('goodbye', 'w').write('goodbye cruel world!')
268
self.assertRaises(StrictCommitFailed, b.working_tree().commit,
350
self.assertRaises(StrictCommitFailed, wt.commit,
269
351
message='add hello but not goodbye', strict=True)
271
353
def test_strict_commit_without_unknowns(self):
272
354
"""Try and commit with no unknown files and strict = True,
274
356
from bzrlib.errors import StrictCommitFailed
275
b = Branch.initialize(u'.')
357
wt = self.make_branch_and_tree('.')
276
359
file('hello', 'w').write('hello world')
277
b.working_tree().add('hello')
278
b.working_tree().commit(message='add hello', strict=True)
361
wt.commit(message='add hello', strict=True)
280
363
def test_nonstrict_commit(self):
281
364
"""Try and commit with unknown files and strict = False, should work."""
282
b = Branch.initialize(u'.')
365
wt = self.make_branch_and_tree('.')
283
367
file('hello', 'w').write('hello world')
284
b.working_tree().add('hello')
285
369
file('goodbye', 'w').write('goodbye cruel world!')
286
b.working_tree().commit(message='add hello but not goodbye', strict=False)
370
wt.commit(message='add hello but not goodbye', strict=False)
288
372
def test_nonstrict_commit_without_unknowns(self):
289
373
"""Try and commit with no unknown files and strict = False,
291
b = Branch.initialize(u'.')
375
wt = self.make_branch_and_tree('.')
292
377
file('hello', 'w').write('hello world')
293
b.working_tree().add('hello')
294
b.working_tree().commit(message='add hello', strict=False)
379
wt.commit(message='add hello', strict=False)
296
381
def test_signed_commit(self):
297
382
import bzrlib.gpg
298
383
import bzrlib.commit as commit
299
384
oldstrategy = bzrlib.gpg.GPGStrategy
300
branch = Branch.initialize(u'.')
301
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
302
self.failIf(branch.repository.revision_store.has_id('A', 'sig'))
385
wt = self.make_branch_and_tree('.')
387
wt.commit("base", allow_pointless=True, rev_id='A')
388
self.failIf(branch.repository.has_signature_for_revision_id('A'))
304
390
from bzrlib.testament import Testament
305
391
# monkey patch gpg signing mechanism
306
392
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
307
commit.Commit(config=MustSignConfig(branch)).commit(branch, "base",
393
commit.Commit(config=MustSignConfig(branch)).commit(message="base",
308
394
allow_pointless=True,
310
self.assertEqual(Testament.from_revision(branch.repository,
311
'B').as_short_text(),
312
branch.repository.revision_store.get('B',
398
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
399
self.assertEqual(sign(Testament.from_revision(branch.repository,
400
'B').as_short_text()),
401
branch.repository.get_signature_text('B'))
315
403
bzrlib.gpg.GPGStrategy = oldstrategy
348
439
config = BranchWithHooks(branch)
349
440
commit.Commit(config=config).commit(
351
442
allow_pointless=True,
443
rev_id='A', working_tree = wt)
353
444
self.assertEqual(['called', 'called'], calls)
448
def test_commit_object_doesnt_set_nick(self):
449
# using the Commit object directly does not set the branch nick.
450
wt = self.make_branch_and_tree('.')
452
c.commit(working_tree=wt, message='empty tree', allow_pointless=True)
453
self.assertEquals(wt.branch.revno(), 1)
455
wt.branch.repository.get_revision(
456
wt.branch.last_revision()).properties)
458
def test_safe_master_lock(self):
460
master = BzrDirMetaFormat1().initialize('master')
461
master.create_repository()
462
master_branch = master.create_branch()
463
master.create_workingtree()
464
bound = master.sprout('bound')
465
wt = bound.open_workingtree()
466
wt.branch.set_bound_location(os.path.realpath('master'))
467
master_branch.lock_write()
469
self.assertRaises(LockContention, wt.commit, 'silly')
471
master_branch.unlock()
473
def test_commit_bound_merge(self):
474
# see bug #43959; commit of a merge in a bound branch fails to push
475
# the new commit into the master
476
master_branch = self.make_branch('master')
477
bound_tree = self.make_branch_and_tree('bound')
478
bound_tree.branch.bind(master_branch)
480
self.build_tree_contents([('bound/content_file', 'initial contents\n')])
481
bound_tree.add(['content_file'])
482
bound_tree.commit(message='woo!')
484
other_bzrdir = master_branch.bzrdir.sprout('other')
485
other_tree = other_bzrdir.open_workingtree()
487
# do a commit to the the other branch changing the content file so
488
# that our commit after merging will have a merged revision in the
489
# content file history.
490
self.build_tree_contents([('other/content_file', 'change in other\n')])
491
other_tree.commit('change in other')
493
# do a merge into the bound branch from other, and then change the
494
# content file locally to force a new revision (rather than using the
495
# revision from other). This forces extra processing in commit.
496
bound_tree.merge_from_branch(other_tree.branch)
497
self.build_tree_contents([('bound/content_file', 'change in bound\n')])
499
# before #34959 was fixed, this failed with 'revision not present in
500
# weave' when trying to implicitly push from the bound branch to the master
501
bound_tree.commit(message='commit of merge in bound tree')
503
def test_commit_reporting_after_merge(self):
504
# when doing a commit of a merge, the reporter needs to still
505
# be called for each item that is added/removed/deleted.
506
this_tree = self.make_branch_and_tree('this')
507
# we need a bunch of files and dirs, to perform one action on each.
510
'this/dirtoreparent/',
513
'this/filetoreparent',
530
this_tree.commit('create_files')
531
other_dir = this_tree.bzrdir.sprout('other')
532
other_tree = other_dir.open_workingtree()
533
other_tree.lock_write()
534
# perform the needed actions on the files and dirs.
536
other_tree.rename_one('dirtorename', 'renameddir')
537
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
538
other_tree.rename_one('filetorename', 'renamedfile')
539
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
540
other_tree.remove(['dirtoremove', 'filetoremove'])
541
self.build_tree_contents([
543
('other/filetomodify', 'new content'),
544
('other/newfile', 'new file content')])
545
other_tree.add('newfile')
546
other_tree.add('newdir/')
547
other_tree.commit('modify all sample files and dirs.')
550
this_tree.merge_from_branch(other_tree.branch)
551
reporter = CapturingReporter()
552
this_tree.commit('do the commit', reporter=reporter)
554
('change', 'unchanged', ''),
555
('change', 'unchanged', 'dirtoleave'),
556
('change', 'unchanged', 'filetoleave'),
557
('change', 'modified', 'filetomodify'),
558
('change', 'added', 'newdir'),
559
('change', 'added', 'newfile'),
560
('renamed', 'renamed', 'dirtorename', 'renameddir'),
561
('renamed', 'renamed', 'filetorename', 'renamedfile'),
562
('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
563
('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
564
('deleted', 'dirtoremove'),
565
('deleted', 'filetoremove'),
569
def test_commit_removals_respects_filespec(self):
570
"""Commit respects the specified_files for removals."""
571
tree = self.make_branch_and_tree('.')
572
self.build_tree(['a', 'b'])
574
tree.commit('added a, b')
575
tree.remove(['a', 'b'])
576
tree.commit('removed a', specific_files='a')
577
basis = tree.basis_tree()
580
self.assertIs(None, basis.path2id('a'))
581
self.assertFalse(basis.path2id('b') is None)
585
def test_commit_saves_1ms_timestamp(self):
586
"""Passing in a timestamp is saved with 1ms resolution"""
587
tree = self.make_branch_and_tree('.')
588
self.build_tree(['a'])
590
tree.commit('added a', timestamp=1153248633.4186721, timezone=0,
593
rev = tree.branch.repository.get_revision('a1')
594
self.assertEqual(1153248633.419, rev.timestamp)
596
def test_commit_has_1ms_resolution(self):
597
"""Allowing commit to generate the timestamp also has 1ms resolution"""
598
tree = self.make_branch_and_tree('.')
599
self.build_tree(['a'])
601
tree.commit('added a', rev_id='a1')
603
rev = tree.branch.repository.get_revision('a1')
604
timestamp = rev.timestamp
605
timestamp_1ms = round(timestamp, 3)
606
self.assertEqual(timestamp_1ms, timestamp)
608
def assertBasisTreeKind(self, kind, tree, file_id):
609
basis = tree.basis_tree()
612
self.assertEqual(kind, basis.kind(file_id))
616
def test_commit_kind_changes(self):
617
self.requireFeature(SymlinkFeature)
618
tree = self.make_branch_and_tree('.')
619
os.symlink('target', 'name')
620
tree.add('name', 'a-file-id')
621
tree.commit('Added a symlink')
622
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
625
self.build_tree(['name'])
626
tree.commit('Changed symlink to file')
627
self.assertBasisTreeKind('file', tree, 'a-file-id')
630
os.symlink('target', 'name')
631
tree.commit('file to symlink')
632
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
636
tree.commit('symlink to directory')
637
self.assertBasisTreeKind('directory', tree, 'a-file-id')
640
os.symlink('target', 'name')
641
tree.commit('directory to symlink')
642
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
644
# prepare for directory <-> file tests
647
tree.commit('symlink to directory')
648
self.assertBasisTreeKind('directory', tree, 'a-file-id')
651
self.build_tree(['name'])
652
tree.commit('Changed directory to file')
653
self.assertBasisTreeKind('file', tree, 'a-file-id')
657
tree.commit('file to directory')
658
self.assertBasisTreeKind('directory', tree, 'a-file-id')
660
def test_commit_unversioned_specified(self):
661
"""Commit should raise if specified files isn't in basis or worktree"""
662
tree = self.make_branch_and_tree('.')
663
self.assertRaises(errors.PathsNotVersionedError, tree.commit,
664
'message', specific_files=['bogus'])
666
class Callback(object):
668
def __init__(self, message, testcase):
670
self.message = message
671
self.testcase = testcase
673
def __call__(self, commit_obj):
675
self.testcase.assertTrue(isinstance(commit_obj, Commit))
678
def test_commit_callback(self):
679
"""Commit should invoke a callback to get the message"""
681
tree = self.make_branch_and_tree('.')
685
self.assertTrue(isinstance(e, BzrError))
686
self.assertEqual('The message or message_callback keyword'
687
' parameter is required for commit().', str(e))
689
self.fail('exception not raised')
690
cb = self.Callback(u'commit 1', self)
691
tree.commit(message_callback=cb)
692
self.assertTrue(cb.called)
693
repository = tree.branch.repository
694
message = repository.get_revision(tree.last_revision()).message
695
self.assertEqual('commit 1', message)
697
def test_no_callback_pointless(self):
698
"""Callback should not be invoked for pointless commit"""
699
tree = self.make_branch_and_tree('.')
700
cb = self.Callback(u'commit 2', self)
701
self.assertRaises(PointlessCommit, tree.commit, message_callback=cb,
702
allow_pointless=False)
703
self.assertFalse(cb.called)
705
def test_no_callback_netfailure(self):
706
"""Callback should not be invoked if connectivity fails"""
707
tree = self.make_branch_and_tree('.')
708
cb = self.Callback(u'commit 2', self)
709
repository = tree.branch.repository
710
# simulate network failure
711
def raise_(self, arg, arg2):
712
raise errors.NoSuchFile('foo')
713
repository.add_inventory = raise_
714
self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
715
self.assertFalse(cb.called)
717
def test_selected_file_merge_commit(self):
718
"""Ensure the correct error is raised"""
719
tree = self.make_branch_and_tree('foo')
720
# pending merge would turn into a left parent
721
tree.commit('commit 1')
722
tree.add_parent_tree_id('example')
723
self.build_tree(['foo/bar', 'foo/baz'])
724
tree.add(['bar', 'baz'])
725
err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
726
tree.commit, 'commit 2', specific_files=['bar', 'baz'])
727
self.assertEqual(['bar', 'baz'], err.files)
728
self.assertEqual('Selected-file commit of merges is not supported'
729
' yet: files bar, baz', str(err))
731
def test_commit_ordering(self):
732
"""Test of corner-case commit ordering error"""
733
tree = self.make_branch_and_tree('.')
734
self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
735
tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
737
self.build_tree(['a/c/d/'])
739
tree.rename_one('a/z/x', 'a/c/d/x')
740
tree.commit('test', specific_files=['a/z/y'])
742
def test_commit_no_author(self):
743
"""The default kwarg author in MutableTree.commit should not add
744
the 'author' revision property.
746
tree = self.make_branch_and_tree('foo')
747
rev_id = tree.commit('commit 1')
748
rev = tree.branch.repository.get_revision(rev_id)
749
self.assertFalse('author' in rev.properties)
751
def test_commit_author(self):
752
"""Passing a non-empty author kwarg to MutableTree.commit should add
753
the 'author' revision property.
755
tree = self.make_branch_and_tree('foo')
756
rev_id = tree.commit('commit 1', author='John Doe <jdoe@example.com>')
757
rev = tree.branch.repository.get_revision(rev_id)
758
self.assertEqual('John Doe <jdoe@example.com>',
759
rev.properties['author'])
761
def test_commit_with_checkout_and_branch_sharing_repo(self):
762
repo = self.make_repository('repo', shared=True)
763
# make_branch_and_tree ignores shared repos
764
branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
765
tree2 = branch.create_checkout('repo/tree2')
766
tree2.commit('message', rev_id='rev1')
767
self.assertTrue(tree2.branch.repository.has_revision('rev1'))
added
removed
bzrlib/tests/test_commit.py
