← 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: Jonathan Riddell
  • Date: 2011-09-20 11:01:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6153.
  • Revision ID: jriddell@canonical.com-20110920110137-mrps089ulocx1skd
gettext() in plugin.py and hooks.py

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)
142
145
        self.run_bzr('pull -r 4')
143
146
        self.assertEqual(a.revision_history(), b.revision_history())
144
147
 
 
148
    def test_pull_tags(self):
 
149
        """Tags are updated by pull, and revisions named in those tags are
 
150
        fetched.
 
151
        """
 
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
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
156
        target_bzrdir = source.bzrdir.sprout('target')
 
157
        source.tags.set_tag('tag-a', 'rev-2')
 
158
        # Pull from source
 
159
        self.run_bzr('pull -d target source')
 
160
        target = target_bzrdir.open_branch()
 
161
        # The tag is present, and so is its revision.
 
162
        self.assertEqual('rev-2', target.tags.lookup_tag('tag-a'))
 
163
        target.repository.get_revision('rev-2')
145
164
 
146
165
    def test_overwrite_uptodate(self):
147
166
        # Make sure pull --overwrite overwrites
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
    
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', ''))