← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
 
20
20
import bzrlib
21
21
from bzrlib import (
22
 
    bzrdir,
 
22
    config,
 
23
    controldir,
23
24
    errors,
24
 
    lockdir,
25
 
    osutils,
26
 
    tests,
27
25
    )
28
26
from bzrlib.branch import Branch
29
 
from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
 
27
from bzrlib.bzrdir import BzrDirMetaFormat1
30
28
from bzrlib.commit import Commit, NullCommitReporter
31
 
from bzrlib.config import BranchConfig
32
 
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed,
33
 
                           LockContention)
34
 
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
35
 
from bzrlib.workingtree import WorkingTree
 
29
from bzrlib.errors import (
 
30
    PointlessCommit,
 
31
    BzrError,
 
32
    SigningFailed,
 
33
    LockContention,
 
34
    )
 
35
from bzrlib.tests import (
 
36
    TestCaseWithTransport,
 
37
    test_foreign,
 
38
    )
 
39
from bzrlib.tests.features import (
 
40
    SymlinkFeature,
 
41
    )
 
42
from bzrlib.tests.matchers import MatchesAncestry
36
43
 
37
44
 
38
45
# TODO: Test commit with some added, and added-but-missing files
39
46
 
40
 
class MustSignConfig(BranchConfig):
41
 
 
42
 
    def signature_needed(self):
43
 
        return True
44
 
 
45
 
    def gpg_signing_command(self):
46
 
        return ['cat', '-']
47
 
 
48
 
 
49
 
class BranchWithHooks(BranchConfig):
50
 
 
51
 
    def post_commit(self):
52
 
        return "bzrlib.ahook bzrlib.ahook"
 
47
class MustSignConfig(config.MemoryStack):
 
48
 
 
49
    def __init__(self):
 
50
        super(MustSignConfig, self).__init__('''
 
51
gpg_signing_command=cat -
 
52
create_signatures=always
 
53
''')
53
54
 
54
55
 
55
56
class CapturingReporter(NullCommitReporter):
81
82
        """Commit and check two versions of a single file."""
82
83
        wt = self.make_branch_and_tree('.')
83
84
        b = wt.branch
84
 
        file('hello', 'w').write('hello world')
 
85
        with file('hello', 'w') as f: f.write('hello world')
85
86
        wt.add('hello')
86
 
        wt.commit(message='add hello')
 
87
        rev1 = wt.commit(message='add hello')
87
88
        file_id = wt.path2id('hello')
88
89
 
89
 
        file('hello', 'w').write('version 2')
90
 
        wt.commit(message='commit 2')
 
90
        with file('hello', 'w') as f: f.write('version 2')
 
91
        rev2 = wt.commit(message='commit 2')
91
92
 
92
 
        eq = self.assertEquals
 
93
        eq = self.assertEqual
93
94
        eq(b.revno(), 2)
94
 
        rh = b.revision_history()
95
 
        rev = b.repository.get_revision(rh[0])
 
95
        rev = b.repository.get_revision(rev1)
96
96
        eq(rev.message, 'add hello')
97
97
 
98
 
        tree1 = b.repository.revision_tree(rh[0])
 
98
        tree1 = b.repository.revision_tree(rev1)
99
99
        tree1.lock_read()
100
100
        text = tree1.get_file_text(file_id)
101
101
        tree1.unlock()
102
102
        self.assertEqual('hello world', text)
103
103
 
104
 
        tree2 = b.repository.revision_tree(rh[1])
 
104
        tree2 = b.repository.revision_tree(rev2)
105
105
        tree2.lock_read()
106
106
        text = tree2.get_file_text(file_id)
107
107
        tree2.unlock()
108
108
        self.assertEqual('version 2', text)
109
109
 
 
110
    def test_commit_lossy_native(self):
 
111
        """Attempt a lossy commit to a native branch."""
 
112
        wt = self.make_branch_and_tree('.')
 
113
        b = wt.branch
 
114
        with file('hello', 'w') as f: f.write('hello world')
 
115
        wt.add('hello')
 
116
        revid = wt.commit(message='add hello', rev_id='revid', lossy=True)
 
117
        self.assertEqual('revid', revid)
 
118
 
 
119
    def test_commit_lossy_foreign(self):
 
120
        """Attempt a lossy commit to a foreign branch."""
 
