/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: Martin
  • Date: 2018-11-16 16:38:22 UTC
  • mto: This revision was merged to the branch mainline in revision 7172.
  • Revision ID: gzlist@googlemail.com-20181116163822-yg1h1cdng6w7w9kn
Make --profile-imports work on Python 3

Also tweak heading to line up correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge_directive.py
16
16
 
17
17
import re
18
18
 
19
 
from bzrlib import (
 
19
from .. import (
20
20
    errors,
21
21
    gpg,
22
22
    mail_client,
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',
 
162
            b'example:', b'sha', time, timezone, 'http://example.com',
163
163
            patch_type='diff')
164
 
        self.make_merge_directive('example:', 'sha', time, timezone,
 
164
        self.make_merge_directive(b'example:', b'sha', time, timezone,
165
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')
 
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',
 
169
        md2 = self.make_merge_directive(b'null:', b'sha', time, timezone,
 
170
            'http://example.com', patch=b'blah', patch_type='bundle',
171
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,
 
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
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()))
 
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,
 
209
        md = self.make_merge_directive(b'example:', b'sha', time, timezone,
210
210
            'http://example.com', source_branch="http://example.org",
211
 
            patch='booga', patch_type='diff')
 
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())
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',
 
262
            b'example:', b'sha', time, timezone, 'http://example.com',
263
263
            patch_type='bundle')
264
 
        md = merge_directive.MergeDirective('example:', 'sha1', time, timezone,
 
264
        md = merge_directive.MergeDirective(b'example:', b'sha1', time, timezone,
265
265
            'http://example.com', source_branch="http://example.org",
266
 
            patch='', patch_type='diff')
267
 
        self.assertEqual(md.patch, '')
 
266
            patch=b'', patch_type='diff')
 
267
        self.assertEqual(md.patch, b'')
268
268
 
269
269
 
270
270
class TestMergeDirective2(tests.TestCase, TestMergeDirective):
278
278
 
279
279
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
280
280
                 target_branch, patch=None, patch_type=None,
281
 
                 source_branch=None, message=None, base_revision_id='null:'):
 
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
296
296
EMAIL1 = """From: "J. Random Hacker" <jrandom@example.com>
297
297
Subject: Commit of rev2a
298
298
To: pqm@example.com
299
 
User-Agent: Bazaar \(.*\)
 
299
User-Agent: Bazaar \\(.*\\)
300
300
 
301
301
# Bazaar merge directive format 1
302
302
# revision_id: rev2a
310
310
EMAIL1_2 = """From: "J. Random Hacker" <jrandom@example.com>
311
311
Subject: Commit of rev2a
312
312
To: pqm@example.com
313
 
User-Agent: Bazaar \(.*\)
 
313
User-Agent: Bazaar \\(.*\\)
314
314
 
315
315
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
316
316
# revision_id: rev2a
324
324
EMAIL2 = """From: "J. Random Hacker" <jrandom@example.com>
325
325
Subject: Commit of rev2a with special message
326
326
To: pqm@example.com
327
 
User-Agent: Bazaar \(.*\)
 
327
User-Agent: Bazaar \\(.*\\)
328
328
 
329
329
# Bazaar merge directive format 1
330
330
# revision_id: rev2a
338
338
EMAIL2_2 = """From: "J. Random Hacker" <jrandom@example.com>
339
339
Subject: Commit of rev2a with special message
340
340
To: pqm@example.com
341
 
User-Agent: Bazaar \(.*\)
 
341
User-Agent: Bazaar \\(.*\\)
342
342
 
343
343
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
344
344
# revision_id: rev2a
353
353
 
354
354
    def make_trees(self):
355
355
        tree_a = self.make_branch_and_tree('tree_a')
356
 
        tree_a.branch.get_config().set_user_option('email',
357
 
            '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')])
 
356
        tree_a.branch.get_config_stack().set(
 
357
            'email', 'J. Random Hacker <jrandom@example.com>')
 
358
        self.build_tree_contents([('tree_a/file', b'content_a\ncontent_b\n'),
 
359
                                  ('tree_a/file_2', b'content_x\rcontent_y\r')])
360
360
        tree_a.add(['file', 'file_2'])
361
 
        tree_a.commit('message', rev_id='rev1')
362
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
363
 
        branch_c = tree_a.bzrdir.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')
 
361
        tree_a.commit('message', rev_id=b'rev1')
 
362
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
 
363
        branch_c = tree_a.controldir.sprout('branch_c').open_branch()
 
364
        tree_b.commit('message', rev_id=b'rev2b')
 
