/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/blackbox/test_pull.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_pull.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
"""Black-box tests for bzr pull."""
 
18
"""Black-box tests for brz pull."""
19
19
 
20
20
import os
21
21
import sys
22
22
 
23
 
from bzrlib import (
 
23
from breezy import (
 
24
    branch,
24
25
    debug,
 
26
    osutils,
 
27
    tests,
 
28
    uncommit,
 
29
    urlutils,
 
30
    workingtree,
 
31
    )
 
32
from breezy.bzr import (
25
33
    remote,
26
 
    urlutils,
27
 
    )
28
 
 
29
 
from bzrlib.branch import Branch
30
 
from bzrlib.directory_service import directories
31
 
from bzrlib.osutils import pathjoin
32
 
from bzrlib.tests.blackbox import ExternalBase
33
 
from bzrlib.uncommit import uncommit
34
 
from bzrlib.workingtree import WorkingTree
35
 
 
36
 
 
37
 
class TestPull(ExternalBase):
 
34
    )
 
35
 
 
36
from breezy.directory_service import directories
 
37
from breezy.tests import (
 
38
    fixtures,
 
39
    script,
 
40
    )
 
41
 
 
42
 
 
43
class TestPull(tests.TestCaseWithTransport):
38
44
 
39
45
    def example_branch(self, path='.'):
40
46
        tree = self.make_branch_and_tree(path)
41
47
        self.build_tree_contents([
42
 
            (pathjoin(path, 'hello'),   'foo'),
43
 
            (pathjoin(path, 'goodbye'), 'baz')])
 
48
            (osutils.pathjoin(path, 'hello'),   b'foo'),
 
49
            (osutils.pathjoin(path, 'goodbye'), b'baz')])
44
50
        tree.add('hello')
45
51
        tree.commit(message='setup')
46
52
        tree.add('goodbye')
50
56
    def test_pull(self):
51
57
        """Pull changes from one branch to another."""
52
58
        a_tree = self.example_branch('a')
53
 
        os.chdir('a')
54
 
        self.run_bzr('pull', retcode=3)
55
 
        self.run_bzr('missing', retcode=3)
56
 
        self.run_bzr('missing .')
57
 
        self.run_bzr('missing')
 
59
        base_rev = a_tree.branch.last_revision()
 
60
        self.run_bzr('pull', retcode=3, working_dir='a')
 
61
        self.run_bzr('missing', retcode=3, working_dir='a')
 
62
        self.run_bzr('missing .', working_dir='a')
 
63
        self.run_bzr('missing', working_dir='a')
58
64
        # this will work on windows because we check for the same branch
59
65
        # in pull - if it fails, it is a regression
60
 
        self.run_bzr('pull')
61
 
        self.run_bzr('pull /', retcode=3)
 
66
        self.run_bzr('pull', working_dir='a')
 
67
        self.run_bzr('pull /', retcode=3, working_dir='a')
62
68
        if sys.platform not in ('win32', 'cygwin'):
63
 
            self.run_bzr('pull')
 
69
            self.run_bzr('pull', working_dir='a')
64
70
 
65
 
        os.chdir('..')
66
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
67
 
        os.chdir('b')
68
 
        self.run_bzr('pull')
69
 
        os.mkdir('subdir')
 
71
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
 
72
        self.run_bzr('pull', working_dir='b')
 
73
        os.mkdir('b/subdir')
70
74
        b_tree.add('subdir')
71
 
        b_tree.commit(message='blah', allow_pointless=True)
72
 
 
73
 
        os.chdir('..')
74
 
        a = Branch.open('a')
75
 
        b = Branch.open('b')
76
 
        self.assertEqual(a.revision_history(), b.revision_history()[:-1])
77
 
 
78
 
        os.chdir('a')
79
 
        self.run_bzr('pull ../b')
80
 
        self.assertEqual(a.revision_history(), b.revision_history())
 
75
        new_rev = b_tree.commit(message='blah', allow_pointless=True)
 
76
 
 
77
        a = branch.Branch.open('a')
 
78
        b = branch.Branch.open('b')
 
79
        self.assertEqual(a.last_revision(), base_rev)
 
