/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 bzrlib/tests/blackbox/test_merge_directive.py

  • Committer: Andrew Bennetts
  • Date: 2007-08-02 06:40:58 UTC
  • mfrom: (2666 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2668.
  • Revision ID: andrew.bennetts@canonical.com-20070802064058-09eblz1qbc01fcr3
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
19
19
 
20
20
from bzrlib import (
21
21
    gpg,
 
22
    merge_directive,
22
23
    tests,
23
24
    workingtree,
24
25
    )
25
26
 
26
27
 
27
 
EMAIL1 = """To: pqm@example.com
28
 
From: J. Random Hacker <jrandom@example.com>
 
28
EMAIL1 = """From: "J. Random Hacker" <jrandom@example.com>
29
29
Subject: bar
 
30
To: pqm@example.com
 
31
User-Agent: Bazaar \(.*\)
30
32
 
31
 
# Bazaar merge directive format 1
 
33
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
32
34
# revision_id: bar-id
33
35
# target_branch: ../tree2
34
36
# testament_sha1: .*
45
47
        self.tree1.branch.get_config().set_user_option('email',
46
48
            'J. Random Hacker <jrandom@example.com>')
47
49
        self.tree1.add('file')
48
 
        self.tree1.commit('foo')
 
50
        self.tree1.commit('foo', rev_id='foo-id')
49
51
        self.tree2 = self.tree1.bzrdir.sprout('tree2').open_workingtree()
50
52
        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\ne\n')])
51
53
        self.tree1.commit('bar', rev_id='bar-id')
58
60
        self.assertContainsRe(md_text, "\\+e")
59
61
        md_text = self.run_bzr('merge-directive -r -2 ../tree2')[0]
60
62
        self.assertNotContainsRe(md_text, "\\+e")
 
63
        md_text = self.run_bzr('merge-directive -r -1..-2 ../tree2')[0]
 
64
        md2 = merge_directive.MergeDirective.from_lines(
 
65
            md_text.splitlines(True))
 
66
        self.assertEqual('foo-id', md2.revision_id)
 
67
        self.assertEqual('bar-id', md2.base_revision_id)
61
68
 
62
69
    def test_submit_branch(self):
63
70
        self.prepare_merge_directive()
77
84
    def test_patch_types(self):
78
85
        self.prepare_merge_directive()
79
86
        md_text = self.run_bzr('merge-directive ../tree2')[0]
80
 
        self.assertContainsRe(md_text, "Bazaar revision bundle")
 
87
        self.assertContainsRe(md_text, "# Begin bundle")
81
88
        self.assertContainsRe(md_text, "\\+e")
82
89
        md_text = self.run_bzr('merge-directive ../tree2 --diff .')[0]
83
 
        self.assertNotContainsRe(md_text, "Bazaar revision bundle")
 
90
        self.assertNotContainsRe(md_text, "# Begin bundle")
84
91
        self.assertContainsRe(md_text, "\\+e")
85
92
        md_text = self.run_bzr('merge-directive --plain')[0]
86
93
        self.assertNotContainsRe(md_text, "\\+e")