24
29
from bzrlib.branch import Branch
25
from bzrlib.tests.blackbox import ExternalBase
30
from bzrlib.directory_service import directories
31
from bzrlib.osutils import pathjoin
32
from bzrlib.tests import (
34
TestCaseWithTransport,
26
36
from bzrlib.uncommit import uncommit
29
class TestPull(ExternalBase):
31
def example_branch(test):
33
file('hello', 'wt').write('foo')
34
test.runbzr('add hello')
35
test.runbzr('commit -m setup hello')
36
file('goodbye', 'wt').write('baz')
37
test.runbzr('add goodbye')
38
test.runbzr('commit -m setup goodbye')
37
from bzrlib.workingtree import WorkingTree
40
class TestPull(TestCaseWithTransport):
42
def example_branch(self, path='.'):
43
tree = self.make_branch_and_tree(path)
44
self.build_tree_contents([
45
(pathjoin(path, 'hello'), 'foo'),
46
(pathjoin(path, 'goodbye'), 'baz')])
48
tree.commit(message='setup')
50
tree.commit(message='setup')
40
53
def test_pull(self):
41
54
"""Pull changes from one branch to another."""
55
a_tree = self.example_branch('a')
46
self.runbzr('pull', retcode=3)
47
self.runbzr('missing', retcode=3)
48
self.runbzr('missing .')
49
self.runbzr('missing')
57
self.run_bzr('pull', retcode=3)
58
self.run_bzr('missing', retcode=3)
59
self.run_bzr('missing .')
60
self.run_bzr('missing')
50
61
# this will work on windows because we check for the same branch
51
62
# in pull - if it fails, it is a regression
53
self.runbzr('pull /', retcode=3)
64
self.run_bzr('pull /', retcode=3)
54
65
if sys.platform not in ('win32', 'cygwin'):
58
self.runbzr('branch a b')
69
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
62
self.runbzr('add subdir')
63
self.runbzr('commit -m blah --unchanged')
66
b = Branch.open('../b')
67
self.assertEquals(a.revision_history(), b.revision_history()[:-1])
68
self.runbzr('pull ../b')
69
self.assertEquals(a.revision_history(), b.revision_history())
70
self.runbzr('commit -m blah2 --unchanged')
72
self.runbzr('commit -m blah3 --unchanged')
74
b_tree.commit(message='blah', allow_pointless=True)
79
self.assertEqual(a.revision_history(), b.revision_history()[:-1])
82
self.run_bzr('pull ../b')
83
self.assertEqual(a.revision_history(), b.revision_history())
84
a_tree.commit(message='blah2', allow_pointless=True)
85
b_tree.commit(message='blah3', allow_pointless=True)
74
self.runbzr('pull ../a', retcode=3)
88
self.run_bzr('pull ../a', retcode=3)
76
self.runbzr('branch b overwriteme')
90
b_tree.bzrdir.sprout('overwriteme')
77
91
os.chdir('overwriteme')
78
self.runbzr('pull --overwrite ../a')
92
self.run_bzr('pull --overwrite ../a')
79
93
overwritten = Branch.open('.')
80
94
self.assertEqual(overwritten.revision_history(),
81
95
a.revision_history())
83
self.runbzr('merge ../b')
84
self.runbzr('commit -m blah4 --unchanged')
96
a_tree.merge_from_branch(b_tree.branch)
97
a_tree.commit(message="blah4", allow_pointless=True)
85
98
os.chdir('../b/subdir')
86
self.runbzr('pull ../../a')
87
self.assertEquals(a.revision_history()[-1], b.revision_history()[-1])
88
self.runbzr('commit -m blah5 --unchanged')
89
self.runbzr('commit -m blah6 --unchanged')
99
self.run_bzr('pull ../../a')
100
self.assertEqual(a.revision_history()[-1], b.revision_history()[-1])
101
sub_tree = WorkingTree.open_containing('.')[0]
102
sub_tree.commit(message="blah5", allow_pointless=True)
103
sub_tree.commit(message="blah6", allow_pointless=True)
91
self.runbzr('pull ../a')
105
self.run_bzr('pull ../a')
93
self.runbzr('commit -m blah7 --unchanged')
94
self.runbzr('merge ../b')
95
self.runbzr('commit -m blah8 --unchanged')
96
self.runbzr('pull ../b')
97
self.runbzr('pull ../b')
107
a_tree.commit(message="blah7", allow_pointless=True)
108
a_tree.merge_from_branch(b_tree.branch)
109
a_tree.commit(message="blah8", allow_pointless=True)
110
self.run_bzr('pull ../b')
111
self.run_bzr('pull ../b')
113
def test_pull_dash_d(self):
114
self.example_branch('a')
115
self.make_branch_and_tree('b')
116
self.make_branch_and_tree('c')
117
# pull into that branch
118
self.run_bzr('pull -d b a')
119
# pull into a branch specified by a url
120
c_url = urlutils.local_path_to_url('c')
121
self.assertStartsWith(c_url, 'file://')
122
self.run_bzr(['pull', '-d', c_url, 'a'])
99
124
def test_pull_revision(self):
100
125
"""Pull some changes from one branch to another."""
104
self.example_branch()
105
file('hello2', 'wt').write('foo')
106
self.runbzr('add hello2')
107
self.runbzr('commit -m setup hello2')
108
file('goodbye2', 'wt').write('baz')
109
self.runbzr('add goodbye2')
110
self.runbzr('commit -m setup goodbye2')
113
self.runbzr('branch -r 1 a b')
126
a_tree = self.example_branch('a')
127
self.build_tree_contents([
129
('a/goodbye2', 'baz')])
131
a_tree.commit(message="setup")
132
a_tree.add('goodbye2')
133
a_tree.commit(message="setup")
135
b_tree = a_tree.bzrdir.sprout('b',
136
revision_id=a_tree.branch.get_rev_id(1)).open_workingtree()
115
self.runbzr('pull -r 2')
138
self.run_bzr('pull -r 2')
116
139
a = Branch.open('../a')
117
140
b = Branch.open('.')
118
self.assertEquals(a.revno(),4)
119
self.assertEquals(b.revno(),2)
120
self.runbzr('pull -r 3')
121
self.assertEquals(b.revno(),3)
122
self.runbzr('pull -r 4')
123
self.assertEquals(a.revision_history(), b.revision_history())
141
self.assertEqual(a.revno(),4)
142
self.assertEqual(b.revno(),2)
143
self.run_bzr('pull -r 3')
144
self.assertEqual(b.revno(),3)
145
self.run_bzr('pull -r 4')
146
self.assertEqual(a.revision_history(), b.revision_history())
148
def test_pull_tags(self):
149
"""Tags are updated by pull, and revisions named in those tags are
152
# Make a source, sprout a target off it
153
builder = self.make_branch_builder('source')
154
source = fixtures.build_branch_with_non_ancestral_rev(builder)
155
target_bzrdir = source.bzrdir.sprout('target')
156
source.tags.set_tag('tag-a', 'rev-2')
158
self.run_bzr('pull -d target source')
159
target = target_bzrdir.open_branch()
160
# The tag is present, and so is its revision.
161
self.assertEqual('rev-2', target.tags.lookup_tag('tag-a'))
162
target.repository.get_revision('rev-2')
126
164
def test_overwrite_uptodate(self):
127
165
# Make sure pull --overwrite overwrites
128
166
# even if the target branch has merged
129
167
# everything already.
132
def get_rh(expected_len):
133
rh = self.capture('revision-history')
134
# Make sure we don't have trailing empty revisions
135
rh = rh.strip().split('\n')
136
self.assertEqual(len(rh), expected_len)
142
open('foo', 'wb').write('original\n')
144
bzr('commit', '-m', 'initial commit')
147
bzr('branch', 'a', 'b')
150
open('foo', 'wb').write('changed\n')
151
bzr('commit', '-m', 'later change')
153
open('foo', 'wb').write('another\n')
154
bzr('commit', '-m', 'a third change')
156
rev_history_a = get_rh(3)
160
bzr('commit', '-m', 'merge')
162
rev_history_b = get_rh(2)
164
bzr('pull', '--overwrite', '../a')
165
rev_history_b = get_rh(3)
168
a_tree = self.make_branch_and_tree('a')
169
self.build_tree_contents([('a/foo', 'original\n')])
171
a_tree.commit(message='initial commit')
173
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
175
self.build_tree_contents([('a/foo', 'changed\n')])
176
a_tree.commit(message='later change')
178
self.build_tree_contents([('a/foo', 'a third change')])
179
a_tree.commit(message='a third change')
181
rev_history_a = a_tree.branch.revision_history()
182
self.assertEqual(len(rev_history_a), 3)
184
b_tree.merge_from_branch(a_tree.branch)
185
b_tree.commit(message='merge')
187
self.assertEqual(len(b_tree.branch.revision_history()), 2)
190
self.run_bzr('pull --overwrite ../a')
191
rev_history_b = b_tree.branch.revision_history()
192
self.assertEqual(len(rev_history_b), 3)
167
194
self.assertEqual(rev_history_b, rev_history_a)
169
196
def test_overwrite_children(self):
170
197
# Make sure pull --overwrite sets the revision-history
171
198
# to be identical to the pull source, even if we have convergence
174
def get_rh(expected_len):
175
rh = self.capture('revision-history')
176
# Make sure we don't have trailing empty revisions
177
rh = rh.strip().split('\n')
178
self.assertEqual(len(rh), expected_len)
184
open('foo', 'wb').write('original\n')
186
bzr('commit', '-m', 'initial commit')
189
bzr('branch', 'a', 'b')
192
open('foo', 'wb').write('changed\n')
193
bzr('commit', '-m', 'later change')
195
open('foo', 'wb').write('another\n')
196
bzr('commit', '-m', 'a third change')
198
rev_history_a = get_rh(3)
202
bzr('commit', '-m', 'merge')
204
rev_history_b = get_rh(2)
207
open('foo', 'wb').write('a fourth change\n')
208
bzr('commit', '-m', 'a fourth change')
210
rev_history_a = get_rh(4)
199
a_tree = self.make_branch_and_tree('a')
200
self.build_tree_contents([('a/foo', 'original\n')])
202
a_tree.commit(message='initial commit')
204
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
206
self.build_tree_contents([('a/foo', 'changed\n')])
207
a_tree.commit(message='later change')
209
self.build_tree_contents([('a/foo', 'a third change')])
210
a_tree.commit(message='a third change')
212
self.assertEqual(len(a_tree.branch.revision_history()), 3)
214
b_tree.merge_from_branch(a_tree.branch)
215
b_tree.commit(message='merge')
217
self.assertEqual(len(b_tree.branch.revision_history()), 2)
219
self.build_tree_contents([('a/foo', 'a fourth change\n')])
220
a_tree.commit(message='a fourth change')
222
rev_history_a = a_tree.branch.revision_history()
223
self.assertEqual(len(rev_history_a), 4)
212
225
# With convergence, we could just pull over the
213
226
# new change, but with --overwrite, we want to switch our history
215
bzr('pull', '--overwrite', '../a')
216
rev_history_b = get_rh(4)
228
self.run_bzr('pull --overwrite ../a')
229
rev_history_b = b_tree.branch.revision_history()
230
self.assertEqual(len(rev_history_b), 4)
218
232
self.assertEqual(rev_history_b, rev_history_a)
300
315
testament_b.as_text())
302
317
# it is legal to attempt to pull an already-merged bundle
303
output = self.run_bzr('pull', '../bundle')
304
self.assertEqual('', output[0])
305
self.assertEqual('0 revision(s) pulled.\n', output[1])
318
out, err = self.run_bzr('pull ../bundle')
319
self.assertEqual(err, '')
320
self.assertEqual(out, 'No revisions to pull.\n')
322
def test_pull_verbose_no_files(self):
323
"""Pull --verbose should not list modified files"""
324
tree_a = self.make_branch_and_tree('tree_a')
325
self.build_tree(['tree_a/foo'])
328
tree_b = self.make_branch_and_tree('tree_b')
329
out = self.run_bzr('pull --verbose -d tree_b tree_a')[0]
330
self.assertContainsRe(out, 'bar')
331
self.assertNotContainsRe(out, 'added:')
332
self.assertNotContainsRe(out, 'foo')
334
def test_pull_quiet(self):
335
"""Check that bzr pull --quiet does not print anything"""
336
tree_a = self.make_branch_and_tree('tree_a')
337
self.build_tree(['tree_a/foo'])
339
revision_id = tree_a.commit('bar')
340
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
341
out, err = self.run_bzr('pull --quiet -d tree_b')
342
self.assertEqual(out, '')
343
self.assertEqual(err, '')
344
self.assertEqual(tree_b.last_revision(), revision_id)
345
self.build_tree(['tree_a/moo'])
347
revision_id = tree_a.commit('quack')
348
out, err = self.run_bzr('pull --quiet -d tree_b')
349
self.assertEqual(out, '')
350
self.assertEqual(err, '')
351
self.assertEqual(tree_b.last_revision(), revision_id)
353
def test_pull_from_directory_service(self):
354
source = self.make_branch_and_tree('source')
355
source.commit('commit 1')
356
target = source.bzrdir.sprout('target').open_workingtree()
357
source_last = source.commit('commit 2')
358
class FooService(object):
359
"""A directory service that always returns source"""
361
def look_up(self, name, url):
363
directories.register('foo:', FooService, 'Testing directory service')
364
self.addCleanup(directories.remove, 'foo:')
365
self.run_bzr('pull foo:bar -d target')
366
self.assertEqual(source_last, target.last_revision())
368
def test_pull_verbose_defaults_to_long(self):
369
tree = self.example_branch('source')
370
target = self.make_branch_and_tree('target')
371
out = self.run_bzr('pull -v source -d target')[0]
372
self.assertContainsRe(out,
373
r'revno: 1\ncommitter: .*\nbranch nick: source')
374
self.assertNotContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
376
def test_pull_verbose_uses_default_log(self):
377
tree = self.example_branch('source')
378
target = self.make_branch_and_tree('target')
379
target_config = target.branch.get_config()
380
target_config.set_user_option('log_format', 'short')
381
out = self.run_bzr('pull -v source -d target')[0]
382
self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
383
self.assertNotContainsRe(
384
out, r'revno: 1\ncommitter: .*\nbranch nick: source')
386
def test_pull_smart_stacked_streaming_acceptance(self):
387
"""'bzr pull -r 123' works on stacked, smart branches, even when the
388
revision specified by the revno is only present in the fallback
391
See <https://launchpad.net/bugs/380314>
393
self.setup_smart_server_with_call_log()
394
# Make a stacked-on branch with two commits so that the
395
# revision-history can't be determined just by looking at the parent
396
# field in the revision in the stacked repo.
397
parent = self.make_branch_and_tree('parent', format='1.9')
398
parent.commit(message='first commit')
399
parent.commit(message='second commit')
400
local = parent.bzrdir.sprout('local').open_workingtree()
401
local.commit(message='local commit')
402
local.branch.create_clone_on_transport(
403
self.get_transport('stacked'), stacked_on=self.get_url('parent'))
404
empty = self.make_branch_and_tree('empty', format='1.9')
405
self.reset_smart_call_log()
406
self.run_bzr(['pull', '-r', '1', self.get_url('stacked')],
408
# This figure represent the amount of work to perform this use case. It
409
# is entirely ok to reduce this number if a test fails due to rpc_count
410
# being too low. If rpc_count increases, more network roundtrips have
411
# become necessary for this use case. Please do not adjust this number
412
# upwards without agreement from bzr's network support maintainers.
413
self.assertLength(18, self.hpss_calls)
414
remote = Branch.open('stacked')
415
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
417
def test_pull_cross_format_warning(self):
418
"""You get a warning for probably slow cross-format pulls.
420
# this is assumed to be going through InterDifferingSerializer
421
from_tree = self.make_branch_and_tree('from', format='2a')
422
to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
423
from_tree.commit(message='first commit')
424
out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
425
self.assertContainsRe(err,
426
"(?m)Doing on-the-fly conversion")
428
def test_pull_cross_format_warning_no_IDS(self):
429
"""You get a warning for probably slow cross-format pulls.
431
# this simulates what would happen across the network, where
432
# interdifferingserializer is not active
434
debug.debug_flags.add('IDS_never')
435
# TestCase take care of restoring them
437
from_tree = self.make_branch_and_tree('from', format='2a')
438
to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
439
from_tree.commit(message='first commit')
440
out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
441
self.assertContainsRe(err,
442
"(?m)Doing on-the-fly conversion")
444
def test_pull_cross_format_from_network(self):
445
self.setup_smart_server_with_call_log()
446
from_tree = self.make_branch_and_tree('from', format='2a')
447
to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
448
self.assertIsInstance(from_tree.branch, remote.RemoteBranch)
449
from_tree.commit(message='first commit')
450
out, err = self.run_bzr(['pull', '-d', 'to',
451
from_tree.branch.bzrdir.root_transport.base])
452
self.assertContainsRe(err,
453
"(?m)Doing on-the-fly conversion")
455
def test_pull_to_experimental_format_warning(self):
456
"""You get a warning for pulling into experimental formats.
458
from_tree = self.make_branch_and_tree('from', format='development-subtree')
459
to_tree = self.make_branch_and_tree('to', format='development-subtree')
460
from_tree.commit(message='first commit')
461
out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
462
self.assertContainsRe(err,
463
"(?m)Fetching into experimental format")
465
def test_pull_cross_to_experimental_format_warning(self):
466
"""You get a warning for pulling into experimental formats.
468
from_tree = self.make_branch_and_tree('from', format='2a')
469
to_tree = self.make_branch_and_tree('to', format='development-subtree')
470
from_tree.commit(message='first commit')
471
out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
472
self.assertContainsRe(err,
473
"(?m)Fetching into experimental format")
475
def test_pull_show_base(self):
476
"""bzr pull supports --show-base
478
see https://bugs.launchpad.net/bzr/+bug/202374"""
479
# create two trees with conflicts, setup conflict, check that
480
# conflicted file looks correct
481
a_tree = self.example_branch('a')
482
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
484
f = open(pathjoin('a', 'hello'),'wt')
489
f = open(pathjoin('b', 'hello'),'wt')
493
out,err=self.run_bzr(['pull','-d','b','a','--show-base'])
495
# check for message here
496
self.assertEqual(err,
497
' M hello\nText conflict in hello\n1 conflicts encountered.\n')
499
self.assertEqualDiff('<<<<<<< TREE\n'
500
'fie||||||| BASE-REVISION\n'
502
'fee>>>>>>> MERGE-SOURCE\n',
503
open(pathjoin('b', 'hello')).read())
505
def test_pull_show_base_working_tree_only(self):
506
"""--show-base only allowed if there's a working tree
508
see https://bugs.launchpad.net/bzr/+bug/202374"""
509
# create a branch, see that --show-base fails
510
self.make_branch('from')
511
self.make_branch('to')
512
out=self.run_bzr(['pull','-d','to','from','--show-base'],retcode=3)
513
self.assertEqual(out,
514
('','bzr: ERROR: Need working tree for --show-base.\n'))
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', ''))
added
removed
bzrlib/tests/blackbox/test_pull.py