80
        self.assertEqual(b.last_revision(), new_rev)
 
81
 
 
82
        self.run_bzr('pull ../b', working_dir='a')
 
83
        self.assertEqual(a.last_revision(), b.last_revision())
81
84
        a_tree.commit(message='blah2', allow_pointless=True)
82
85
        b_tree.commit(message='blah3', allow_pointless=True)
83
86
        # no overwrite
84
 
        os.chdir('../b')
85
 
        self.run_bzr('pull ../a', retcode=3)
86
 
        os.chdir('..')
87
 
        b_tree.bzrdir.sprout('overwriteme')
88
 
        os.chdir('overwriteme')
89
 
        self.run_bzr('pull --overwrite ../a')
90
 
        overwritten = Branch.open('.')
91
 
        self.assertEqual(overwritten.revision_history(),
92
 
                         a.revision_history())
 
87
        self.run_bzr('pull ../a', retcode=3, working_dir='b')
 
88
        b_tree.controldir.sprout('overwriteme')
 
89
        self.run_bzr('pull --overwrite ../a', working_dir='overwriteme')
 
90
        overwritten = branch.Branch.open('overwriteme')
 
91
        self.assertEqual(overwritten.last_revision(),
 
92
                         a.last_revision())
93
93
        a_tree.merge_from_branch(b_tree.branch)
94
94
        a_tree.commit(message="blah4", allow_pointless=True)
95
 
        os.chdir('../b/subdir')
96
 
        self.run_bzr('pull ../../a')
97
 
        self.assertEqual(a.revision_history()[-1], b.revision_history()[-1])
98
 
        sub_tree = WorkingTree.open_containing('.')[0]
 
95
 
 
96
        self.run_bzr('pull ../../a', working_dir='b/subdir')
 
97
        self.assertEqual(a.last_revision(), b.last_revision())
 
98
        sub_tree = workingtree.WorkingTree.open_containing('b/subdir')[0]
99
99
        sub_tree.commit(message="blah5", allow_pointless=True)
100
100
        sub_tree.commit(message="blah6", allow_pointless=True)
101
 
        os.chdir('..')
102
 
        self.run_bzr('pull ../a')
103
 
        os.chdir('../a')
 
101
        self.run_bzr('pull ../a', working_dir='b')
104
102
        a_tree.commit(message="blah7", allow_pointless=True)
105
103
        a_tree.merge_from_branch(b_tree.branch)
106
104
        a_tree.commit(message="blah8", allow_pointless=True)
107
 
        self.run_bzr('pull ../b')
108
 
        self.run_bzr('pull ../b')
 
105
        self.run_bzr('pull ../b', working_dir='a')
 
106
        self.run_bzr('pull ../b', working_dir='a')
109
107
 
110
108
    def test_pull_dash_d(self):
111
109
        self.example_branch('a')
122
120
        """Pull some changes from one branch to another."""
123
121
        a_tree = self.example_branch('a')
124
122
        self.build_tree_contents([
125
 
            ('a/hello2',   'foo'),
126
 
            ('a/goodbye2', 'baz')])
 
123
            ('a/hello2',   b'foo'),
 
124
            ('a/goodbye2', b'baz')])
127
125
        a_tree.add('hello2')
128
126
        a_tree.commit(message="setup")
129
127
        a_tree.add('goodbye2')
130
128
        a_tree.commit(message="setup")
131
129
 
132
 
        b_tree = a_tree.bzrdir.sprout('b',
133
 
                   revision_id=a_tree.branch.get_rev_id(1)).open_workingtree()
134
 
        os.chdir('b')
135
 
        self.run_bzr('pull -r 2')
136
 
        a = Branch.open('../a')
137
 
        b = Branch.open('.')
138
 
        self.assertEqual(a.revno(),4)
139
 
        self.assertEqual(b.revno(),2)
140
 
        self.run_bzr('pull -r 3')
141
 
        self.assertEqual(b.revno(),3)
142
 
        self.run_bzr('pull -r 4')
143
 
        self.assertEqual(a.revision_history(), b.revision_history())
 
130
        b_tree = a_tree.controldir.sprout(
 
131
                'b', revision_id=a_tree.branch.get_rev_id(1)).open_workingtree()
 