121
        test_foreign.register_dummy_foreign_for_test(self)
 
122
        wt = self.make_branch_and_tree('.',
 
123
            format=test_foreign.DummyForeignVcsDirFormat())
 
124
        b = wt.branch
 
125
        with file('hello', 'w') as f: f.write('hello world')
 
126
        wt.add('hello')
 
127
        revid = wt.commit(message='add hello', lossy=True,
 
128
            timestamp=1302659388, timezone=0)
 
129
        self.assertEqual('dummy-v1:1302659388.0-0-UNKNOWN', revid)
 
130
 
 
131
    def test_commit_bound_lossy_foreign(self):
 
132
        """Attempt a lossy commit to a bzr branch bound to a foreign branch."""
 
133
        test_foreign.register_dummy_foreign_for_test(self)
 
134
        foreign_branch = self.make_branch('foreign',
 
135
            format=test_foreign.DummyForeignVcsDirFormat())
 
136
        wt = foreign_branch.create_checkout("local")
 
137
        b = wt.branch
 
138
        with file('local/hello', 'w') as f: f.write('hello world')
 
139
        wt.add('hello')
 
140
        revid = wt.commit(message='add hello', lossy=True,
 
141
            timestamp=1302659388, timezone=0)
 
142
        self.assertEqual('dummy-v1:1302659388.0-0-0', revid)
 
143
        self.assertEqual('dummy-v1:1302659388.0-0-0',
 
144
            foreign_branch.last_revision())
 
145
        self.assertEqual('dummy-v1:1302659388.0-0-0',
 
146
            wt.branch.last_revision())
 
147
 
110
148
    def test_missing_commit(self):
111
149
        """Test a commit with a missing file"""
112
150
        wt = self.make_branch_and_tree('.')
113
151
        b = wt.branch
114
 
        file('hello', 'w').write('hello world')
 
152
        with file('hello', 'w') as f: f.write('hello world')
115
153
        wt.add(['hello'], ['hello-id'])
116
154
        wt.commit(message='add hello')
117
155
 
118
156
        os.remove('hello')
119
 
        wt.commit('removed hello', rev_id='rev2')
 
157
        reporter = CapturingReporter()
 
158
        wt.commit('removed hello', rev_id='rev2', reporter=reporter)
 
159
        self.assertEqual(
 
160
            [('missing', u'hello'), ('deleted', u'hello')],
 
161
            reporter.calls)
120
162
 
121
163
        tree = b.repository.revision_tree('rev2')
122
164
        self.assertFalse(tree.has_id('hello-id'))
145
187
        """Commit refuses unless there are changes or it's forced."""
146
188
        wt = self.make_branch_and_tree('.')
147
189
        b = wt.branch
148
 
        file('hello', 'w').write('hello')
 
190
        with file('hello', 'w') as f: f.write('hello')
149
191
        wt.add(['hello'])
150
192
        wt.commit(message='add hello')
151
 
        self.assertEquals(b.revno(), 1)
 
193
        self.assertEqual(b.revno(), 1)
152
194
        self.assertRaises(PointlessCommit,
153
195
                          wt.commit,
154
196
                          message='fails',
155
197
                          allow_pointless=False)
156
 
        self.assertEquals(b.revno(), 1)
 
198
        self.assertEqual(b.revno(), 1)
157
199
 
158
200
    def test_commit_empty(self):
159
201
        """Commiting an empty tree works."""
165
207
                          message='empty tree',
166
208
                          allow_pointless=False)
167
209
        wt.commit(message='empty tree', allow_pointless=True)
168
 
        self.assertEquals(b.revno(), 2)
 
210
        self.assertEqual(b.revno(), 2)
169
211
 
170
212
    def test_selective_delete(self):
171
213
        """Selective commit in tree with deletions"""
172
214
        wt = self.make_branch_and_tree('.')
173
215
        b = wt.branch
174
 
        file('hello', 'w').write('hello')
175
 
        file('buongia', 'w').write('buongia')
 
216
        with file('hello', 'w') as f: f.write('hello')
 
217
        with file('buongia', 'w') as f: f.write('buongia')
176
218
        wt.add(['hello', 'buongia'],
177
219
              ['hello-id', 'buongia-id'])
178
220
        wt.commit(message='add files',
179
221
                 rev_id='test@rev-1')
180
222
 
181
223
        os.remove('hello')
