/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge_directive.py
26
26
    )
27
27
 
28
28
 
29
 
OUTPUT1 = """# Bazaar merge directive format 1
 
29
OUTPUT1 = b"""# Bazaar merge directive format 1
30
30
# revision_id: example:
31
31
# target_branch: http://example.com
32
32
# testament_sha1: sha
34
34
#\x20
35
35
booga"""
36
36
 
37
 
OUTPUT1_2 = """# Bazaar merge directive format 2 (Bazaar 0.90)
 
37
OUTPUT1_2 = b"""# Bazaar merge directive format 2 (Bazaar 0.90)
38
38
# revision_id: example:
39
39
# target_branch: http://example.com
40
40
# testament_sha1: sha
44
44
# Begin bundle
45
45
booga"""
46
46
 
47
 
OUTPUT2 = """# Bazaar merge directive format 1
 
47
OUTPUT2 = b"""# Bazaar merge directive format 1
48
48
# revision_id: example:
49
49
# target_branch: http://example.com
50
50
# testament_sha1: sha
54
54
#\x20
55
55
booga"""
56
56
 
57
 
OUTPUT2_2 = """# Bazaar merge directive format 2 (Bazaar 0.90)
 
57
OUTPUT2_2 = b"""# Bazaar merge directive format 2 (Bazaar 0.90)
58
58
# revision_id: example:
59
59
# target_branch: http://example.com
60
60
# testament_sha1: sha
66
66
# Begin patch
67
67
booga"""
68
68
 
69
 
INPUT1 = """
 
69
INPUT1 = b"""
70
70
I was thinking today about creating a merge directive.
71
71
 
72
72
So I did.
88
88
booga""".splitlines(True)
89
89
 
90
90
 
91
 
INPUT1_2 = """
 
91
INPUT1_2 = b"""
92
92
I was thinking today about creating a merge directive.
93
93
 
94
94
So I did.
112
112
booga""".splitlines(True)
113
113
 
114
114
 
115
 
INPUT1_2_OLD = """
 
115
INPUT1_2_OLD = b"""
116
116
I was thinking today about creating a merge directive.
117
117
 
118
118
So I did.
136
136
booga""".splitlines(True)
137
137
 
138
138
 
139
 
OLD_DIRECTIVE_2 = """# Bazaar merge directive format 2 (Bazaar 0.19)
 