132
        self.run_bzr('pull -r 2', working_dir='b')
 
133
        a = branch.Branch.open('a')
 
134
        b = branch.Branch.open('b')
 
135
        self.assertEqual(a.revno(), 4)
 
136
        self.assertEqual(b.revno(), 2)
 
137
        self.run_bzr('pull -r 3', working_dir='b')
 
138
        self.assertEqual(b.revno(), 3)
 
139
        self.run_bzr('pull -r 4', working_dir='b')
 
140
        self.assertEqual(a.last_revision(), b.last_revision())
144
141
 
 
142
    def test_pull_tags(self):
 
143
        """Tags are updated by pull, and revisions named in those tags are
 
144
        fetched.
 
145
        """
 
146
        # Make a source, sprout a target off it
 
147
        builder = self.make_branch_builder('source')
 
148
        source, rev1, rev2 = fixtures.build_branch_with_non_ancestral_rev(builder)
 
149
        source.get_config_stack().set('branch.fetch_tags', True)
 
150
        target_bzrdir = source.controldir.sprout('target')
 
151
        source.tags.set_tag('tag-a', rev2)
 
152
        # Pull from source
 
153
        self.run_bzr('pull -d target source')
 
154
        target = target_bzrdir.open_branch()
 
155
        # The tag is present, and so is its revision.
 
156
        self.assertEqual(rev2, target.tags.lookup_tag('tag-a'))
 
157
        target.repository.get_revision(rev2)
145
158
 
146
159
    def test_overwrite_uptodate(self):
147
160
        # Make sure pull --overwrite overwrites
148
161
        # even if the target branch has merged
149
162
        # everything already.
150
163
        a_tree = self.make_branch_and_tree('a')
151
 
        self.build_tree_contents([('a/foo', 'original\n')])
 
164
        self.build_tree_contents([('a/foo', b'original\n')])
152
165
        a_tree.add('foo')
153
166
        a_tree.commit(message='initial commit')
154
167
 
155
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
168
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
156
169
 
157
 
        self.build_tree_contents([('a/foo', 'changed\n')])
 
170
        self.build_tree_contents([('a/foo', b'changed\n')])
158
171
        a_tree.commit(message='later change')
159
172
 
160
 
        self.build_tree_contents([('a/foo', 'a third change')])
 
173
        self.build_tree_contents([('a/foo', b'a third change')])
161
174
        a_tree.commit(message='a third change')
162
175
 
163
 
        rev_history_a = a_tree.branch.revision_history()
164
 
        self.assertEqual(len(rev_history_a), 3)
 
176
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
165
177
 
166
178
        b_tree.merge_from_branch(a_tree.branch)
167
179
        b_tree.commit(message='merge')
168
180
 
169
 
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
170
 
 
171
 
        os.chdir('b')
172
 
        self.run_bzr('pull --overwrite ../a')
173
 
        rev_history_b = b_tree.branch.revision_history()
174
 
        self.assertEqual(len(rev_history_b), 3)
175
 
 
176
 
        self.assertEqual(rev_history_b, rev_history_a)
 
181
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
 
182
 
 
183
        self.run_bzr('pull --overwrite ../a', working_dir='b')
 
184
        (last_revinfo_b) = b_tree.branch.last_revision_info()
 
185
        self.assertEqual(last_revinfo_b[0], 3)
 
186
        self.assertEqual(last_revinfo_b[1], a_tree.branch.last_revision())
177
187
 
178
188
    def test_overwrite_children(self):
179
189
        # Make sure pull --overwrite sets the revision-history
180
190
        # to be identical to the pull source, even if we have convergence
181
191
        a_tree = self.make_branch_and_tree('a')
182
 
        self.build_tree_contents([('a/foo', 'original\n')])
 
192
        self.build_tree_contents([('a/foo', b'original\n')])
183
193
        a_tree.add('foo')
184
194
        a_tree.commit(message='initial commit')
185
195
 
186
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
196
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
187
197
 
188
 
        self.build_tree_contents([('a/foo', 'changed\n')])
 
198
        self.build_tree_contents([('a/foo', b'changed\n')])
