← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge_directive.py

  • Committer: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
import os
 
18
import smtplib
 
19
 
 
20
from bzrlib import (
 
21
    gpg,
 
22
    tests,
 
23
    workingtree,
 
24
    )
 
25
 
 
26
 
 
27
EMAIL1 = """To: pqm@example.com
 
28
From: J. Random Hacker <jrandom@example.com>
 
29
Subject: bar
 
30
 
 
31
# Bazaar merge directive format 1
 
32
# revision_id: bar-id
 
33
# target_branch: ../tree2
 
34
# testament_sha1: .*
 
35
# timestamp: .*
 
36
# source_branch: .
 
37
#"""
 
38
 
 
39
 
 
40
class TestMergeDirective(tests.TestCaseWithTransport):
 
41
 
 
42
    def prepare_merge_directive(self):
 
43
        self.tree1 = self.make_branch_and_tree('tree1')
 
44
        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\n')])
 
45
        self.tree1.branch.get_config().set_user_option('email',
 
46
            'J. Random Hacker <jrandom@example.com>')
 
47
        self.tree1.add('file')
 
48
        self.tree1.commit('foo')
 
49
        self.tree2 = self.tree1.bzrdir.sprout('tree2').open_workingtree()
 
50
        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\ne\n')])
 
51
        self.tree1.commit('bar', rev_id='bar-id')
 
52
        os.chdir('tree1')
 
53
        return self.tree1, self.tree2
 
54
 
 
55
    def test_merge_directive(self):
 
56
        self.prepare_merge_directive()
 
57
        md_text = self.run_bzr('merge-directive', '../tree2')[0]
 
58
        self.assertContainsRe(md_text, "\\+e")
 
59
        md_text = self.run_bzr('merge-directive', '-r', '-2', '../tree2')[0]
 
60
        self.assertNotContainsRe(md_text, "\\+e")
 
61
 
 
62
    def test_submit_branch(self):
 
63
        self.prepare_merge_directive()
 
64
        self.run_bzr_error(('No submit branch',), 'merge-directive', retcode=3)
 
65
        self.run_bzr('merge-directive', '../tree2')
 
66
 
 
67
    def test_public_branch(self):
 
68
        self.prepare_merge_directive()
 
69
        self.run_bzr_error(('No public branch',), 'merge-directive', '--diff',
 
70
                           '../tree2', retcode=3)
 
71
        md_text = self.run_bzr('merge-directive', '../tree2')[0]
 
72
        self.assertNotContainsRe(md_text, 'source_branch:')
 
73
        self.run_bzr('merge-directive', '--diff', '../tree2', '.')
 
74
        self.run_bzr('merge-directive', '--diff')[0]
 
75
        self.assertNotContainsRe(md_text, 'source_branch:')
 
76
 
 
77
    def test_patch_types(self):
 
78
        self.prepare_merge_directive()
 
79
        md_text = self.run_bzr('merge-directive', '../tree2')[0]
 
80
        self.assertContainsRe(md_text, "Bazaar revision bundle")
 
81
        self.assertContainsRe(md_text, "\\+e")
 
82
        md_text = self.run_bzr('merge-directive', '../tree2', '--diff', '.')[0]
 
83
        self.assertNotContainsRe(md_text, "Bazaar revision bundle")
 
84
        self.assertContainsRe(md_text, "\\+e")
 
85
        md_text = self.run_bzr('merge-directive', '--plain')[0]
 
86
        self.assertNotContainsRe(md_text, "\\+e")
 
87
 
 
88
    def test_message(self):
 
89
        self.prepare_merge_directive()
 
90
        md_text = self.run_bzr('merge-directive', '../tree2')[0]
 
91
        self.assertNotContainsRe(md_text, 'message: Message for merge')
 
92
        md_text = self.run_bzr('merge-directive', '-m', 'Message for merge')[0]
 
93
        self.assertContainsRe(md_text, 'message: Message for merge')
 
94
 
 
95
    def test_signing(self):
 