139
OLD_DIRECTIVE_2 = b"""# Bazaar merge directive format 2 (Bazaar 0.19)
140
140
# revision_id: abentley@panoramicfeedback.com-20070807234458-\
141
141
#   nzhkoyza56lan7z5
142
142
# target_branch: http://panoramicfeedback.com/opensource/bzr/repo\
157
157
        time = 500000.0
158
158
        timezone = 5 * 3600
159
159
        self.assertRaises(errors.NoMergeSource, self.make_merge_directive,
160
 
            'example:', 'sha', time, timezone, 'http://example.com')
 
160
                          b'example:', b'sha', time, timezone, 'http://example.com')
161
161
        self.assertRaises(errors.NoMergeSource, self.make_merge_directive,
162
 
            'example:', 'sha', time, timezone, 'http://example.com',
163
 
            patch_type='diff')
164
 
        self.make_merge_directive('example:', 'sha', time, timezone,
165
 
            'http://example.com', source_branch='http://example.org')
166
 
        md = self.make_merge_directive('null:', 'sha', time, timezone,
167
 
            'http://example.com', patch='blah', patch_type='bundle')
 
162
                          b'example:', b'sha', time, timezone, 'http://example.com',
 
163
                          patch_type='diff')
 
164
        self.make_merge_directive(b'example:', b'sha', time, timezone,
 
165
                                  'http://example.com', source_branch='http://example.org')
 
166
        md = self.make_merge_directive(b'null:', b'sha', time, timezone,
 
167
                                       'http://example.com', patch=b'blah', patch_type='bundle')
168
168
        self.assertIs(None, md.source_branch)
169
 
        md2 = self.make_merge_directive('null:', 'sha', time, timezone,
170
 
            'http://example.com', patch='blah', patch_type='bundle',
171
 
            source_branch='bar')
 
169
        md2 = self.make_merge_directive(b'null:', b'sha', time, timezone,
 
170
                                        'http://example.com', patch=b'blah', patch_type='bundle',
 
171
                                        source_branch='bar')
172
172
        self.assertEqual('bar', md2.source_branch)
173
173
 
174
174
    def test_serialization(self):
175
175
        time = 453
176
176
        timezone = 120
177
 
        md = self.make_merge_directive('example:', 'sha', time, timezone,
178
 
            'http://example.com', patch='booga', patch_type='bundle')
179
 
        self.assertEqualDiff(self.OUTPUT1, ''.join(md.to_lines()))
180
 
        md = self.make_merge_directive('example:', 'sha', time, timezone,
181
 
            'http://example.com', source_branch="http://example.org",
182
 
            patch='booga', patch_type='diff', message="Hi mom!")
183
 
        self.assertEqualDiff(self.OUTPUT2, ''.join(md.to_lines()))
 
177
        md = self.make_merge_directive(b'example:', b'sha', time, timezone,
 
178
                                       'http://example.com', patch=b'booga', patch_type='bundle')
 
179
        self.assertEqualDiff(self.OUTPUT1, b''.join(md.to_lines()))
 
180
        md = self.make_merge_directive(b'example:', b'sha', time, timezone,
 
181
                                       'http://example.com', source_branch="http://example.org",
 
182
                                       patch=b'booga', patch_type='diff', message="Hi mom!")
 
183
        self.assertEqualDiff(self.OUTPUT2, b''.join(md.to_lines()))
184
184
 
185
185
    def test_deserialize_junk(self):
186
186
        time = 501
187
187
        self.assertRaises(errors.NotAMergeDirective,
188
 
                          merge_directive.MergeDirective.from_lines, 'lala')
 
188
                          merge_directive.MergeDirective.from_lines, [b'lala'])
189
189
 
190
190
    def test_deserialize_empty(self):
191
191
        self.assertRaises(errors.NotAMergeDirective,
193
193
 
194
194
    def test_deserialize_leading_junk(self):
195
195
        md = merge_directive.MergeDirective.from_lines(self.INPUT1)
196
 
        self.assertEqual('example:', md.revision_id)
197
 
        self.assertEqual('sha', md.testament_sha1)
 
196
        self.assertEqual(b'example:', md.revision_id)
 
197
        self.assertEqual(b'sha', md.testament_sha1)
198
198
        self.assertEqual('http://example.com', md.target_branch)
199
199
        self.assertEqual('http://example.org', md.source_branch)
200
200
        self.assertEqual(453, md.time)
201
201
        self.assertEqual(120, md.timezone)
202
 
        self.assertEqual('booga', md.patch)
 
202
        self.assertEqual(b'booga', md.patch)
203
203
        self.assertEqual('diff', md.patch_type)
204
204
        self.assertEqual('Hi mom!', md.message)
205
205
 
206
206
    def test_roundtrip(self):
207
207
        time = 500000
208
208
        timezone = 7.5 * 3600
209
 
        md = self.make_merge_directive('example:', 'sha', time, timezone,
210
 
            'http://example.com', source_branch="http://example.org",
211
 
            patch='booga', patch_type='diff')
 
209
        md = self.make_merge_directive(b'example:', b'sha', time, timezone,
 
210
                                       'http://example.com', source_branch="http://example.org",
 
211
                                       patch=b'booga', patch_type='diff')
212
212
        md2 = merge_directive.MergeDirective.from_lines(md.to_lines())
213
 
        self.assertEqual('example:', md2.revision_id)
214
 
        self.assertIsInstance(md2.revision_id, str)
215
 
        self.assertEqual('sha', md2.testament_sha1)
 
213
        self.assertEqual(b'example:', md2.revision_id)
 
214
        self.assertIsInstance(md2.revision_id, bytes)
 
215
        self.assertEqual(b'sha', md2.testament_sha1)
216
216
        self.assertEqual('http://example.com', md2.target_branch)
217
217
        self.assertEqual('http://example.org', md2.source_branch)
218
218
        self.assertEqual(time, md2.time)
219
219
        self.assertEqual(timezone, md2.timezone)
220
220
        self.assertEqual('diff', md2.patch_type)
221
 
        self.assertEqual('booga', md2.patch)
 
221
        self.assertEqual(b'booga', md2.patch)
222
222
        self.assertEqual(None, md2.message)
223
 
        self.set_bundle(md, "# Bazaar revision bundle v0.9\n#\n")
 
223
        self.set_bundle(md, b"# Bazaar revision bundle v0.9\n#\n")
224
224
        md.message = "Hi mom!"
225
225
        lines = md.to_lines()
226
226
        md3 = merge_directive.MergeDirective.from_lines(lines)
227
 
        self.assertEqual("# Bazaar revision bundle v0.9\n#\n", md3.bundle)
 
227
        self.assertEqual(b"# Bazaar revision bundle v0.9\n#\n", md3.bundle)
228
228
        self.assertEqual("bundle", md3.patch_type)
229
229
        self.assertContainsRe(md3.to_lines()[0],
230
 
            '^# Bazaar merge directive format ')
 
230
                              b'^# Bazaar merge directive format ')
231
231
        self.assertEqual("Hi mom!", md3.message)
232
232
        md3.clear_payload()
233
233
        self.assertIs(None, md3.get_raw_bundle())
245
245
    OUTPUT2 = OUTPUT2
246
246
 
247
247
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
248
 
                 target_branch, patch=None, patch_type=None,
249
 
                 source_branch=None, message=None):
 
248
                             target_branch, patch=None, patch_type=None,
 
249
                             source_branch=None, message=None):
250
250
        return merge_directive.MergeDirective(revision_id, testament_sha1,
251
 
                 time, timezone, target_branch, patch, patch_type,
252
 
                 source_branch, message)
 
251
                                              time, timezone, target_branch, patch, patch_type,
 
252
                                              source_branch, message)
253
253
 
254
254
    @staticmethod
255
255
    def set_bundle(md, value):
259
259
        time = 500.0
260
260
        timezone = 120
261
261
        self.assertRaises(errors.PatchMissing, merge_directive.MergeDirective,
262
 
            'example:', 'sha', time, timezone, 'http://example.com',
263
 
            patch_type='bundle')
264
 
        md = merge_directive.MergeDirective('example:', 'sha1', time, timezone,
265
 
            'http://example.com', source_branch="http://example.org",
266
 
            patch='', patch_type='diff')
267
 
        self.assertEqual(md.patch, '')
 
262
                          b'example:', b'sha', time, timezone, 'http://example.com',
 
263
                          patch_type='bundle')
 
264
        md = merge_directive.MergeDirective(b'example:', b'sha1', time, timezone,
 
265
                                            'http://example.com', source_branch="http://example.org",
 
266
                                            patch=b'', patch_type='diff')
 
267
        self.assertEqual(md.patch, b'')
268
268
 
269
269
 
270
270
class TestMergeDirective2(tests.TestCase, TestMergeDirective):
277
277
    OUTPUT2 = OUTPUT2_2
278
278
 
279
279
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
280
 
                 target_branch, patch=None, patch_type=None,
281
 
                 source_branch=None, message=None, base_revision_id='null:'):
 
280
                             target_branch, patch=None, patch_type=None,
 
281
                             source_branch=None, message=None, base_revision_id=b'null:'):
282
282
        if patch_type == 'bundle':
283
283
            bundle = patch
284
284
            patch = None
285
285
        else:
286
286
            bundle = None
287
287
        return merge_directive.MergeDirective2(revision_id, testament_sha1,
288
 
            time, timezone, target_branch, patch, source_branch, message,
289
 
            bundle, base_revision_id)
 
288
                                               time, timezone, target_branch, patch, source_branch, message,
 
289
                                               bundle, base_revision_id)
290
290
 
291
291
    @staticmethod
292
292
    def set_bundle(md, value):
349
349
# message: Commit of rev2a with special message
350
350
"""
351
351
 
 
352
 