189
199
        a_tree.commit(message='later change')
190
200
 
191
 
        self.build_tree_contents([('a/foo', 'a third change')])
 
201
        self.build_tree_contents([('a/foo', b'a third change')])
192
202
        a_tree.commit(message='a third change')
193
203
 
194
 
        self.assertEqual(len(a_tree.branch.revision_history()), 3)
 
204
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
195
205
 
196
206
        b_tree.merge_from_branch(a_tree.branch)
197
207
        b_tree.commit(message='merge')
198
208
 
199
 
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
 
209
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
200
210
 
201
 
        self.build_tree_contents([('a/foo', 'a fourth change\n')])
 
211
        self.build_tree_contents([('a/foo', b'a fourth change\n')])
202
212
        a_tree.commit(message='a fourth change')
203
213
 
204
 
        rev_history_a = a_tree.branch.revision_history()
205
 
        self.assertEqual(len(rev_history_a), 4)
 
214
        rev_info_a = a_tree.branch.last_revision_info()
 
215
        self.assertEqual(rev_info_a[0], 4)
206
216
 
207
217
        # With convergence, we could just pull over the
208
218
        # new change, but with --overwrite, we want to switch our history
209
 
        os.chdir('b')
210
 
        self.run_bzr('pull --overwrite ../a')
211
 
        rev_history_b = b_tree.branch.revision_history()
212
 
        self.assertEqual(len(rev_history_b), 4)
213
 
 
214
 
        self.assertEqual(rev_history_b, rev_history_a)
 
219
        self.run_bzr('pull --overwrite ../a', working_dir='b')
 
220
        rev_info_b = b_tree.branch.last_revision_info()
 
221
        self.assertEqual(rev_info_b[0], 4)
 
222
        self.assertEqual(rev_info_b, rev_info_a)
215
223
 
216
224
    def test_pull_remember(self):
217
225
        """Pull changes from one branch to another and test parent location."""
218
 
        transport = self.get_transport()
 
226
        t = self.get_transport()
219
227
        tree_a = self.make_branch_and_tree('branch_a')
220
228
        branch_a = tree_a.branch
221
229
        self.build_tree(['branch_a/a'])
222
230
        tree_a.add('a')
223
231
        tree_a.commit('commit a')
224
 
        tree_b = branch_a.bzrdir.sprout('branch_b').open_workingtree()
 
232
        tree_b = branch_a.controldir.sprout('branch_b').open_workingtree()
225
233
        branch_b = tree_b.branch
226
 
        tree_c = branch_a.bzrdir.sprout('branch_c').open_workingtree()
 
234
        tree_c = branch_a.controldir.sprout('branch_c').open_workingtree()
227
235
        branch_c = tree_c.branch
228
236
        self.build_tree(['branch_a/b'])
229
237
        tree_a.add('b')
230
238
        tree_a.commit('commit b')
231
239
        # reset parent
232
240
        parent = branch_b.get_parent()
 
241
        branch_b = branch.Branch.open('branch_b')
233
242
        branch_b.set_parent(None)
234
243
        self.assertEqual(None, branch_b.get_parent())
235
244
        # test pull for failure without parent set
236
 
        os.chdir('branch_b')
237
 
        out = self.run_bzr('pull', retcode=3)
 
245
        out = self.run_bzr('pull', retcode=3, working_dir='branch_b')
238
246
        self.assertEqual(out,
239
 
                ('','bzr: ERROR: No pull location known or specified.\n'))
 
247
                ('', 'brz: ERROR: No pull location known or specified.\n'))
240
248
        # test implicit --remember when no parent set, this pull conflicts
241
 
        self.build_tree(['d'])
 
249
        self.build_tree(['branch_b/d'])
242
250
        tree_b.add('d')
243
251
        tree_b.commit('commit d')
244
 
        out = self.run_bzr('pull ../branch_a', retcode=3)
 
252
        out = self.run_bzr('pull ../branch_a', retcode=3,
 
253
                           working_dir='branch_b')