365
        self.build_tree_contents([('tree_a/file', b'content_a\ncontent_c \n'),
 
366
                                  ('tree_a/file_2', b'content_x\rcontent_z\r')])
 
367
        tree_a.commit('Commit of rev2a', rev_id=b'rev2a')
368
368
        return tree_a, tree_b, branch_c
369
369
 
370
370
    def test_empty_target(self):
371
371
        tree_a, tree_b, branch_c = self.make_trees()
372
372
        tree_d = self.make_branch_and_tree('tree_d')
373
 
        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
 
373
        md2 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
374
374
            tree_d.branch.base, patch_type='diff',
375
375
            public_branch=tree_a.branch.base)
376
376
 
377
377
    def test_disk_name(self):
378
378
        tree_a, tree_b, branch_c = self.make_trees()
379
379
        tree_a.branch.nick = 'fancy <name>'
380
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
 
380
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
381
381
            tree_b.branch.base)
382
382
        self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))
383
383
 
384
384
    def test_disk_name_old_revno(self):
385
385
        tree_a, tree_b, branch_c = self.make_trees()
386
386
        tree_a.branch.nick = 'fancy-name'
387
 
        md = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
 
387
        md = self.from_objects(tree_a.branch.repository, b'rev1', 500, 120,
388
388
            tree_b.branch.base)
389
389
        self.assertEqual('fancy-name-1', md.get_disk_name(tree_a.branch))
390
390
 
391
391
    def test_generate_patch(self):
392
392
        tree_a, tree_b, branch_c = self.make_trees()
393
 
        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
 
393
        md2 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
394
394
            tree_b.branch.base, patch_type='diff',
395
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')
 
396
        self.assertNotContainsRe(md2.patch, b'Bazaar revision bundle')
 
397
        self.assertContainsRe(md2.patch, b'\\+content_c')
 
398
        self.assertNotContainsRe(md2.patch, b'\\+\\+\\+ b/')
 
399
        self.assertContainsRe(md2.patch, b'\\+\\+\\+ file')
400
400
 
401
401
    def test_public_branch(self):
402
402
        tree_a, tree_b, branch_c = self.make_trees()
403
403
        self.assertRaises(errors.PublicBranchOutOfDate,
404
 
            self.from_objects, tree_a.branch.repository, 'rev2a', 500, 144,
 
404
            self.from_objects, tree_a.branch.repository, b'rev2a', 500, 144,
405
405
            tree_b.branch.base, public_branch=branch_c.base, patch_type='diff')
406
406
        self.assertRaises(errors.PublicBranchOutOfDate,
407
 
            self.from_objects, tree_a.branch.repository, 'rev2a', 500, 144,
 
407
            self.from_objects, tree_a.branch.repository, b'rev2a', 500, 144,
408
408
            tree_b.branch.base, public_branch=branch_c.base, patch_type=None)
409
409
        # public branch is not checked if patch format is bundle.
410
 
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
 
410
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
411
411
            tree_b.branch.base, public_branch=branch_c.base)
412
412
        # public branch is provided with a bundle, despite possibly being out
413
413
        # of date, because it's not required if a bundle is present.
414
414
        self.assertEqual(md1.source_branch, branch_c.base)
415
415
        # Once we update the public branch, we can generate a diff.
416
416
        branch_c.pull(tree_a.branch)
417
 
        md3 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
 
417
        md3 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
418
418
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
419
419
 
420
420
    def test_use_public_submit_branch(self):
421
421
        tree_a, tree_b, branch_c = self.make_trees()
422
422
        branch_c.pull(tree_a.branch)
423
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
 
423
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
424
424
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
425
425
        self.assertEqual(md.target_branch, tree_b.branch.base)
426
426
        tree_b.branch.set_public_branch('http://example.com')
427
427
        md2 = self.from_objects(
428
 
              tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
 
428
              tree_a.branch.repository, b'rev2a', 500, 144, tree_b.branch.base,
429
429
              patch_type=None, public_branch=branch_c.base)
430
430
        self.assertEqual(md2.target_branch, 'http://example.com')
431
431
 
432
432
    def test_message(self):
433
433
        tree_a, tree_b, branch_c = self.make_trees()
434
 
        md3 = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
 
434
        md3 = self.from_objects(tree_a.branch.repository, b'rev1', 500, 120,
435
435
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base,
436
436
            message='Merge message')
437
437
        md3.to_lines()
440
440
 
441
441
    def test_generate_bundle(self):
442
442
        tree_a, tree_b, branch_c = self.make_trees()
443
 
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
 