352
353
class TestMergeDirectiveBranch(object):
353
354
 
354
355
    def make_trees(self):
355
356
        tree_a = self.make_branch_and_tree('tree_a')
356
357
        tree_a.branch.get_config_stack().set(
357
358
            'email', 'J. Random Hacker <jrandom@example.com>')
358
 
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_b\n'),
359
 
                                  ('tree_a/file_2', 'content_x\rcontent_y\r')])
 
359
        self.build_tree_contents([('tree_a/file', b'content_a\ncontent_b\n'),
 
360
                                  ('tree_a/file_2', b'content_x\rcontent_y\r')])
360
361
        tree_a.add(['file', 'file_2'])
361
 
        tree_a.commit('message', rev_id='rev1')
 
362
        tree_a.commit('message', rev_id=b'rev1')
362
363
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
363
364
        branch_c = tree_a.controldir.sprout('branch_c').open_branch()
364
 
        tree_b.commit('message', rev_id='rev2b')
365
 
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_c \n'),
366
 
                                  ('tree_a/file_2', 'content_x\rcontent_z\r')])
367
 
        tree_a.commit('Commit of rev2a', rev_id='rev2a')
 
365
        tree_b.commit('message', rev_id=b'rev2b')
 
366
        self.build_tree_contents([('tree_a/file', b'content_a\ncontent_c \n'),
 
367
                                  ('tree_a/file_2', b'content_x\rcontent_z\r')])
 
368
        tree_a.commit('Commit of rev2a', rev_id=b'rev2a')
368
369
        return tree_a, tree_b, branch_c
369
370
 
370
371
    def test_empty_target(self):
371
372
        tree_a, tree_b, branch_c = self.make_trees()
372
373
        tree_d = self.make_branch_and_tree('tree_d')
373
 
        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
374
 
            tree_d.branch.base, patch_type='diff',
375
 
            public_branch=tree_a.branch.base)
 
374
        md2 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
375
                                tree_d.branch.base, patch_type='diff',
 
376
                                public_branch=tree_a.branch.base)
376
377
 
377
378
    def test_disk_name(self):
378
379
        tree_a, tree_b, branch_c = self.make_trees()
379
380
        tree_a.branch.nick = 'fancy <name>'
380
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
381
 
            tree_b.branch.base)
 
381
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
382
                               tree_b.branch.base)
382
383
        self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))
383
384
 
384
385
    def test_disk_name_old_revno(self):
385
386
        tree_a, tree_b, branch_c = self.make_trees()
386
387
        tree_a.branch.nick = 'fancy-name'
387
 
        md = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
388
 
            tree_b.branch.base)
 