245
254
        self.assertEqual(out,
246
 
                ('','bzr: ERROR: These branches have diverged.'
 
255
                ('', 'brz: ERROR: These branches have diverged.'
247
256
                    ' Use the missing command to see how.\n'
248
257
                    'Use the merge command to reconcile them.\n'))
249
 
        self.assertEqual(branch_b.get_parent(), parent)
 
258
        tree_b = tree_b.controldir.open_workingtree()
 
259
        branch_b = tree_b.branch
 
260
        self.assertEqual(parent, branch_b.get_parent())
250
261
        # test implicit --remember after resolving previous failure
251
 
        uncommit(branch=branch_b, tree=tree_b)
252
 
        transport.delete('branch_b/d')
253
 
        self.run_bzr('pull')
 
262
        uncommit.uncommit(branch=branch_b, tree=tree_b)
 
263
        t.delete('branch_b/d')
 
264
        self.run_bzr('pull', working_dir='branch_b')
 
265
        # Refresh the branch object as 'pull' modified it
 
266
        branch_b = branch_b.controldir.open_branch()
254
267
        self.assertEqual(branch_b.get_parent(), parent)
255
268
        # test explicit --remember
256
 
        self.run_bzr('pull ../branch_c --remember')
257
 
        self.assertEqual(branch_b.get_parent(),
258
 
                          branch_c.bzrdir.root_transport.base)
 
269
        self.run_bzr('pull ../branch_c --remember', working_dir='branch_b')
 
270
        # Refresh the branch object as 'pull' modified it
 
271
        branch_b = branch_b.controldir.open_branch()
 
272
        self.assertEqual(branch_c.controldir.root_transport.base,
 
273
                         branch_b.get_parent())
259
274
 
260
275
    def test_pull_bundle(self):
261
 
        from bzrlib.testament import Testament
 
276
        from breezy.testament import Testament
262
277
        # Build up 2 trees and prepare for a pull
263
278
        tree_a = self.make_branch_and_tree('branch_a')
264
 
        f = open('branch_a/a', 'wb')
265
 
        f.write('hello')
266
 
        f.close()
 
279
        with open('branch_a/a', 'wb') as f:
 
280
            f.write(b'hello')
267
281
        tree_a.add('a')
268
282
        tree_a.commit('message')
269
283
 
270
 
        tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
 
284
        tree_b = tree_a.controldir.sprout('branch_b').open_workingtree()
271
285
 
272
286
        # Make a change to 'a' that 'b' can pull
273
 
        f = open('branch_a/a', 'wb')
274
 
        f.write('hey there')
275
 
        f.close()
 
287
        with open('branch_a/a', 'wb') as f:
 
288
            f.write(b'hey there')
276
289
        tree_a.commit('message')
277
290
 
278
291
        # Create the bundle for 'b' to pull
279
 
        os.chdir('branch_a')
280
 
        self.run_bzr('bundle ../branch_b -o ../bundle')
 
292
        self.run_bzr('bundle ../branch_b -o ../bundle', working_dir='branch_a')
281
293
 
282
 
        os.chdir('../branch_b')
283
 
        out, err = self.run_bzr('pull ../bundle')
 
294
        out, err = self.run_bzr('pull ../bundle', working_dir='branch_b')
284
295
        self.assertEqual(out,
285
296
                         'Now on revision 2.\n')
286
297
        self.assertEqual(err,
287
298
                ' M  a\nAll changes applied successfully.\n')
288
299
 
289
 
        self.assertEqualDiff(tree_a.branch.revision_history(),
290
 
                             tree_b.branch.revision_history())
 
300
        self.assertEqualDiff(tree_a.branch.last_revision(),
 
301
                             tree_b.branch.last_revision())
291
302
 
292
303
        testament_a = Testament.from_revision(tree_a.branch.repository,
293
304
                                              tree_a.get_parent_ids()[0])
297
308
                             testament_b.as_text())
298
309
 
299
310
        # it is legal to attempt to pull an already-merged bundle
300
 
        out, err = self.run_bzr('pull ../bundle')
 
311
        out, err = self.run_bzr('pull ../bundle', working_dir='branch_b')
301
312
        self.assertEqual(err, '')
302
 
        self.assertEqual(out, 'No revisions to pull.\n')
 
313
        self.assertEqual(out, 'No revisions or tags to pull.\n')
303
314
 