182
 
        file('buongia', 'w').write('new text')
 
224
        with file('buongia', 'w') as f: f.write('new text')
183
225
        wt.commit(message='update text',
184
226
                 specific_files=['buongia'],
185
227
                 allow_pointless=False,
190
232
                 allow_pointless=False,
191
233
                 rev_id='test@rev-3')
192
234
 
193
 
        eq = self.assertEquals
 
235
        eq = self.assertEqual
194
236
        eq(b.revno(), 3)
195
237
 
196
238
        tree2 = b.repository.revision_tree('test@rev-2')
197
239
        tree2.lock_read()
198
240
        self.addCleanup(tree2.unlock)
199
241
        self.assertTrue(tree2.has_filename('hello'))
200
 
        self.assertEquals(tree2.get_file_text('hello-id'), 'hello')
201
 
        self.assertEquals(tree2.get_file_text('buongia-id'), 'new text')
 
242
        self.assertEqual(tree2.get_file_text('hello-id'), 'hello')
 
243
        self.assertEqual(tree2.get_file_text('buongia-id'), 'new text')
202
244
 
203
245
        tree3 = b.repository.revision_tree('test@rev-3')
204
246
        tree3.lock_read()
205
247
        self.addCleanup(tree3.unlock)
206
248
        self.assertFalse(tree3.has_filename('hello'))
207
 
        self.assertEquals(tree3.get_file_text('buongia-id'), 'new text')
 
249
        self.assertEqual(tree3.get_file_text('buongia-id'), 'new text')
208
250
 
209
251
    def test_commit_rename(self):
210
252
        """Test commit of a revision where a file is renamed."""
217
259
        tree.rename_one('hello', 'fruity')
218
260
        tree.commit(message='renamed', rev_id='test@rev-2', allow_pointless=False)
219
261
 
220
 
        eq = self.assertEquals
 
262
        eq = self.assertEqual
221
263
        tree1 = b.repository.revision_tree('test@rev-1')
222
264
        tree1.lock_read()
223
265
        self.addCleanup(tree1.unlock)
224
266
        eq(tree1.id2path('hello-id'), 'hello')
225
267
        eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
226
268
        self.assertFalse(tree1.has_filename('fruity'))
227
 
        self.check_inventory_shape(tree1.inventory, ['hello'])
228
 
        ie = tree1.inventory['hello-id']
229
 
        eq(ie.revision, 'test@rev-1')
 
269
        self.check_tree_shape(tree1, ['hello'])
 
270
        eq(tree1.get_file_revision('hello-id'), 'test@rev-1')
230
271
 
231
272
        tree2 = b.repository.revision_tree('test@rev-2')
232
273
        tree2.lock_read()
233
274
        self.addCleanup(tree2.unlock)
234
275
        eq(tree2.id2path('hello-id'), 'fruity')
235
276
        eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
236
 
        self.check_inventory_shape(tree2.inventory, ['fruity'])
237
 
        ie = tree2.inventory['hello-id']
238
 
        eq(ie.revision, 'test@rev-2')
 
277
        self.check_tree_shape(tree2, ['fruity'])
 
278
        eq(tree2.get_file_revision('hello-id'), 'test@rev-2')
239
279
 
240
280
    def test_reused_rev_id(self):
241
281
        """Test that a revision id cannot be reused in a branch"""
250
290
 
251
291
    def test_commit_move(self):
252
292
        """Test commit of revisions with moved files and directories"""
253
 
        eq = self.assertEquals
 
293
        eq = self.assertEqual
254
294
        wt = self.make_branch_and_tree('.')
255
295
        b = wt.branch
256
296
        r1 = 'test@rev-1'
262
302
        wt.commit('two', rev_id=r2, allow_pointless=False)
263
303
        wt.lock_read()
264
304
        try:
265
 
            self.check_inventory_shape(wt.read_working_inventory(),
266
 
                                       ['a/', 'a/hello', 'b/'])
 
305
            self.check_tree_shape(wt, ['a/', 'a/hello', 'b/'])
267
306
        finally:
268
307
            wt.unlock()
269
308
 
272
311
        wt.commit('three', rev_id=r3, allow_pointless=False)
273
312
        wt.lock_read()
274
313
        try:
