← 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

Abbreviate pack_stat struct format to '>6L'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
152
152
        # Make a source, sprout a target off it
153
153
        builder = self.make_branch_builder('source')
154
154
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
 
155
        source.get_config().set_user_option('branch.fetch_tags', 'True')
155
156
        target_bzrdir = source.bzrdir.sprout('target')
156
157
        source.tags.set_tag('tag-a', 'rev-2')
157
158
        # Pull from source
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')
321
322
 
322
323
    def test_pull_verbose_no_files(self):
323
324
        """Pull --verbose should not list modified files"""
383
384
        self.assertNotContainsRe(
384
385
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
385
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
 
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)
414
424
        remote = Branch.open('stacked')
415
425
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
416
426
    
523
533
        out = self.run_bzr(['pull','-d','to','from'],retcode=1)
524
534
        self.assertEqual(out,
525
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', ''))