← 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

  • Committer: Jelmer Vernooij
  • Date: 2011-10-06 00:14:01 UTC
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111006001401-o14rsyp6gdy5vt3o
Fix plugin use of revision_history.

Show diffs side-by-side

added added

removed removed

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