304
315
    def test_pull_verbose_no_files(self):
305
316
        """Pull --verbose should not list modified files"""
309
320
        tree_a.commit('bar')
310
321
        tree_b = self.make_branch_and_tree('tree_b')
311
322
        out = self.run_bzr('pull --verbose -d tree_b tree_a')[0]
312
 
        self.assertContainsRe(out, 'bar')
313
 
        self.assertNotContainsRe(out, 'added:')
314
 
        self.assertNotContainsRe(out, 'foo')
 
323
        self.assertContainsRe(out, b'bar')
 
324
        self.assertNotContainsRe(out, b'added:')
 
325
        self.assertNotContainsRe(out, b'foo')
315
326
 
316
327
    def test_pull_quiet(self):
317
 
        """Check that bzr pull --quiet does not print anything"""
 
328
        """Check that brz pull --quiet does not print anything"""
318
329
        tree_a = self.make_branch_and_tree('tree_a')
319
330
        self.build_tree(['tree_a/foo'])
320
331
        tree_a.add('foo')
321
332
        revision_id = tree_a.commit('bar')
322
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
333
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
323
334
        out, err = self.run_bzr('pull --quiet -d tree_b')
324
335
        self.assertEqual(out, '')
325
336
        self.assertEqual(err, '')
335
346
    def test_pull_from_directory_service(self):
336
347
        source = self.make_branch_and_tree('source')
337
348
        source.commit('commit 1')
338
 
        target = source.bzrdir.sprout('target').open_workingtree()
 
349
        target = source.controldir.sprout('target').open_workingtree()
339
350
        source_last = source.commit('commit 2')
340
351
        class FooService(object):
341
352
            """A directory service that always returns source"""
352
363
        target = self.make_branch_and_tree('target')
353
364
        out = self.run_bzr('pull -v source -d target')[0]
354
365
        self.assertContainsRe(out,
355
 
                              r'revno: 1\ncommitter: .*\nbranch nick: source')
356
 
        self.assertNotContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
 
366
                              br'revno: 1\ncommitter: .*\nbranch nick: source')
 
367
        self.assertNotContainsRe(out, br'\n {4}1 .*\n {6}setup\n')
357
368
 
358
369
    def test_pull_verbose_uses_default_log(self):
359
370
        tree = self.example_branch('source')
360
371
        target = self.make_branch_and_tree('target')
361
 
        target_config = target.branch.get_config()
362
 
        target_config.set_user_option('log_format', 'short')
 
372
        target.branch.get_config_stack().set('log_format', 'short')
363
373
        out = self.run_bzr('pull -v source -d target')[0]
364
 
        self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
 
374
        self.assertContainsRe(out, br'\n {4}1 .*\n {6}setup\n')
365
375
        self.assertNotContainsRe(
366
 
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
 
376
            out, br'revno: 1\ncommitter: .*\nbranch nick: source')
 
377
 
 
378
    def test_pull_smart_bound_branch(self):
 
379
        self.setup_smart_server_with_call_log()
 
380
        parent = self.make_branch_and_tree('parent')
 
381
        parent.commit(message='first commit')
 
382
        child = parent.controldir.sprout('child').open_workingtree()
 
383
        child.commit(message='second commit')
 
384
        checkout = parent.branch.create_checkout('checkout')
 
385
        self.run_bzr(['pull', self.get_url('child')], working_dir='checkout')
367
386
 
368
387
    def test_pull_smart_stacked_streaming_acceptance(self):
369
 
        """'bzr pull -r 123' works on stacked, smart branches, even when the
 
388
        """'brz pull -r 123' works on stacked, smart branches, even when the
370
389
        revision specified by the revno is only present in the fallback
371
390
        repository.
372
391
 
379
398
        parent = self.make_branch_and_tree('parent', format='1.9')
380
399
        parent.commit(message='first commit')
381
400
        parent.commit(message='second commit')
382
 
        local = parent.bzrdir.sprout('local').open_workingtree()
 
401
        local = parent.controldir.sprout('local').open_workingtree()
383
402
        local.commit(message='local commit')