275
 
            self.check_inventory_shape(wt.read_working_inventory(),
 
314
            self.check_tree_shape(wt,
276
315
                                       ['a/', 'a/hello', 'a/b/'])
277
 
            self.check_inventory_shape(b.repository.get_inventory(r3),
 
316
            self.check_tree_shape(b.repository.revision_tree(r3),
278
317
                                       ['a/', 'a/hello', 'a/b/'])
279
318
        finally:
280
319
            wt.unlock()
284
323
        wt.commit('four', rev_id=r4, allow_pointless=False)
285
324
        wt.lock_read()
286
325
        try:
287
 
            self.check_inventory_shape(wt.read_working_inventory(),
288
 
                                       ['a/', 'a/b/hello', 'a/b/'])
 
326
            self.check_tree_shape(wt, ['a/', 'a/b/hello', 'a/b/'])
289
327
        finally:
290
328
            wt.unlock()
291
329
 
298
336
        """Commit with a removed file"""
299
337
        wt = self.make_branch_and_tree('.')
300
338
        b = wt.branch
301
 
        file('hello', 'w').write('hello world')
 
339
        with file('hello', 'w') as f: f.write('hello world')
302
340
        wt.add(['hello'], ['hello-id'])
303
341
        wt.commit(message='add hello')
304
342
        wt.remove('hello')
313
351
        b = wt.branch
314
352
        rev_ids = []
315
353
        for i in range(4):
316
 
            file('hello', 'w').write((str(i) * 4) + '\n')
 
354
            with file('hello', 'w') as f: f.write((str(i) * 4) + '\n')
317
355
            if i == 0:
318
356
                wt.add(['hello'], ['hello-id'])
319
357
            rev_id = 'test@rev-%d' % (i+1)
320
358
            rev_ids.append(rev_id)
321
359
            wt.commit(message='rev %d' % (i+1),
322
360
                     rev_id=rev_id)
323
 
        eq = self.assertEquals
324
 
        eq(b.revision_history(), rev_ids)
325
361
        for i in range(4):
326
 
            anc = b.repository.get_ancestry(rev_ids[i])
327
 
            eq(anc, [None] + rev_ids[:i+1])
 
362
            self.assertThat(rev_ids[:i+1],
 
363
                MatchesAncestry(b.repository, rev_ids[i]))
328
364
 
329
365
    def test_commit_new_subdir_child_selective(self):
330
366
        wt = self.make_branch_and_tree('.')
344
380
        from bzrlib.errors import StrictCommitFailed
345
381
        wt = self.make_branch_and_tree('.')
346
382
        b = wt.branch
347
 
        file('hello', 'w').write('hello world')
 
383
        with file('hello', 'w') as f: f.write('hello world')
348
384
        wt.add('hello')
349
 
        file('goodbye', 'w').write('goodbye cruel world!')
 
385
        with file('goodbye', 'w') as f: f.write('goodbye cruel world!')
350
386
        self.assertRaises(StrictCommitFailed, wt.commit,
351
387
            message='add hello but not goodbye', strict=True)
352
388
 
353
389
    def test_strict_commit_without_unknowns(self):
354
390
        """Try and commit with no unknown files and strict = True,
355
391
        should work."""
356
 
        from bzrlib.errors import StrictCommitFailed
357
392
        wt = self.make_branch_and_tree('.')
358
393
        b = wt.branch
359
 
        file('hello', 'w').write('hello world')
 
394
        with file('hello', 'w') as f: f.write('hello world')
360
395
        wt.add('hello')
361
396
        wt.commit(message='add hello', strict=True)
362
397
 
364
399
        """Try and commit with unknown files and strict = False, should work."""
365
400
        wt = self.make_branch_and_tree('.')
366
401
        b = wt.branch
367
 
        file('hello', 'w').write('hello world')
 
402
        with file('hello', 'w') as f: f.write('hello world')
368
403
        wt.add('hello')
369
 
        file('goodbye', 'w').write('goodbye cruel world!')
 
404
        with file('goodbye', 'w') as f: f.write('goodbye cruel world!')
370
405
        wt.commit(message='add hello but not goodbye', strict=False)
371
406
 
372
407
    def test_nonstrict_commit_without_unknowns(self):
374
409
        should work."""
375
410
        wt = self.make_branch_and_tree('.')
376
411
        b = wt.branch
377
 
        file('hello', 'w').write('hello world')
 
412
        with file('hello', 'w') as f: f.write('hello world')
378
413
        wt.add('hello')
379
414
        wt.commit(message='add hello', strict=False)
380
415
 
385
420
        wt = self.make_branch_and_tree('.')
386
421
        branch = wt.branch
387
422
        wt.commit("base", allow_pointless=True, rev_id='A')
388
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
423
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
389
424
        try:
390
425
            from bzrlib.testament import Testament
391
426
            # monkey patch gpg signing mechanism
392
427
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
393
 
            commit.Commit(config=MustSignConfig(branch)).commit(message="base",
394
 
                                                      allow_pointless=True,
395
 
                                                      rev_id='B',
396
 
                                                      working_tree=wt)
 
428
            conf = config.MemoryStack('''
 
429
gpg_signing_command=cat -
 
430
create_signatures=always
 
431
''')
 
432
            commit.Commit(config_stack=conf).commit(
 
433
                message="base", allow_pointless=True, rev_id='B',
 
434
                working_tree=wt)
397
435
            def sign(text):
398
436
                return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
399
437
            self.assertEqual(sign(Testament.from_revision(branch.repository,
400
 
                             'B').as_short_text()),
 
438
                                                          'B').as_short_text()),
401
439
                             branch.repository.get_signature_text('B'))
402
440
        finally:
403
441
            bzrlib.gpg.GPGStrategy = oldstrategy
409
447
        wt = self.make_branch_and_tree('.')
410
448
        branch = wt.branch
411
449
        wt.commit("base", allow_pointless=True, rev_id='A')
412
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
450
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
413
451
        try:
414
 
            from bzrlib.testament import Testament
415
452
            # monkey patch gpg signing mechanism
416
453
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.DisabledGPGStrategy
417
 
            config = MustSignConfig(branch)
 
454
            conf = config.MemoryStack('''
 
455
gpg_signing_command=cat -
 
456
create_signatures=always
 
457
''')
418
458
            self.assertRaises(SigningFailed,
419
 
                              commit.Commit(config=config).commit,
 
459
                              commit.Commit(config_stack=conf).commit,
420
460
                              message="base",
421
461
                              allow_pointless=True,
422
462
                              rev_id='B',
423
463
                              working_tree=wt)
424
464
            branch = Branch.open(self.get_url('.'))
425
 
            self.assertEqual(branch.revision_history(), ['A'])
426
 
            self.failIf(branch.repository.has_revision('B'))
 
465
            self.assertEqual(branch.last_revision(), 'A')
 
466
            self.assertFalse(branch.repository.has_revision('B'))
427
467
        finally:
428
468
            bzrlib.gpg.GPGStrategy = oldstrategy
429
469
 
436
476
            calls.append('called')
437
477
        bzrlib.ahook = called
438
478
        try:
439
 
            config = BranchWithHooks(branch)
440
 
            commit.Commit(config=config).commit(
441
 
                            message = "base",
442
 
                            allow_pointless=True,
443
 
                            rev_id='A', working_tree = wt)
 
479
            conf = config.MemoryStack('post_commit=bzrlib.ahook bzrlib.ahook')
 
480
            commit.Commit(config_stack=conf).commit(
 
481
                message = "base", allow_pointless=True, rev_id='A',
 
482
                working_tree = wt)
444
483
            self.assertEqual(['called', 'called'], calls)
445
484
        finally:
446
485
            del bzrlib.ahook
450
489
        wt = self.make_branch_and_tree('.')
451
490
        c = Commit()
452
491
        c.commit(working_tree=wt, message='empty tree', allow_pointless=True)
453
 
        self.assertEquals(wt.branch.revno(), 1)
 
492
        self.assertEqual(wt.branch.revno(), 1)
454
493
        self.assertEqual({},
455
494
                         wt.branch.repository.get_revision(
456
495
                            wt.branch.last_revision()).properties)
796
835
    def test_commit_with_checkout_and_branch_sharing_repo(self):
797
836
        repo = self.make_repository('repo', shared=True)
798
837
        # make_branch_and_tree ignores shared repos
799
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
838
        branch = controldir.ControlDir.create_branch_convenience('repo/branch')
800
839
        tree2 = branch.create_checkout('repo/tree2')
801
840
        tree2.commit('message', rev_id='rev1')
802
841
        self.assertTrue(tree2.branch.repository.has_revision('rev1'))