← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev, update to use new hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
23
23
from bzrlib import (
24
24
    debug,
25
25
    remote,
 
26
    tests,
26
27
    urlutils,
27
28
    )
28
29
 
29
30
from bzrlib.branch import Branch
30
31
from bzrlib.directory_service import directories
31
32
from bzrlib.osutils import pathjoin
32
 
from bzrlib.tests import TestCaseWithTransport
 
33
from bzrlib.tests import (
 
34
    fixtures,
 
35
    script,
 
36
    )
33
37
from bzrlib.uncommit import uncommit
34
38
from bzrlib.workingtree import WorkingTree
35
39
 
36
40
 
37
 
class TestPull(TestCaseWithTransport):
 
41
class TestPull(tests.TestCaseWithTransport):
38
42
 
39
43
    def example_branch(self, path='.'):
40
44
        tree = self.make_branch_and_tree(path)
50
54
    def test_pull(self):
51
55
        """Pull changes from one branch to another."""
52
56
        a_tree = self.example_branch('a')
 
57
        base_rev = a_tree.branch.last_revision()
53
58
        os.chdir('a')
54
59
        self.run_bzr('pull', retcode=3)
55
60
        self.run_bzr('missing', retcode=3)
68
73
        self.run_bzr('pull')
69
74
        os.mkdir('subdir')
70
75
        b_tree.add('subdir')
71
 
        b_tree.commit(message='blah', allow_pointless=True)
 
76
        new_rev = b_tree.commit(message='blah', allow_pointless=True)
72
77
 
73
78
        os.chdir('..')
74
79
        a = Branch.open('a')
75
80
        b = Branch.open('b')
76
 
        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)
77
83
 
78
84
        os.chdir('a')
79
85
        self.run_bzr('pull ../b')
80
 
        self.assertEqual(a.revision_history(), b.revision_history())
 
86
        self.assertEqual(a.last_revision(), b.last_revision())
81
87
        a_tree.commit(message='blah2', allow_pointless=True)
82
88
        b_tree.commit(message='blah3', allow_pointless=True)
83
89
        # no overwrite
88
94
        os.chdir('overwriteme')
89
95
        self.run_bzr('pull --overwrite ../a')
90
96
        overwritten = Branch.open('.')
91
 
        self.assertEqual(overwritten.revision_history(),
92
 
                         a.revision_history())
 
97
        self.assertEqual(overwritten.last_revision(),
 
98
                         a.last_revision())
93
99
        a_tree.merge_from_branch(b_tree.branch)
94
100
        a_tree.commit(message="blah4", allow_pointless=True)
95
101
        os.chdir('../b/subdir')
96
102
        self.run_bzr('pull ../../a')
97
 
        self.assertEqual(a.revision_history()[-1], b.revision_history()[-1])
 
103
        self.assertEqual(a.last_revision(), b.last_revision())
98
104
        sub_tree = WorkingTree.open_containing('.')[0]
99
105
        sub_tree.commit(message="blah5", allow_pointless=True)
100
106
        sub_tree.commit(message="blah6", allow_pointless=True)
140
146
        self.run_bzr('pull -r 3')
141
147
        self.assertEqual(b.revno(),3)
142
148
        self.run_bzr('pull -r 4')
143
 
        self.assertEqual(a.revision_history(), b.revision_history())
 
149
        self.assertEqual(a.last_revision(), b.last_revision())
144
150
 
 
151
    def test_pull_tags(self):
 
152
        """Tags are updated by pull, and revisions named in those tags are
 
153
        fetched.
 
154
        """
 
155
        # Make a source, sprout a target off it
 
156
        builder = self.make_branch_builder('source')
 
157
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
 
158
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
159
        target_bzrdir = source.bzrdir.sprout('target')
 
160
        source.tags.set_tag('tag-a', 'rev-2')
 
161
        # Pull from source
 
162
        self.run_bzr('pull -d target source')
 
163
        target = target_bzrdir.open_branch()
 
164
        # The tag is present, and so is its revision.
 
165
        self.assertEqual('rev-2', target.tags.lookup_tag('tag-a'))
 
166
        target.repository.get_revision('rev-2')
145
167
 