388
        md = self.from_objects(tree_a.branch.repository, b'rev1', 500, 120,
 
389
                               tree_b.branch.base)
389
390
        self.assertEqual('fancy-name-1', md.get_disk_name(tree_a.branch))
390
391
 
391
392
    def test_generate_patch(self):
392
393
        tree_a, tree_b, branch_c = self.make_trees()
393
 
        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
394
 
            tree_b.branch.base, patch_type='diff',
395
 
            public_branch=tree_a.branch.base)
396
 
        self.assertNotContainsRe(md2.patch, 'Bazaar revision bundle')
397
 
        self.assertContainsRe(md2.patch, '\\+content_c')
398
 
        self.assertNotContainsRe(md2.patch, '\\+\\+\\+ b/')
399
 
        self.assertContainsRe(md2.patch, '\\+\\+\\+ file')
 
394
        md2 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
395
                                tree_b.branch.base, patch_type='diff',
 
396
                                public_branch=tree_a.branch.base)
 
397
        self.assertNotContainsRe(md2.patch, b'Bazaar revision bundle')
 
398
        self.assertContainsRe(md2.patch, b'\\+content_c')
 
399
        self.assertNotContainsRe(md2.patch, b'\\+\\+\\+ b/')
 
400
        self.assertContainsRe(md2.patch, b'\\+\\+\\+ file')
400
401
 
401
402
    def test_public_branch(self):
402
403
        tree_a, tree_b, branch_c = self.make_trees()
403
404
        self.assertRaises(errors.PublicBranchOutOfDate,
404
 
            self.from_objects, tree_a.branch.repository, 'rev2a', 500, 144,
405
 
            tree_b.branch.base, public_branch=branch_c.base, patch_type='diff')
 
405
                          self.from_objects, tree_a.branch.repository, b'rev2a', 500, 144,
 
406
                          tree_b.branch.base, public_branch=branch_c.base, patch_type='diff')
406
407
        self.assertRaises(errors.PublicBranchOutOfDate,
407
 
            self.from_objects, tree_a.branch.repository, 'rev2a', 500, 144,
408
 
            tree_b.branch.base, public_branch=branch_c.base, patch_type=None)
 
408
                          self.from_objects, tree_a.branch.repository, b'rev2a', 500, 144,
 
409
                          tree_b.branch.base, public_branch=branch_c.base, patch_type=None)
409
410
        # public branch is not checked if patch format is bundle.
410
 
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
411
 
            tree_b.branch.base, public_branch=branch_c.base)
 
411
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
 
412
                                tree_b.branch.base, public_branch=branch_c.base)
412
413
        # public branch is provided with a bundle, despite possibly being out
413
414
        # of date, because it's not required if a bundle is present.
414
415
        self.assertEqual(md1.source_branch, branch_c.base)
415
416
        # Once we update the public branch, we can generate a diff.
416
417
        branch_c.pull(tree_a.branch)
417
 
        md3 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
418
 
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
 
418
        md3 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
 
419
                                tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
419
420
 
420
421
    def test_use_public_submit_branch(self):
421
422
        tree_a, tree_b, branch_c = self.make_trees()
422
423
        branch_c.pull(tree_a.branch)
423
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
424
 
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
 
424
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
 
425
                               tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
425
426
        self.assertEqual(md.target_branch, tree_b.branch.base)
426
427
        tree_b.branch.set_public_branch('http://example.com')
427
428
        md2 = self.from_objects(
428
 
              tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
429
 
              patch_type=None, public_branch=branch_c.base)
 
429
            tree_a.branch.repository, b'rev2a', 500, 144, tree_b.branch.base,
 
430
            patch_type=None, public_branch=branch_c.base)
430
431
        self.assertEqual(md2.target_branch, 'http://example.com')
431
432
 
432
433
    def test_message(self):
433
434
        tree_a, tree_b, branch_c = self.make_trees()
434
 
        md3 = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
435
 
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base,
436
 
            message='Merge message')
 
435
        md3 = self.from_objects(tree_a.branch.repository, b'rev1', 500, 120,
 
436
                                tree_b.branch.base, patch_type=None, public_branch=branch_c.base,
 
437
                                message='Merge message')
437
438
        md3.to_lines()
438
439
        self.assertIs(None, md3.patch)
439
440
        self.assertEqual('Merge message', md3.message)
440
441
 
441
442
    def test_generate_bundle(self):
442
443
        tree_a, tree_b, branch_c = self.make_trees()
443
 
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
444
 
            tree_b.branch.base, public_branch=branch_c.base)
 
444
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
445
                                tree_b.branch.base, public_branch=branch_c.base)
445
446
 
446
 
        self.assertContainsRe(md1.get_raw_bundle(), 'Bazaar revision bundle')
447
 
        self.assertContainsRe(md1.patch, '\\+content_c')
448
 
        self.assertNotContainsRe(md1.patch, '\\+content_a')