443
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
444
444
            tree_b.branch.base, public_branch=branch_c.base)
445
445
 
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')
 
446
        self.assertContainsRe(md1.get_raw_bundle(), b'Bazaar revision bundle')
 
447
        self.assertContainsRe(md1.patch, b'\\+content_c')
 
448
        self.assertNotContainsRe(md1.patch, b'\\+content_a')
 
449
        self.assertContainsRe(md1.patch, b'\\+content_c')
 
450
        self.assertNotContainsRe(md1.patch, b'\\+content_a')
451
451
 
452
452
    def test_broken_bundle(self):
453
453
        tree_a, tree_b, branch_c = self.make_trees()
454
 
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
 
454
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
455
455
            tree_b.branch.base, public_branch=branch_c.base)
456
456
        lines = md1.to_lines()
457
 
        lines = [l.replace('\n', '\r\n') for l in lines]
 
457
        lines = [l.replace(b'\n', b'\r\n') for l in lines]
458
458
        md2 = merge_directive.MergeDirective.from_lines(lines)
459
 
        self.assertEqual('rev2a', md2.revision_id)
 
459
        self.assertEqual(b'rev2a', md2.revision_id)
460
460
 
461
461
    def test_signing(self):
462
462
        time = 453
463
463
        timezone = 7200
464
464
        class FakeBranch(object):
465
 
            def get_config(self):
 
465
            def get_config_stack(self):
466
466
                return self
467
 
            def gpg_signing_command(self):
468
 
                return 'loopback'
469
 
        md = self.make_merge_directive('example:', 'sha', time, timezone,
 
467
        md = self.make_merge_directive(b'example:', b'sha', time, timezone,
470
468
            'http://example.com', source_branch="http://example.org",
471
 
            patch='booga', patch_type='diff')
 
469
            patch=b'booga', patch_type='diff')
472
470
        old_strategy = gpg.GPGStrategy
473
471
        gpg.GPGStrategy = gpg.LoopbackGPGStrategy
474
472
        try:
475
473
            signed = md.to_signed(FakeBranch())
476
474
        finally:
477
475
            gpg.GPGStrategy = old_strategy
478
 
        self.assertContainsRe(signed, '^-----BEGIN PSEUDO-SIGNED CONTENT')
479
 
        self.assertContainsRe(signed, 'example.org')
480
 
        self.assertContainsRe(signed, 'booga')
 
476
        self.assertContainsRe(signed, b'^-----BEGIN PSEUDO-SIGNED CONTENT')
 
477
        self.assertContainsRe(signed, b'example.org')
 
478
        self.assertContainsRe(signed, b'booga')
481
479
 
482
480
    def test_email(self):
483
481
        tree_a, tree_b, branch_c = self.make_trees()
484
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 476, 60,
 
482
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 476, 60,
485
483
            tree_b.branch.base, patch_type=None,
486
484
            public_branch=tree_a.branch.base)
487
485
        message = md.to_email('pqm@example.com', tree_a.branch)
492
490
 
493
491
    def test_install_revisions_branch(self):
494
492
        tree_a, tree_b, branch_c = self.make_trees()
495
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
 
493
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
496
494
            tree_b.branch.base, patch_type=None,
497
495
            public_branch=tree_a.branch.base)
498
 
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
 
496
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
499
497
        revision = md.install_revisions(tree_b.branch.repository)
500
 
        self.assertEqual('rev2a', revision)
501
 
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
 
498
        self.assertEqual(b'rev2a', revision)
 
499
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
502
500
 
503
501
    def test_get_merge_request(self):
504
502
        tree_a, tree_b, branch_c = self.make_trees()
505
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
 
503
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
506
504
            tree_b.branch.base, patch_type='bundle',
507
505
            public_branch=tree_a.branch.base)
508
 
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
 
506
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
509
507
        md.install_revisions(tree_b.branch.repository)
510
508
        base, revision, verified = md.get_merge_request(
511
509
            tree_b.branch.repository)
513
511
            self.assertIs(None, base)
514
512
            self.assertEqual('inapplicable', verified)
515
513
        else:
516
 
            self.assertEqual('rev1', base)
 
514
            self.assertEqual(b'rev1', base)
517
515
            self.assertEqual('verified', verified)
518
 
        self.assertEqual('rev2a', revision)
519
 
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
520
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
 
516
        self.assertEqual(b'rev2a', revision)
 
517
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
 
518
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
521
519
            tree_b.branch.base, patch_type=None,
522
520
            public_branch=tree_a.branch.base)