146
168
    def test_overwrite_uptodate(self):
147
169
        # Make sure pull --overwrite overwrites
160
182
        self.build_tree_contents([('a/foo', 'a third change')])
161
183
        a_tree.commit(message='a third change')
162
184
 
163
 
        rev_history_a = a_tree.branch.revision_history()
164
 
        self.assertEqual(len(rev_history_a), 3)
 
185
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
165
186
 
166
187
        b_tree.merge_from_branch(a_tree.branch)
167
188
        b_tree.commit(message='merge')
168
189
 
169
 
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
 
190
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
170
191
 
171
192
        os.chdir('b')
172
193
        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)
 
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())
177
197
 
178
198
    def test_overwrite_children(self):
179
199
        # Make sure pull --overwrite sets the revision-history
191
211
        self.build_tree_contents([('a/foo', 'a third change')])
192
212
        a_tree.commit(message='a third change')
193
213
 
194
 
        self.assertEqual(len(a_tree.branch.revision_history()), 3)
 
214
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
195
215
 
196
216
        b_tree.merge_from_branch(a_tree.branch)
197
217
        b_tree.commit(message='merge')
198
218
 
199
 
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
 
219
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
200
220
 
201
221
        self.build_tree_contents([('a/foo', 'a fourth change\n')])
202
222
        a_tree.commit(message='a fourth change')
203
223
 
204
 
        rev_history_a = a_tree.branch.revision_history()
205
 
        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)
206
226
 
207
227
        # With convergence, we could just pull over the
208
228
        # new change, but with --overwrite, we want to switch our history
209
229
        os.chdir('b')
210
230
        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)
 
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)
215
234
 
216
235
    def test_pull_remember(self):
217
236
        """Pull changes from one branch to another and test parent location."""
286
305
        self.assertEqual(err,
287
306
                ' M  a\nAll changes applied successfully.\n')
288
307
 
289
 
        self.assertEqualDiff(tree_a.branch.revision_history(),
290
 
                             tree_b.branch.revision_history())
 
308
        self.assertEqualDiff(tree_a.branch.last_revision(),
 
309
                             tree_b.branch.last_revision())
291
310
 
292
311
        testament_a = Testament.from_revision(tree_a.branch.repository,
293
312
                                              tree_a.get_parent_ids()[0])
299
318
        # it is legal to attempt to pull an already-merged bundle
300
319
        out, err = self.run_bzr('pull ../bundle')
301
320
        self.assertEqual(err, '')
302
 
        self.assertEqual(out, 'No revisions to pull.\n')
 
321
        self.assertEqual(out, 'No revisions or tags to pull.\n')
303
322
 
304
323
    def test_pull_verbose_no_files(self):
305
324
        """Pull --verbose should not list modified files"""