384
403
        local.branch.create_clone_on_transport(
385
404
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
392
411
        # being too low. If rpc_count increases, more network roundtrips have
393
412
        # become necessary for this use case. Please do not adjust this number
394
413
        # upwards without agreement from bzr's network support maintainers.
395
 
        self.assertLength(18, self.hpss_calls)
396
 
        remote = Branch.open('stacked')
 
414
        self.assertLength(19, self.hpss_calls)
 
415
        self.assertLength(1, self.hpss_connections)
 
416
        remote = branch.Branch.open('stacked')
397
417
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
398
 
    
 
418
 
399
419
    def test_pull_cross_format_warning(self):
400
420
        """You get a warning for probably slow cross-format pulls.
401
421
        """
405
425
        from_tree.commit(message='first commit')
406
426
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
407
427
        self.assertContainsRe(err,
408
 
            "(?m)Doing on-the-fly conversion")
 
428
            b"(?m)Doing on-the-fly conversion")
409
429
 
410
430
    def test_pull_cross_format_warning_no_IDS(self):
411
431
        """You get a warning for probably slow cross-format pulls.
421
441
        from_tree.commit(message='first commit')
422
442
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
423
443
        self.assertContainsRe(err,
424
 
            "(?m)Doing on-the-fly conversion")
 
444
            b"(?m)Doing on-the-fly conversion")
425
445
 
426
446
    def test_pull_cross_format_from_network(self):
427
447
        self.setup_smart_server_with_call_log()
430
450
        self.assertIsInstance(from_tree.branch, remote.RemoteBranch)
431
451
        from_tree.commit(message='first commit')
432
452
        out, err = self.run_bzr(['pull', '-d', 'to',
433
 
            from_tree.branch.bzrdir.root_transport.base])
 
453
            from_tree.branch.controldir.root_transport.base])
434
454
        self.assertContainsRe(err,
435
 
            "(?m)Doing on-the-fly conversion")
 
455
            b"(?m)Doing on-the-fly conversion")
436
456
 
437
457
    def test_pull_to_experimental_format_warning(self):
438
458
        """You get a warning for pulling into experimental formats.
442
462
        from_tree.commit(message='first commit')
443
463
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
444
464
        self.assertContainsRe(err,
445
 
            "(?m)Fetching into experimental format")
 
465
            b"(?m)Fetching into experimental format")
446
466
 
447
467
    def test_pull_cross_to_experimental_format_warning(self):
448
468
        """You get a warning for pulling into experimental formats.
452
472
        from_tree.commit(message='first commit')
453
473
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
454
474
        self.assertContainsRe(err,
455
 
            "(?m)Fetching into experimental format")
 
475
            b"(?m)Fetching into experimental format")
 
476
 
 
477
    def test_pull_show_base(self):
 
478
        """brz pull supports --show-base
 
479
 
 
480
        see https://bugs.launchpad.net/bzr/+bug/202374"""
 
481
        # create two trees with conflicts, setup conflict, check that
 
482
        # conflicted file looks correct
 
483
        a_tree = self.example_branch('a')
 
484
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
 
485
 
 
486
        with open(osutils.pathjoin('a', 'hello'), 'wt') as f:
 
487
            f.write('fee')
 
488
        a_tree.commit('fee')
 
489
 
 
490
        with open(osutils.pathjoin('b', 'hello'), 'wt') as f:
 
491
            f.write('fie')
 
492
 
 
493
        out, err=self.run_bzr(['pull', '-d', 'b', 'a', '--show-base'])
 
494
 
 
495
        # check for message here
 
496
        self.assertEqual(
 
497
            err,
 
498
            ' M  hello\nText conflict in hello\n1 conflicts encountered.\n')
 
499
 
 
500
        self.assertEqualDiff('<<<<<<< TREE\n'
 
501
                             'fie||||||| BASE-REVISION\n'
 
502
                             'foo=======\n'
 
503
                             'fee>>>>>>> MERGE-SOURCE\n',
 
504
                             open(osutils.pathjoin('b', 'hello')).read())
 
505
 
 
506
    def test_pull_warns_about_show_base_when_no_working_tree(self):
 
507
        """--show-base is useless if there's no working tree
 
508
 
 
509
        see https://bugs.launchpad.net/bzr/+bug/1022160"""
 