96
        self.prepare_merge_directive()
 
97
        old_strategy = gpg.GPGStrategy
 
98
        gpg.GPGStrategy = gpg.LoopbackGPGStrategy
 
99
        try:
 
100
            md_text = self.run_bzr('merge-directive', '--sign', '../tree2')[0]
 
101
        finally:
 
102
            gpg.GPGStrategy = old_strategy
 
103
        self.assertContainsRe(md_text, '^-----BEGIN PSEUDO-SIGNED CONTENT')
 
104
 
 
105
    def run_bzr_fakemail(self, *args, **kwargs):
 
106
        sendmail_calls = []
 
107
        def sendmail(self, from_, to, message):
 
108
            sendmail_calls.append((self, from_, to, message))
 
109
        connect_calls = []
 
110
        def connect(self, host='localhost', port=0):
 
111
            connect_calls.append((self, host, port))
 
112
        def starttls(self):
 
113
            pass
 
114
        old_sendmail = smtplib.SMTP.sendmail
 
115
        smtplib.SMTP.sendmail = sendmail
 
116
        old_connect = smtplib.SMTP.connect
 
117
        smtplib.SMTP.connect = connect
 
118
        old_starttls = smtplib.SMTP.starttls
 
119
        smtplib.SMTP.starttls = starttls
 
120
        try:
 
121
            result = self.run_bzr(*args, **kwargs)
 
122
        finally:
 
123
            smtplib.SMTP.sendmail = old_sendmail
 
124
            smtplib.SMTP.connect = old_connect
 
125
            smtplib.SMTP.starttls = old_starttls
 
126
        return result + (connect_calls, sendmail_calls)
 
127
 
 
128
    def test_mail_default(self):
 
129
        tree1, tree2 = self.prepare_merge_directive()
 
130
        md_text, errr, connect_calls, sendmail_calls =\
 
131
            self.run_bzr_fakemail('merge-directive', '--mail-to',
 
132
                                  'pqm@example.com', '--plain', '../tree2',
 
133
                                  '.')
 
134
        self.assertEqual('', md_text)
 
135
        self.assertEqual(1, len(connect_calls))
 
136
        call = connect_calls[0]
 
137
        self.assertEqual(('localhost', 0), call[1:3])
 
138
        self.assertEqual(1, len(sendmail_calls))
 
139
        call = sendmail_calls[0]
 
140
        self.assertEqual(('jrandom@example.com', ['pqm@example.com']),
 
141
                call[1:3])
 
142
        self.assertContainsRe(call[3], EMAIL1)
 
143
 
 
144
    def test_pull_raw(self):
 
145
        self.prepare_merge_directive()
 
146
        self.tree1.commit('baz', rev_id='baz-id')
 
147
        md_text = self.run_bzr('merge-directive', self.tree2.basedir,
 
148
                               '-r', '2', self.tree1.basedir, '--plain')[0]
 
149
        self.build_tree_contents([('../directive', md_text)])
 
150
        os.chdir('../tree2')
 
151
        self.run_bzr('pull', '../directive')
 
152
        wt = workingtree.WorkingTree.open('.')
 
153
        self.assertEqual('bar-id', wt.last_revision())
 
154
 
 
155
    def test_pull_user_r(self):
 
156
        """If the user supplies -r, an error is emitted"""
 
157
        self.prepare_merge_directive()
 
158
        self.tree1.commit('baz', rev_id='baz-id')
 
159
        md_text = self.run_bzr('merge-directive', self.tree2.basedir,
 
160
                               self.tree1.basedir, '--plain')[0]
 
161
        self.build_tree_contents([('../directive', md_text)])
 
162
        os.chdir('../tree2')
 
163
        self.run_bzr_error(
 
164
            ('Cannot use -r with merge directives or bundles',),
 
165
            'pull', '-r', '2', '../directive')
 
166
 
 
167
    def test_pull_bundle(self):
 
168
        self.prepare_merge_directive()
 