365
384
        self.assertNotContainsRe(
366
385
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
367
386
 
 
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')
 
395
 
368
396
    def test_pull_smart_stacked_streaming_acceptance(self):
369
397
        """'bzr pull -r 123' works on stacked, smart branches, even when the
370
398
        revision specified by the revno is only present in the fallback
392
420
        # being too low. If rpc_count increases, more network roundtrips have
393
421
        # become necessary for this use case. Please do not adjust this number
394
422
        # upwards without agreement from bzr's network support maintainers.
395
 
        self.assertLength(18, self.hpss_calls)
 
423
        self.assertLength(19, self.hpss_calls)
396
424
        remote = Branch.open('stacked')
397
425
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
398
 
    
 
426
 
399
427
    def test_pull_cross_format_warning(self):
400
428
        """You get a warning for probably slow cross-format pulls.
401
429
        """
453
481
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
454
482
        self.assertContainsRe(err,
455
483
            "(?m)Fetching into experimental format")
 
484
 
 
485
    def test_pull_show_base(self):
 
486
        """bzr pull supports --show-base
 
487
 
 
488
        see https://bugs.launchpad.net/bzr/+bug/202374"""
 
489
        # create two trees with conflicts, setup conflict, check that
 
490
        # conflicted file looks correct
 
491
        a_tree = self.example_branch('a')
 
492
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
493
 
 
494
        f = open(pathjoin('a', 'hello'),'wt')
 
495
        f.write('fee')
 
496
        f.close()
 
497
        a_tree.commit('fee')
 
498
 
 
499
        f = open(pathjoin('b', 'hello'),'wt')
 
500
        f.write('fie')
 
501
        f.close()
 
502
 
 
503
        out,err=self.run_bzr(['pull','-d','b','a','--show-base'])
 
504
 
 
505
        # check for message here
 
506
        self.assertEqual(err,
 
507
                         ' M  hello\nText conflict in hello\n1 conflicts encountered.\n')
 
508
 
 
509
        self.assertEqualDiff('<<<<<<< TREE\n'
 
510
                             'fie||||||| BASE-REVISION\n'
 
511
                             'foo=======\n'
 
512
                             'fee>>>>>>> MERGE-SOURCE\n',
 
513
                             open(pathjoin('b', 'hello')).read())
 
514
 
 
515
    def test_pull_show_base_working_tree_only(self):
 
516
        """--show-base only allowed if there's a working tree
 
517
 
 
518
        see https://bugs.launchpad.net/bzr/+bug/202374"""
 
519
        # create a branch, see that --show-base fails
 
520
        self.make_branch('from')
 
521
        self.make_branch('to')
 
522
        out=self.run_bzr(['pull','-d','to','from','--show-base'],retcode=3)
 
523
        self.assertEqual(out,
 
524
                         ('','bzr: ERROR: Need working tree for --show-base.\n'))
 
525
 
 
526
    def test_pull_tag_conflicts(self):
 
527
        """pulling tags with conflicts will change the exit code"""
 
528
        # create a branch, see that --show-base fails
 
529
        from_tree = self.make_branch_and_tree('from')
 
530
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
531
        to_tree = self.make_branch_and_tree('to')
 
532
        to_tree.branch.tags.set_tag("mytag", "anotherrevid")
 
533
        out = self.run_bzr(['pull','-d','to','from'],retcode=1)
 
534
        self.assertEqual(out,
 
535
            ('No revisions to pull.\nConflicting tags:\n    mytag\n', ''))
 
536
 
 
537
    def test_pull_tag_notification(self):
 
538
        """pulling tags with conflicts will change the exit code"""
 
539
        # create a branch, see that --show-base fails
 
540
        from_tree = self.make_branch_and_tree('from')
 
541
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
542
        to_tree = self.make_branch_and_tree('to')
 
543
        out = self.run_bzr(['pull', '-d', 'to', 'from'])
 
544
        self.assertEqual(out,
 
545
            ('1 tag(s) updated.\n', ''))
 
546
 
 
547
    def test_pull_tag_overwrite(self):
 
548
        """pulling tags with --overwrite only reports changed tags."""
 
549
        # create a branch, see that --show-base fails
 
550
        from_tree = self.make_branch_and_tree('from')
 
551
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
552
        to_tree = self.make_branch_and_tree('to')
 
553
        to_tree.branch.tags.set_tag("mytag", "somerevid")
 
554
        out = self.run_bzr(['pull', '--overwrite', '-d', 'to', 'from'])
 
555
        self.assertEqual(out,
 
556
            ('No revisions or tags to pull.\n', ''))
 
557
 
 
558
 
 
559
class TestPullOutput(script.TestCaseWithTransportAndScript):
 
560
 
 
561
    def test_pull_log_format(self):
 
562
        self.run_script("""
 
563
            $ bzr init trunk
 
564
            Created a standalone tree (format: 2a)
 
565
            $ cd trunk
 
566
            $ echo foo > file
 
567
            $ bzr add
 
568
            adding file
 
569
            $ bzr commit -m 'we need some foo'
 
570
            2>Committing to:...trunk/
 
571
            2>added file
 
572
            2>Committed revision 1.
 
573
            $ cd ..
 
574
            $ bzr init feature
 
575
            Created a standalone tree (format: 2a)
 
576
            $ cd feature
 
577
            $ bzr pull -v ../trunk -Olog_format=line
 
578
            Now on revision 1.
 
579
            Added Revisions:
 
580
            1: jrandom@example.com ...we need some foo
 
581
            2>+N  file
 
582
            2>All changes applied successfully.
 
583
            """)