510
        self.make_branch('from')
 
511
        self.make_branch('to')
 
512
        out = self.run_bzr(['pull', '-d', 'to', 'from', '--show-base'])
 
513
        self.assertEqual(out, ('No revisions or tags to pull.\n',
 
514
                               'No working tree, ignoring --show-base\n'))
 
515
 
 
516
    def test_pull_tag_conflicts(self):
 
517
        """pulling tags with conflicts will change the exit code"""
 
518
        # create a branch, see that --show-base fails
 
519
        from_tree = self.make_branch_and_tree('from')
 
520
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
521
        to_tree = self.make_branch_and_tree('to')
 
522
        to_tree.branch.tags.set_tag("mytag", "anotherrevid")
 
523
        out = self.run_bzr(['pull', '-d', 'to', 'from'], retcode=1)
 
524
        self.assertEqual(out,
 
525
            ('No revisions to pull.\nConflicting tags:\n    mytag\n', ''))
 
526
 
 
527
    def test_pull_tag_notification(self):
 
528
        """pulling tags with conflicts will change the exit code"""
 
529
        # create a branch, see that --show-base fails
 
530
        from_tree = self.make_branch_and_tree('from')
 
531
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
532
        to_tree = self.make_branch_and_tree('to')
 
533
        out = self.run_bzr(['pull', '-d', 'to', 'from'])
 
534
        self.assertEqual(out,
 
535
            ('1 tag(s) updated.\n', ''))
 
536
 
 
537
    def test_overwrite_tags(self):
 
538
        """--overwrite-tags only overwrites tags, not revisions."""
 
539
        from_tree = self.make_branch_and_tree('from')
 
540
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
541
        to_tree = self.make_branch_and_tree('to')
 
542
        to_tree.branch.tags.set_tag("mytag", "anotherrevid")
 
543
        revid1 = to_tree.commit('my commit')
 
544
        out = self.run_bzr(['pull', '-d', 'to', 'from'], retcode=1)
 
545
        self.assertEqual(out,
 
546
            ('No revisions to pull.\nConflicting tags:\n    mytag\n', ''))
 
547
        out = self.run_bzr(['pull', '-d', 'to', '--overwrite-tags', 'from'])
 
548
        self.assertEqual(out, ('1 tag(s) updated.\n', ''))
 
549
 
 
550
        self.assertEqual(to_tree.branch.tags.lookup_tag('mytag'),
 
551
                          'somerevid')
 
552
        self.assertEqual(to_tree.branch.last_revision(), revid1)
 
553
 
 
554
    def test_pull_tag_overwrite(self):
 
555
        """pulling tags with --overwrite only reports changed tags."""
 
556
        # create a branch, see that --show-base fails
 
557
        from_tree = self.make_branch_and_tree('from')
 
558
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
559
        to_tree = self.make_branch_and_tree('to')
 
560
        to_tree.branch.tags.set_tag("mytag", "somerevid")
 
561
        out = self.run_bzr(['pull', '--overwrite', '-d', 'to', 'from'])
 
562
        self.assertEqual(out,
 
563
            ('No revisions or tags to pull.\n', ''))
 
564
 
 
565
 
 
566
class TestPullOutput(script.TestCaseWithTransportAndScript):
 
567
 
 
568
    def test_pull_log_format(self):
 
569
        self.run_script("""
 
570
            $ brz init trunk
 
571
            Created a standalone tree (format: 2a)
 
572
            $ cd trunk
 
573
            $ echo foo > file
 
574
            $ brz add
 
575
            adding file
 
576
            $ brz commit -m 'we need some foo'
 
577
            2>Committing to:...trunk/
 
578
            2>added file
 
579
            2>Committed revision 1.
 
580
            $ cd ..
 
581
            $ brz init feature
 
582
            Created a standalone tree (format: 2a)
 
583
            $ cd feature
 
584
            $ brz pull -v ../trunk -Olog_format=line
 
585
            Now on revision 1.
 
586
            Added Revisions:
 
587
            1: jrandom@example.com ...we need some foo
 
588
            2>+N  file
 
589
            2>All changes applied successfully.
 
590
            """)