449
 
        self.assertContainsRe(md1.patch, '\\+content_c')
450
 
        self.assertNotContainsRe(md1.patch, '\\+content_a')
 
447
        self.assertContainsRe(md1.get_raw_bundle(), b'Bazaar revision bundle')
 
448
        self.assertContainsRe(md1.patch, b'\\+content_c')
 
449
        self.assertNotContainsRe(md1.patch, b'\\+content_a')
 
450
        self.assertContainsRe(md1.patch, b'\\+content_c')
 
451
        self.assertNotContainsRe(md1.patch, b'\\+content_a')
451
452
 
452
453
    def test_broken_bundle(self):
453
454
        tree_a, tree_b, branch_c = self.make_trees()
454
 
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
455
 
            tree_b.branch.base, public_branch=branch_c.base)
 
455
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
456
                                tree_b.branch.base, public_branch=branch_c.base)
456
457
        lines = md1.to_lines()
457
 
        lines = [l.replace('\n', '\r\n') for l in lines]
 
458
        lines = [l.replace(b'\n', b'\r\n') for l in lines]
458
459
        md2 = merge_directive.MergeDirective.from_lines(lines)
459
 
        self.assertEqual('rev2a', md2.revision_id)
 
460
        self.assertEqual(b'rev2a', md2.revision_id)
460
461
 
461
462
    def test_signing(self):
462
463
        time = 453
463
464
        timezone = 7200
 
465
 
464
466
        class FakeBranch(object):
465
467
            def get_config_stack(self):
466
468
                return self
467
 
        md = self.make_merge_directive('example:', 'sha', time, timezone,
468
 
            'http://example.com', source_branch="http://example.org",
469
 
            patch='booga', patch_type='diff')
 
469
        md = self.make_merge_directive(b'example:', b'sha', time, timezone,
 
470
                                       'http://example.com', source_branch="http://example.org",
 
471
                                       patch=b'booga', patch_type='diff')
470
472
        old_strategy = gpg.GPGStrategy
471
473
        gpg.GPGStrategy = gpg.LoopbackGPGStrategy
472
474
        try:
473
475
            signed = md.to_signed(FakeBranch())
474
476
        finally:
475
477
            gpg.GPGStrategy = old_strategy
476
 
        self.assertContainsRe(signed, '^-----BEGIN PSEUDO-SIGNED CONTENT')
477
 
        self.assertContainsRe(signed, 'example.org')
478
 
        self.assertContainsRe(signed, 'booga')
 
478
        self.assertContainsRe(signed, b'^-----BEGIN PSEUDO-SIGNED CONTENT')
 
479
        self.assertContainsRe(signed, b'example.org')
 
480
        self.assertContainsRe(signed, b'booga')
479
481
 
480
482
    def test_email(self):
481
483
        tree_a, tree_b, branch_c = self.make_trees()
482
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 476, 60,
483
 
            tree_b.branch.base, patch_type=None,
484
 
            public_branch=tree_a.branch.base)
 
484
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 476, 60,
 
485
                               tree_b.branch.base, patch_type=None,
 
486
                               public_branch=tree_a.branch.base)
485
487
        message = md.to_email('pqm@example.com', tree_a.branch)
486
488
        self.assertContainsRe(message.as_string(), self.EMAIL1)
487
489
        md.message = 'Commit of rev2a with special message'
490
492
 
491
493
    def test_install_revisions_branch(self):
492
494
        tree_a, tree_b, branch_c = self.make_trees()
493
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
494
 
            tree_b.branch.base, patch_type=None,
495
 
            public_branch=tree_a.branch.base)
496
 
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
 
495
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
496
                               tree_b.branch.base, patch_type=None,
 
497
                               public_branch=tree_a.branch.base)
 
498
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
497
499
        revision = md.install_revisions(tree_b.branch.repository)
498
 
        self.assertEqual('rev2a', revision)
499
 
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
 
500
        self.assertEqual(b'rev2a', revision)
 
501
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
500
502
 
501
503
    def test_get_merge_request(self):
502
504
        tree_a, tree_b, branch_c = self.make_trees()
503
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
504
 
            tree_b.branch.base, patch_type='bundle',
505
 
            public_branch=tree_a.branch.base)
506
 
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
 
505
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
506
                               tree_b.branch.base, patch_type='bundle',
 
507
                               public_branch=tree_a.branch.base)
 
508
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
507
509
        md.install_revisions(tree_b.branch.repository)
508
510
        base, revision, verified = md.get_merge_request(
509
511
            tree_b.branch.repository)
511
513
            self.assertIs(None, base)
512
514
            self.assertEqual('inapplicable', verified)
513
515
        else:
514
 
            self.assertEqual('rev1', base)
515
 
            self.assertEqual('verified', verified)
516
 
        self.assertEqual('rev2a', revision)
517
 
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
518
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
519
 
            tree_b.branch.base, patch_type=None,
520
 
            public_branch=tree_a.branch.base)