523
521
        base, revision, verified = md.get_merge_request(
526
524
            self.assertIs(None, base)
527
525
            self.assertEqual('inapplicable', verified)
528
526
        else:
529
 
            self.assertEqual('rev1', base)
 
527
            self.assertEqual(b'rev1', base)
530
528
            self.assertEqual('inapplicable', verified)
531
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
 
529
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
532
530
            tree_b.branch.base, patch_type='diff',
533
531
            public_branch=tree_a.branch.base)
534
532
        base, revision, verified = md.get_merge_request(
537
535
            self.assertIs(None, base)
538
536
            self.assertEqual('inapplicable', verified)
539
537
        else:
540
 
            self.assertEqual('rev1', base)
 
538
            self.assertEqual(b'rev1', base)
541
539
            self.assertEqual('verified', verified)
542
 
        md.patch='asdf'
 
540
        md.patch=b'asdf'
543
541
        base, revision, verified = md.get_merge_request(
544
542
            tree_b.branch.repository)
545
543
        if isinstance(md, merge_directive.MergeDirective):
546
544
            self.assertIs(None, base)
547
545
            self.assertEqual('inapplicable', verified)
548
546
        else:
549
 
            self.assertEqual('rev1', base)
 
547
            self.assertEqual(b'rev1', base)
550
548
            self.assertEqual('failed', verified)
551
549
 
552
550
    def test_install_revisions_bundle(self):
553
551
        tree_a, tree_b, branch_c = self.make_trees()
554
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
 
552
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
555
553
            tree_b.branch.base, patch_type='bundle',
556
554
            public_branch=tree_a.branch.base)
557
 
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
 
555
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
558
556
        revision = md.install_revisions(tree_b.branch.repository)
559
 
        self.assertEqual('rev2a', revision)
560
 
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
 
557
        self.assertEqual(b'rev2a', revision)
 
558
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
561
559
 
562
560
    def test_get_target_revision_nofetch(self):
563
561
        tree_a, tree_b, branch_c = self.make_trees()
564
562
        tree_b.branch.fetch(tree_a.branch)
565
 
        md = self.from_objects( tree_a.branch.repository, 'rev2a', 500, 36,
 
563
        md = self.from_objects( tree_a.branch.repository, b'rev2a', 500, 36,
566
564
            tree_b.branch.base, patch_type=None,
567
565
            public_branch=tree_a.branch.base)
568
566
        md.source_branch = '/dev/null'
569
567
        revision = md.install_revisions(tree_b.branch.repository)
570
 
        self.assertEqual('rev2a', revision)
 
568
        self.assertEqual(b'rev2a', revision)
571
569
 
572
570
    def test_use_submit_for_missing_dependency(self):
573
571
        tree_a, tree_b, branch_c = self.make_trees()
574
572
        branch_c.pull(tree_a.branch)
575
 
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
576
 
        tree_a.commit('rev3a', rev_id='rev3a')
577
 
        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
578
 
            branch_c.base, base_revision_id='rev2a')
 
573
        self.build_tree_contents([('tree_a/file', b'content_q\ncontent_r\n')])
 
574
        tree_a.commit('rev3a', rev_id=b'rev3a')
 
575
        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
 
576
            branch_c.base, base_revision_id=b'rev2a')
579
577
        revision = md.install_revisions(tree_b.branch.repository)
580
578
 
581
579
    def test_handle_target_not_a_branch(self):
582
580
        tree_a, tree_b, branch_c = self.make_trees()
583
581
        branch_c.pull(tree_a.branch)
584
 
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
585
 
        tree_a.commit('rev3a', rev_id='rev3a')
586
 
        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
587
 
            branch_c.base, base_revision_id='rev2a')
 
582
        self.build_tree_contents([('tree_a/file', b'content_q\ncontent_r\n')])
 
583
        tree_a.commit('rev3a', rev_id=b'rev3a')
 
584
        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
 
585
            branch_c.base, base_revision_id=b'rev2a')
588
586
        md.target_branch = self.get_url('not-a-branch')
589
587
        self.assertRaises(errors.TargetNotBranch, md.install_revisions,
590
588
                tree_b.branch.repository)
604
602
        if base_revision_id is not None:
605
603
            raise tests.TestNotApplicable('This format does not support'
606
604
                                          ' explicit bases.')
607
 
        repository.lock_write()
608
 
        try:
609
 
            return merge_directive.MergeDirective.from_objects( repository,
 
605
        with repository.lock_write():
 
606
            return merge_directive.MergeDirective.from_objects(repository,
610
607
                revision_id, time, timezone, target_branch, patch_type,
611
608
                local_target_branch, public_branch, message)
612
 
        finally:
613
 
            repository.unlock()
614
609
 
615
610
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
616
611
                 target_branch, patch=None, patch_type=None,
641
636
 
642
637
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
643
638
                 target_branch, patch=None, patch_type=None,
644
 
                 source_branch=None, message=None, base_revision_id='null:'):
 
639
                 source_branch=None, message=None, base_revision_id=b'null:'):
645
640
        if patch_type == 'bundle':
646
641
            bundle = patch
647
642
            patch = None
653
648
 
654
649
    def test_base_revision(self):
655
650
        tree_a, tree_b, branch_c = self.make_trees()
656
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
 
651
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
657
652
            tree_b.branch.base, patch_type='bundle',
658
653
            public_branch=tree_a.branch.base, base_revision_id=None)
659
 
        self.assertEqual('rev1', md.base_revision_id)
660
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
 
654
        self.assertEqual(b'rev1', md.base_revision_id)
 
655
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
661
656
            tree_b.branch.base, patch_type='bundle',
662
 
            public_branch=tree_a.branch.base, base_revision_id='null:')
663
 
        self.assertEqual('null:', md.base_revision_id)
 
657
            public_branch=tree_a.branch.base, base_revision_id=b'null:')
 
658
        self.assertEqual(b'null:', md.base_revision_id)
664
659
        lines = md.to_lines()
665
660
        md2 = merge_directive.MergeDirective.from_lines(lines)
666
661
        self.assertEqual(md2.base_revision_id, md.base_revision_id)
667
662
 
668
663
    def test_patch_verification(self):
669
664
        tree_a, tree_b, branch_c = self.make_trees()
670
 
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
 
665
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
671
666
            tree_b.branch.base, patch_type='bundle',
672
667
            public_branch=tree_a.branch.base)
673
668
        lines = md.to_lines()
674
669
        md2 = merge_directive.MergeDirective.from_lines(lines)
675
670
        md2._verify_patch(tree_a.branch.repository)
676
671
        # Strip trailing whitespace
677
 
        md2.patch = md2.patch.replace(' \n', '\n')
 
672
        md2.patch = md2.patch.replace(b' \n', b'\n')
678
673
        md2._verify_patch(tree_a.branch.repository)
679
674
        # Convert to Mac line-endings
680
 
        md2.patch = re.sub('(\r\n|\r|\n)', '\r', md2.patch)
 
675
        md2.patch = re.sub(b'(\r\n|\r|\n)', b'\r', md2.patch)
681
676
        self.assertTrue(md2._verify_patch(tree_a.branch.repository))
682
677
        # Convert to DOS line-endings
683
 
        md2.patch = re.sub('(\r\n|\r|\n)', '\r\n', md2.patch)
 
678
        md2.patch = re.sub(b'(\r\n|\r|\n)', b'\r\n', md2.patch)
684
679
        self.assertTrue(md2._verify_patch(tree_a.branch.repository))
685
 
        md2.patch = md2.patch.replace('content_c', 'content_d')
 
680
        md2.patch = md2.patch.replace(b'content_c', b'content_d')
686
681
        self.assertFalse(md2._verify_patch(tree_a.branch.repository))
687
682
 
688
683
 
690
685
 
691
686
    def test_parse_old_merge_directive(self):
692
687
        md = merge_directive.MergeDirective.from_lines(INPUT1_2_OLD)
693
 
        self.assertEqual('example:', md.revision_id)
694
 
        self.assertEqual('sha', md.testament_sha1)
 
688
        self.assertEqual(b'example:', md.revision_id)
 
689
        self.assertEqual(b'sha', md.testament_sha1)
695
690
        self.assertEqual('http://example.com', md.target_branch)
696
691
        self.assertEqual('http://example.org', md.source_branch)
697
692
        self.assertEqual(453, md.time)
698
693
        self.assertEqual(120, md.timezone)
699
 
        self.assertEqual('booga', md.patch)
 
694
        self.assertEqual(b'booga', md.patch)
700
695
        self.assertEqual('diff', md.patch_type)
701
696
        self.assertEqual('Hi mom!', md.message)
702
697
 
736
731
        tree = self.make_branch_and_tree('foo')
737
732
        tree.commit('foo')
738
733
        directive = merge_directive.MergeDirective2(
739
 
            tree.branch.last_revision(), 'sha', 0, 0, 'sha',
 
734
            tree.branch.last_revision(), b'sha', 0, 0, b'sha',
740
735
            source_branch=tree.branch.base,
741
736
            base_revision_id=tree.branch.last_revision(),
742
737
            message='This code rox')