31
32
from bzrlib.osutils import pathjoin
32
33
from bzrlib.tests import (
34
TestCaseWithTransport,
36
37
from bzrlib.uncommit import uncommit
37
38
from bzrlib.workingtree import WorkingTree
40
class TestPull(TestCaseWithTransport):
41
class TestPull(tests.TestCaseWithTransport):
42
43
def example_branch(self, path='.'):
43
44
tree = self.make_branch_and_tree(path)
53
54
def test_pull(self):
54
55
"""Pull changes from one branch to another."""
55
56
a_tree = self.example_branch('a')
57
base_rev = a_tree.branch.last_revision()
57
59
self.run_bzr('pull', retcode=3)
58
60
self.run_bzr('missing', retcode=3)
71
73
self.run_bzr('pull')
73
75
b_tree.add('subdir')
74
b_tree.commit(message='blah', allow_pointless=True)
76
new_rev = b_tree.commit(message='blah', allow_pointless=True)
77
79
a = Branch.open('a')
78
80
b = Branch.open('b')
79
self.assertEqual(a.revision_history(), b.revision_history()[:-1])
81
self.assertEqual(a.last_revision(), base_rev)
82
self.assertEqual(b.last_revision(), new_rev)
82
85
self.run_bzr('pull ../b')
83
self.assertEqual(a.revision_history(), b.revision_history())
86
self.assertEqual(a.last_revision(), b.last_revision())
84
87
a_tree.commit(message='blah2', allow_pointless=True)
85
88
b_tree.commit(message='blah3', allow_pointless=True)
91
94
os.chdir('overwriteme')
92
95
self.run_bzr('pull --overwrite ../a')
93
96
overwritten = Branch.open('.')
94
self.assertEqual(overwritten.revision_history(),
97
self.assertEqual(overwritten.last_revision(),
96
99
a_tree.merge_from_branch(b_tree.branch)
97
100
a_tree.commit(message="blah4", allow_pointless=True)
98
101
os.chdir('../b/subdir')
99
102
self.run_bzr('pull ../../a')
100
self.assertEqual(a.revision_history()[-1], b.revision_history()[-1])
103
self.assertEqual(a.last_revision(), b.last_revision())
101
104
sub_tree = WorkingTree.open_containing('.')[0]
102
105
sub_tree.commit(message="blah5", allow_pointless=True)
103
106
sub_tree.commit(message="blah6", allow_pointless=True)
143
146
self.run_bzr('pull -r 3')
144
147
self.assertEqual(b.revno(),3)
145
148
self.run_bzr('pull -r 4')
146
self.assertEqual(a.revision_history(), b.revision_history())
149
self.assertEqual(a.last_revision(), b.last_revision())
148
151
def test_pull_tags(self):
149
152
"""Tags are updated by pull, and revisions named in those tags are
152
155
# Make a source, sprout a target off it
153
156
builder = self.make_branch_builder('source')
154
157
source = fixtures.build_branch_with_non_ancestral_rev(builder)
158
source.get_config_stack().set('branch.fetch_tags', True)
155
159
target_bzrdir = source.bzrdir.sprout('target')
156
160
source.tags.set_tag('tag-a', 'rev-2')
157
161
# Pull from source
178
182
self.build_tree_contents([('a/foo', 'a third change')])
179
183
a_tree.commit(message='a third change')
181
rev_history_a = a_tree.branch.revision_history()
182
self.assertEqual(len(rev_history_a), 3)
185
self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
184
187
b_tree.merge_from_branch(a_tree.branch)
185
188
b_tree.commit(message='merge')
187
self.assertEqual(len(b_tree.branch.revision_history()), 2)
190
self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
190
193
self.run_bzr('pull --overwrite ../a')
191
rev_history_b = b_tree.branch.revision_history()
192
self.assertEqual(len(rev_history_b), 3)
194
self.assertEqual(rev_history_b, rev_history_a)
194
(last_revinfo_b) = b_tree.branch.last_revision_info()
195
self.assertEqual(last_revinfo_b[0], 3)
196
self.assertEqual(last_revinfo_b[1], a_tree.branch.last_revision())
196
198
def test_overwrite_children(self):
197
199
# Make sure pull --overwrite sets the revision-history
209
211
self.build_tree_contents([('a/foo', 'a third change')])
210
212
a_tree.commit(message='a third change')
212
self.assertEqual(len(a_tree.branch.revision_history()), 3)
214
self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
214
216
b_tree.merge_from_branch(a_tree.branch)
215
217
b_tree.commit(message='merge')
217
self.assertEqual(len(b_tree.branch.revision_history()), 2)
219
self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
219
221
self.build_tree_contents([('a/foo', 'a fourth change\n')])
220
222
a_tree.commit(message='a fourth change')
222
rev_history_a = a_tree.branch.revision_history()
223
self.assertEqual(len(rev_history_a), 4)
224
rev_info_a = a_tree.branch.last_revision_info()
225
self.assertEqual(rev_info_a[0], 4)
225
227
# With convergence, we could just pull over the
226
228
# new change, but with --overwrite, we want to switch our history
228
230
self.run_bzr('pull --overwrite ../a')
229
rev_history_b = b_tree.branch.revision_history()
230
self.assertEqual(len(rev_history_b), 4)
232
self.assertEqual(rev_history_b, rev_history_a)
231
rev_info_b = b_tree.branch.last_revision_info()
232
self.assertEqual(rev_info_b[0], 4)
233
self.assertEqual(rev_info_b, rev_info_a)
234
235
def test_pull_remember(self):
235
236
"""Pull changes from one branch to another and test parent location."""
304
305
self.assertEqual(err,
305
306
' M a\nAll changes applied successfully.\n')
307
self.assertEqualDiff(tree_a.branch.revision_history(),
308
tree_b.branch.revision_history())
308
self.assertEqualDiff(tree_a.branch.last_revision(),
309
tree_b.branch.last_revision())
310
311
testament_a = Testament.from_revision(tree_a.branch.repository,
311
312
tree_a.get_parent_ids()[0])
317
318
# it is legal to attempt to pull an already-merged bundle
318
319
out, err = self.run_bzr('pull ../bundle')
319
320
self.assertEqual(err, '')
320
self.assertEqual(out, 'No revisions to pull.\n')
321
self.assertEqual(out, 'No revisions or tags to pull.\n')
322
323
def test_pull_verbose_no_files(self):
323
324
"""Pull --verbose should not list modified files"""
376
377
def test_pull_verbose_uses_default_log(self):
377
378
tree = self.example_branch('source')
378
379
target = self.make_branch_and_tree('target')
379
target_config = target.branch.get_config()
380
target_config.set_user_option('log_format', 'short')
380
target_config = target.branch.get_config_stack()
381
target_config.set('log_format', 'short')
381
382
out = self.run_bzr('pull -v source -d target')[0]
382
383
self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
383
384
self.assertNotContainsRe(
384
385
out, r'revno: 1\ncommitter: .*\nbranch nick: source')
387
def test_pull_smart_bound_branch(self):
388
self.setup_smart_server_with_call_log()
389
parent = self.make_branch_and_tree('parent')
390
parent.commit(message='first commit')
391
child = parent.bzrdir.sprout('child').open_workingtree()
392
child.commit(message='second commit')
393
checkout = parent.branch.create_checkout('checkout')
394
self.run_bzr(['pull', self.get_url('child')], working_dir='checkout')
386
396
def test_pull_smart_stacked_streaming_acceptance(self):
387
397
"""'bzr pull -r 123' works on stacked, smart branches, even when the
388
398
revision specified by the revno is only present in the fallback
410
420
# being too low. If rpc_count increases, more network roundtrips have
411
421
# become necessary for this use case. Please do not adjust this number
412
422
# upwards without agreement from bzr's network support maintainers.
413
self.assertLength(18, self.hpss_calls)
423
self.assertLength(19, self.hpss_calls)
424
self.assertLength(1, self.hpss_connections)
414
425
remote = Branch.open('stacked')
415
426
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
417
428
def test_pull_cross_format_warning(self):
418
429
"""You get a warning for probably slow cross-format pulls.
523
534
out = self.run_bzr(['pull','-d','to','from'],retcode=1)
524
535
self.assertEqual(out,
525
536
('No revisions to pull.\nConflicting tags:\n mytag\n', ''))
538
def test_pull_tag_notification(self):
539
"""pulling tags with conflicts will change the exit code"""
540
# create a branch, see that --show-base fails
541
from_tree = self.make_branch_and_tree('from')
542
from_tree.branch.tags.set_tag("mytag", "somerevid")
543
to_tree = self.make_branch_and_tree('to')
544
out = self.run_bzr(['pull', '-d', 'to', 'from'])
545
self.assertEqual(out,
546
('1 tag(s) updated.\n', ''))
548
def test_pull_tag_overwrite(self):
549
"""pulling tags with --overwrite only reports changed tags."""
550
# create a branch, see that --show-base fails
551
from_tree = self.make_branch_and_tree('from')
552
from_tree.branch.tags.set_tag("mytag", "somerevid")
553
to_tree = self.make_branch_and_tree('to')
554
to_tree.branch.tags.set_tag("mytag", "somerevid")
555
out = self.run_bzr(['pull', '--overwrite', '-d', 'to', 'from'])
556
self.assertEqual(out,
557
('No revisions or tags to pull.\n', ''))
560
class TestPullOutput(script.TestCaseWithTransportAndScript):
562
def test_pull_log_format(self):
565
Created a standalone tree (format: 2a)
570
$ bzr commit -m 'we need some foo'
571
2>Committing to:...trunk/
573
2>Committed revision 1.
576
Created a standalone tree (format: 2a)
578
$ bzr pull -v ../trunk -Olog_format=line
581
1: jrandom@example.com ...we need some foo
583
2>All changes applied successfully.
added
removed
bzrlib/tests/blackbox/test_pull.py