169
        self.tree1.commit('baz', rev_id='baz-id')
 
170
        md_text = self.run_bzr('merge-directive', self.tree2.basedir,
 
171
                               '-r', '2', '/dev/null', '--bundle')[0]
 
172
        self.build_tree_contents([('../directive', md_text)])
 
173
        os.chdir('../tree2')
 
174
        self.run_bzr('pull', '../directive')
 
175
        wt = workingtree.WorkingTree.open('.')
 
176
        self.assertEqual('bar-id', wt.last_revision())
 
177
 
 
178
    def test_merge_raw(self):
 
179
        self.prepare_merge_directive()
 
180
        self.tree1.commit('baz', rev_id='baz-id')
 
181
        md_text = self.run_bzr('merge-directive', self.tree2.basedir,
 
182
                               '-r', '2', self.tree1.basedir, '--plain')[0]
 
183
        self.build_tree_contents([('../directive', md_text)])
 
184
        os.chdir('../tree2')
 
185
        self.run_bzr('merge', '../directive')
 
186
        wt = workingtree.WorkingTree.open('.')
 
187
        self.assertEqual('bar-id', wt.get_parent_ids()[1])
 
188
 
 
189
    def test_merge_user_r(self):
 
190
        """If the user supplies -r, an error is emitted"""
 
191
        self.prepare_merge_directive()
 
192
        self.tree1.commit('baz', rev_id='baz-id')
 
193
        md_text = self.run_bzr('merge-directive', self.tree2.basedir,
 
194
                               self.tree1.basedir, '--plain')[0]
 
195
        self.build_tree_contents([('../directive', md_text)])
 
196
        os.chdir('../tree2')
 
197
        self.run_bzr_error(
 
198
            ('Cannot use -r with merge directives or bundles',),
 
199
            'merge', '-r', '2', '../directive')
 
200
 
 
201
    def test_merge_bundle(self):
 
202
        self.prepare_merge_directive()
 
203
        self.tree1.commit('baz', rev_id='baz-id')
 
204
        md_text = self.run_bzr('merge-directive', self.tree2.basedir,
 
205
                               '-r', '2', '/dev/null', '--bundle')[0]
 
206
        self.build_tree_contents([('../directive', md_text)])
 
207
        os.chdir('../tree2')
 
208
        self.run_bzr('merge', '../directive')
 
209
        wt = workingtree.WorkingTree.open('.')
 
210
        self.assertEqual('bar-id', wt.get_parent_ids()[1])
 
211
 
 
212
    def test_mail_uses_config(self):
 
213
        tree1, tree2 = self.prepare_merge_directive()
 
214
        tree1.branch.get_config().set_user_option('smtp_server', 'bogushost')
 
215
        md_text, errr, connect_calls, sendmail_calls =\
 
216
            self.run_bzr_fakemail('merge-directive', '--mail-to',
 
217
                                  'pqm@example.com', '--plain', '../tree2',
 
218
                                  '.')
 
219
        call = connect_calls[0]
 
220
        self.assertEqual(('bogushost', 0), call[1:3])
 
221
 
 
222
    def test_no_common_ancestor(self):
 
223
        foo = self.make_branch_and_tree('foo')
 
224
        foo.commit('rev1')
 
225
        bar = self.make_branch_and_tree('bar')
 
226
        os.chdir('foo')
 
227
        self.run_bzr('merge-directive', '../bar')
 
228
 
 
229
    def test_no_commits(self):
 
230
        foo = self.make_branch_and_tree('foo')
 
231
        bar = self.make_branch_and_tree('bar')
 
232
        os.chdir('foo')
 
233
        self.run_bzr_error(('No revisions to bundle.', ),
 
234
                            'merge-directive', '../bar')
 
235
 
 
236
    def test_encoding_exact(self):
 
237
        tree1, tree2 = self.prepare_merge_directive()
 
238
        tree1.commit(u'messag\xe9')
 
239
        self.run_bzr('merge-directive', '../tree2') # no exception raised