521
 
        base, revision, verified = md.get_merge_request(
522
 
            tree_b.branch.repository)
523
 
        if isinstance(md, merge_directive.MergeDirective):
524
 
            self.assertIs(None, base)
525
 
            self.assertEqual('inapplicable', verified)
526
 
        else:
527
 
            self.assertEqual('rev1', base)
528
 
            self.assertEqual('inapplicable', verified)
529
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
530
 
            tree_b.branch.base, patch_type='diff',
531
 
            public_branch=tree_a.branch.base)
532
 
        base, revision, verified = md.get_merge_request(
533
 
            tree_b.branch.repository)
534
 
        if isinstance(md, merge_directive.MergeDirective):
535
 
            self.assertIs(None, base)
536
 
            self.assertEqual('inapplicable', verified)
537
 
        else:
538
 
            self.assertEqual('rev1', base)
539
 
            self.assertEqual('verified', verified)
540
 
        md.patch='asdf'
541
 
        base, revision, verified = md.get_merge_request(
542
 
            tree_b.branch.repository)
543
 
        if isinstance(md, merge_directive.MergeDirective):
544
 
            self.assertIs(None, base)
545
 
            self.assertEqual('inapplicable', verified)
546
 
        else:
547
 
            self.assertEqual('rev1', base)
 
516
            self.assertEqual(b'rev1', base)
 
517
            self.assertEqual('verified', verified)
 
518
        self.assertEqual(b'rev2a', revision)
 
519
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
 
520
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
521
                               tree_b.branch.base, patch_type=None,
 
522
                               public_branch=tree_a.branch.base)
 
523
        base, revision, verified = md.get_merge_request(
 
524
            tree_b.branch.repository)
 
525
        if isinstance(md, merge_directive.MergeDirective):
 
526
            self.assertIs(None, base)
 
527
            self.assertEqual('inapplicable', verified)
 
528
        else:
 
529
            self.assertEqual(b'rev1', base)
 
530
            self.assertEqual('inapplicable', verified)
 
531
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
532
                               tree_b.branch.base, patch_type='diff',
 
533
                               public_branch=tree_a.branch.base)
 
534
        base, revision, verified = md.get_merge_request(
 
535
            tree_b.branch.repository)
 
536
        if isinstance(md, merge_directive.MergeDirective):
 
537
            self.assertIs(None, base)
 
538
            self.assertEqual('inapplicable', verified)
 
539
        else:
 
540
            self.assertEqual(b'rev1', base)
 
541
            self.assertEqual('verified', verified)
 
542
        md.patch = b'asdf'
 
543
        base, revision, verified = md.get_merge_request(
 
544
            tree_b.branch.repository)
 
545
        if isinstance(md, merge_directive.MergeDirective):
 
546
            self.assertIs(None, base)
 
547
            self.assertEqual('inapplicable', verified)
 
548
        else:
 
549
            self.assertEqual(b'rev1', base)
548
550
            self.assertEqual('failed', verified)
549
551
 
550
552
    def test_install_revisions_bundle(self):
551
553
        tree_a, tree_b, branch_c = self.make_trees()
552
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
553
 
            tree_b.branch.base, patch_type='bundle',
554
 
            public_branch=tree_a.branch.base)
555
 
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
 
554
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
555
                               tree_b.branch.base, patch_type='bundle',
 
556
                               public_branch=tree_a.branch.base)
 
557
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
556
558
        revision = md.install_revisions(tree_b.branch.repository)
557
 
        self.assertEqual('rev2a', revision)
558
 
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
 
559
        self.assertEqual(b'rev2a', revision)
 
560
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
559
561
 
560
562
    def test_get_target_revision_nofetch(self):
561
563
        tree_a, tree_b, branch_c = self.make_trees()
562
564
        tree_b.branch.fetch(tree_a.branch)
563
 
        md = self.from_objects( tree_a.branch.repository, 'rev2a', 500, 36,
564
 
            tree_b.branch.base, patch_type=None,
565
 
            public_branch=tree_a.branch.base)
 
565
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
566
                               tree_b.branch.base, patch_type=None,
 
567
                               public_branch=tree_a.branch.base)
566
568
        md.source_branch = '/dev/null'
567
569
        revision = md.install_revisions(tree_b.branch.repository)
568
 
        self.assertEqual('rev2a', revision)
 
570
        self.assertEqual(b'rev2a', revision)
569
571
 
570
572
    def test_use_submit_for_missing_dependency(self):
571
573
        tree_a, tree_b, branch_c = self.make_trees()
572
574
        branch_c.pull(tree_a.branch)
573
 
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
574
 
        tree_a.commit('rev3a', rev_id='rev3a')
575
 
        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
576
 
            branch_c.base, base_revision_id='rev2a')
 
575
        self.build_tree_contents([('tree_a/file', b'content_q\ncontent_r\n')])
 
576
        tree_a.commit('rev3a', rev_id=b'rev3a')
 
577
        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
 
578
                               branch_c.base, base_revision_id=b'rev2a')
