← 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: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
import os
21
21
import sys
22
22
 
23
 
from bzrlib import (
24
 
    debug,
25
 
    remote,
26
 
    urlutils,
27
 
    )
28
 
 
29
23
from bzrlib.branch import Branch
30
24
from bzrlib.directory_service import directories
31
25
from bzrlib.osutils import pathjoin
32
 
from bzrlib.tests import (
33
 
    fixtures,
34
 
    TestCaseWithTransport,
35
 
    )
 
26
from bzrlib.tests.blackbox import ExternalBase
36
27
from bzrlib.uncommit import uncommit
37
28
from bzrlib.workingtree import WorkingTree
38
 
 
39
 
 
40
 
class TestPull(TestCaseWithTransport):
 
29
from bzrlib import urlutils
 
30
 
 
31
 
 
32
class TestPull(ExternalBase):
41
33
 
42
34
    def example_branch(self, path='.'):
43
35
        tree = self.make_branch_and_tree(path)
145
137
        self.run_bzr('pull -r 4')
146
138
        self.assertEqual(a.revision_history(), b.revision_history())
147
139
 
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')
164
140
 
165
141
    def test_overwrite_uptodate(self):
166
142
        # Make sure pull --overwrite overwrites
318
294
        # it is legal to attempt to pull an already-merged bundle
319
295
        out, err = self.run_bzr('pull ../bundle')
320
296
        self.assertEqual(err, '')
321
 
        self.assertEqual(out, 'No revisions or tags to pull.\n')
 
297
        self.assertEqual(out, 'No revisions to pull.\n')
322
298
 
323
299
    def test_pull_verbose_no_files(self):
324
300
        """Pull --verbose should not list modified files"""
362
338
            def look_up(self, name, url):
363
339
                return 'source'
364
340
        directories.register('foo:', FooService, 'Testing directory service')
365
 
        self.addCleanup(directories.remove, 'foo:')
 
341
        self.addCleanup(lambda: directories.remove('foo:'))
366
342
        self.run_bzr('pull foo:bar -d target')
367
343
        self.assertEqual(source_last, target.last_revision())
368
344
 
384
360
        self.assertNotContainsRe(
385
361
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
386
362
 
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
 
 
396
363
    def test_pull_smart_stacked_streaming_acceptance(self):
397
364
        """'bzr pull -r 123' works on stacked, smart branches, even when the
398
365
        revision specified by the revno is only present in the fallback
420
387
        # being too low. If rpc_count increases, more network roundtrips have
421
388
        # become necessary for this use case. Please do not adjust this number
422
389
        # upwards without agreement from bzr's network support maintainers.
423
 
        self.assertLength(19, self.hpss_calls)
 
390
        self.assertLength(18, self.hpss_calls)
424
391
        remote = Branch.open('stacked')
425
392
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
426
 
    
427
 
    def test_pull_cross_format_warning(self):
428
 
        """You get a warning for probably slow cross-format pulls.
429
 
        """
430
 
        # this is assumed to be going through InterDifferingSerializer
431
 
        from_tree = self.make_branch_and_tree('from', format='2a')
432
 
        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
433
 
        from_tree.commit(message='first commit')
434
 
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
435
 
        self.assertContainsRe(err,
436
 
            "(?m)Doing on-the-fly conversion")
437
 
 
438
 
    def test_pull_cross_format_warning_no_IDS(self):
439
 
        """You get a warning for probably slow cross-format pulls.
440
 
        """
441
 
        # this simulates what would happen across the network, where
442
 
        # interdifferingserializer is not active
443
 
 
444
 
        debug.debug_flags.add('IDS_never')
445
 
        # TestCase take care of restoring them
446
 
 
447
 
        from_tree = self.make_branch_and_tree('from', format='2a')
448
 
        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
449
 
        from_tree.commit(message='first commit')
450
 
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
451
 
        self.assertContainsRe(err,
452
 
            "(?m)Doing on-the-fly conversion")
453
 
 
454
 
    def test_pull_cross_format_from_network(self):
455
 
        self.setup_smart_server_with_call_log()
456
 
        from_tree = self.make_branch_and_tree('from', format='2a')
457
 
        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
458
 
        self.assertIsInstance(from_tree.branch, remote.RemoteBranch)
459
 
        from_tree.commit(message='first commit')
460
 
        out, err = self.run_bzr(['pull', '-d', 'to',
461
 
            from_tree.branch.bzrdir.root_transport.base])
462
 
        self.assertContainsRe(err,
463
 
            "(?m)Doing on-the-fly conversion")
464
 
 
465
 
    def test_pull_to_experimental_format_warning(self):
466
 
        """You get a warning for pulling into experimental formats.
467
 
        """
468
 
        from_tree = self.make_branch_and_tree('from', format='development-subtree')
469
 
        to_tree = self.make_branch_and_tree('to', format='development-subtree')
470
 
        from_tree.commit(message='first commit')
471
 
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
472
 
        self.assertContainsRe(err,
473
 
            "(?m)Fetching into experimental format")
474
 
 
475
 
    def test_pull_cross_to_experimental_format_warning(self):
476
 
        """You get a warning for pulling into experimental formats.
477
 
        """
478
 
        from_tree = self.make_branch_and_tree('from', format='2a')
479
 
        to_tree = self.make_branch_and_tree('to', format='development-subtree')
480
 
        from_tree.commit(message='first commit')
481
 
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
482
 
        self.assertContainsRe(err,
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', ''))
 
393