/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: 2018-02-18 21:42:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6859.
  • Revision ID: jelmer@jelmer.uk-20180218214257-jpevutp1wa30tz3v
Update TODO to reference Breezy, not Bazaar.

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,
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>')
 
356
        tree_a.branch.get_config_stack().set(
 
357
            'email', 'J. Random Hacker <jrandom@example.com>')
358
358
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_b\n'),
359
359
                                  ('tree_a/file_2', 'content_x\rcontent_y\r')])
360
360
        tree_a.add(['file', 'file_2'])
361
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()
 
362
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
 
363
        branch_c = tree_a.controldir.sprout('branch_c').open_branch()
364
364
        tree_b.commit('message', rev_id='rev2b')
365
365
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_c \n'),
366
366
                                  ('tree_a/file_2', 'content_x\rcontent_z\r')])
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
467
        md = self.make_merge_directive('example:', 'sha', time, timezone,
470
468
            'http://example.com', source_branch="http://example.org",
471
469
            patch='booga', patch_type='diff')