577
579
        revision = md.install_revisions(tree_b.branch.repository)
578
580
 
579
581
    def test_handle_target_not_a_branch(self):
580
582
        tree_a, tree_b, branch_c = self.make_trees()
581
583
        branch_c.pull(tree_a.branch)
582
 
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
583
 
        tree_a.commit('rev3a', rev_id='rev3a')
584
 
        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
585
 
            branch_c.base, base_revision_id='rev2a')
 
584
        self.build_tree_contents([('tree_a/file', b'content_q\ncontent_r\n')])
 
585
        tree_a.commit('rev3a', rev_id=b'rev3a')
 
586
        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
 
587
                               branch_c.base, base_revision_id=b'rev2a')
586
588
        md.target_branch = self.get_url('not-a-branch')
587
589
        self.assertRaises(errors.TargetNotBranch, md.install_revisions,
588
 
                tree_b.branch.repository)
 
590
                          tree_b.branch.repository)
589
591
 
590
592
 
591
593
class TestMergeDirective1Branch(tests.TestCaseWithTransport,
592
 
    TestMergeDirectiveBranch):
 
594
                                TestMergeDirectiveBranch):
593
595
    """Test merge directive format 1 with a branch"""
594
596
 
595
597
    EMAIL1 = EMAIL1
597
599
    EMAIL2 = EMAIL2
598
600
 
599
601
    def from_objects(self, repository, revision_id, time, timezone,
600
 
        target_branch, patch_type='bundle', local_target_branch=None,
601
 
        public_branch=None, message=None, base_revision_id=None):
 
602
                     target_branch, patch_type='bundle', local_target_branch=None,
 
603
                     public_branch=None, message=None, base_revision_id=None):
602
604
        if base_revision_id is not None:
603
605
            raise tests.TestNotApplicable('This format does not support'
604
606
                                          ' explicit bases.')
605
 
        repository.lock_write()
606
 
        try:
607
 
            return merge_directive.MergeDirective.from_objects( repository,
608
 
                revision_id, time, timezone, target_branch, patch_type,
609
 
                local_target_branch, public_branch, message)
610
 
        finally:
611
 
            repository.unlock()
 
607
        with repository.lock_write():
 
608
            return merge_directive.MergeDirective.from_objects(repository,
 
609
                                                               revision_id, time, timezone, target_branch, patch_type,
 
610
                                                               local_target_branch, public_branch, message)
612
611
 
613
612
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
614
 
                 target_branch, patch=None, patch_type=None,
615
 
                 source_branch=None, message=None):
 
613
                             target_branch, patch=None, patch_type=None,
 
614
                             source_branch=None, message=None):
616
615
        return merge_directive.MergeDirective(revision_id, testament_sha1,
617
 
                 time, timezone, target_branch, patch, patch_type,
618
 
                 source_branch, message)
 
616
                                              time, timezone, target_branch, patch, patch_type,
 
617
                                              source_branch, message)
619
618
 
620
619
 
621
620
class TestMergeDirective2Branch(tests.TestCaseWithTransport,
622
 
    TestMergeDirectiveBranch):
 
621
                                TestMergeDirectiveBranch):
623
622
    """Test merge directive format 2 with a branch"""
624
623
 
625
624
    EMAIL1 = EMAIL1_2
627
626
    EMAIL2 = EMAIL2_2
628
627
 
629
628
    def from_objects(self, repository, revision_id, time, timezone,
630
 
        target_branch, patch_type='bundle', local_target_branch=None,
631
 
        public_branch=None, message=None, base_revision_id=None):
 
629
                     target_branch, patch_type='bundle', local_target_branch=None,
 
630
                     public_branch=None, message=None, base_revision_id=None):
632
631
        include_patch = (patch_type in ('bundle', 'diff'))
633
632
        include_bundle = (patch_type == 'bundle')
634
633
        self.assertTrue(patch_type in ('bundle', 'diff', None))
638
637
            message, base_revision_id)
639
638
 
640
639
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
641
 
                 target_branch, patch=None, patch_type=None,
642
 
                 source_branch=None, message=None, base_revision_id='null:'):
 
640
                             target_branch, patch=None, patch_type=None,
 
641
                             source_branch=None, message=None, base_revision_id=b'null:'):
643
642
        if patch_type == 'bundle':
644
643
            bundle = patch
645
644
            patch = None
646
645
        else:
647
646
            bundle = None
648
647
        return merge_directive.MergeDirective2(revision_id, testament_sha1,
649
 
            time, timezone, target_branch, patch, source_branch, message,
650
 
            bundle, base_revision_id)
 
648
                                               time, timezone, target_branch, patch, source_branch, message,
 
649
                                               bundle, base_revision_id)
651
650
 
652
651
    def test_base_revision(self):
653
652
        tree_a, tree_b, branch_c = self.make_trees()
654
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
655
 
            tree_b.branch.base, patch_type='bundle',
656
 
            public_branch=tree_a.branch.base, base_revision_id=None)
657
 
        self.assertEqual('rev1', md.base_revision_id)
658
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
659
 
            tree_b.branch.base, patch_type='bundle',
660
 
            public_branch=tree_a.branch.base, base_revision_id='null:')
661
 
        self.assertEqual('null:', md.base_revision_id)
 
653
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
 
654
                               tree_b.branch.base, patch_type='bundle',
 
655
                               public_branch=tree_a.branch.base, base_revision_id=None)
 
656
        self.assertEqual(b'rev1', md.base_revision_id)
 
657
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
 
658
                               tree_b.branch.base, patch_type='bundle',
 
659
                               public_branch=tree_a.branch.base, base_revision_id=b'null:')
 
660
        self.assertEqual(b'null:', md.base_revision_id)
662
661
        lines = md.to_lines()
663
662
        md2 = merge_directive.MergeDirective.from_lines(lines)
664
663
        self.assertEqual(md2.base_revision_id, md.base_revision_id)
665
664
 
666
665
    def test_patch_verification(self):
667
666
        tree_a, tree_b, branch_c = self.make_trees()
668
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
669
 
            tree_b.branch.base, patch_type='bundle',
670
 
            public_branch=tree_a.branch.base)
 
667
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
 
668
                               tree_b.branch.base, patch_type='bundle',
 
669
                               public_branch=tree_a.branch.base)
671
670
        lines = md.to_lines()
672
671
        md2 = merge_directive.MergeDirective.from_lines(lines)
673
672
        md2._verify_patch(tree_a.branch.repository)
674
673
        # Strip trailing whitespace
675
 
        md2.patch = md2.patch.replace(' \n', '\n')
 
674
        md2.patch = md2.patch.replace(b' \n', b'\n')
676
675
        md2._verify_patch(tree_a.branch.repository)
677
676
        # Convert to Mac line-endings
678
 
        md2.patch = re.sub('(\r\n|\r|\n)', '\r', md2.patch)
 
677
        md2.patch = re.sub(b'(\r\n|\r|\n)', b'\r', md2.patch)
679
678
        self.assertTrue(md2._verify_patch(tree_a.branch.repository))
680
679
        # Convert to DOS line-endings
681
 
        md2.patch = re.sub('(\r\n|\r|\n)', '\r\n', md2.patch)
 
680
        md2.patch = re.sub(b'(\r\n|\r|\n)', b'\r\n', md2.patch)
682
681
        self.assertTrue(md2._verify_patch(tree_a.branch.repository))
683
 
        md2.patch = md2.patch.replace('content_c', 'content_d')
 
682
        md2.patch = md2.patch.replace(b'content_c', b'content_d')
684
683
        self.assertFalse(md2._verify_patch(tree_a.branch.repository))
685
684
 
686
685
 
688
687
 
689
688
    def test_parse_old_merge_directive(self):
690
689
        md = merge_directive.MergeDirective.from_lines(INPUT1_2_OLD)
691
 
        self.assertEqual('example:', md.revision_id)
692
 
        self.assertEqual('sha', md.testament_sha1)
 
690
        self.assertEqual(b'example:', md.revision_id)
 
691
        self.assertEqual(b'sha', md.testament_sha1)
693
692
        self.assertEqual('http://example.com', md.target_branch)
694
693
        self.assertEqual('http://example.org', md.source_branch)
695
694
        self.assertEqual(453, md.time)
696
695
        self.assertEqual(120, md.timezone)
697
 
        self.assertEqual('booga', md.patch)
 
696
        self.assertEqual(b'booga', md.patch)
698
697
        self.assertEqual('diff', md.patch_type)
699
698
        self.assertEqual('Hi mom!', md.message)
700
699
 
734
733
        tree = self.make_branch_and_tree('foo')
735
734
        tree.commit('foo')
736
735
        directive = merge_directive.MergeDirective2(
737
 
            tree.branch.last_revision(), 'sha', 0, 0, 'sha',
 
736
            tree.branch.last_revision(), b'sha', 0, 0, b'sha',
738
737
            source_branch=tree.branch.base,
739
738
            base_revision_id=tree.branch.last_revision(),
740
739
            message='This code rox')
741
740
        directive.compose_merge_request(client, 'jrandom@example.com',
742
 
            None, tree.branch)
 
741
                                        None, tree.branch)
743
742
        return client, directive
744
743
 
745
744
    def test_no_supports_body(self):
746
745
        test_hook = TestHook('foo')
747
746
        old_warn = trace.warning
748
747
        warnings = []
 
748
 
749
749
        def warn(*args):
750
750
            warnings.append(args)
751
751
        trace.warning = warn
752
752
        try:
753
753
            client, directive = self.compose_with_hooks([test_hook],
754
 
                supports_body=False)
 
754
                                                        supports_body=False)
755
755
        finally:
756
756
            trace.warning = old_warn
757
757
        self.assertEqual(0, len(test_hook.calls))