← 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-04-09 19:25:42 UTC
  • mto: (5777.5.1 inventoryworkingtree)
  • mto: This revision was merged to the branch mainline in revision 5781.
  • Revision ID: jelmer@samba.org-20110409192542-8bbedp36s7nj928e
Split InventoryTree out of Tree.

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,
27
26
    urlutils,
28
27
    )
29
28
 
32
31
from bzrlib.osutils import pathjoin
33
32
from bzrlib.tests import (
34
33
    fixtures,
35
 
    script,
 
34
    TestCaseWithTransport,
36
35
    )
37
36
from bzrlib.uncommit import uncommit
38
37
from bzrlib.workingtree import WorkingTree
39
38
 
40
39
 
41
 
class TestPull(tests.TestCaseWithTransport):
 
40
class TestPull(TestCaseWithTransport):
42
41
 
43
42
    def example_branch(self, path='.'):
44
43
        tree = self.make_branch_and_tree(path)
54
53
    def test_pull(self):
55
54
        """Pull changes from one branch to another."""
56
55
        a_tree = self.example_branch('a')
57
 
        base_rev = a_tree.branch.last_revision()
58
56
        os.chdir('a')
59
57
        self.run_bzr('pull', retcode=3)
60
58
        self.run_bzr('missing', retcode=3)
73
71
        self.run_bzr('pull')
74
72
        os.mkdir('subdir')
75
73
        b_tree.add('subdir')
76
 
        new_rev = b_tree.commit(message='blah', allow_pointless=True)
 
74
        b_tree.commit(message='blah', allow_pointless=True)
77
75
 
78
76
        os.chdir('..')
79
77
        a = Branch.open('a')
80
78
        b = Branch.open('b')
81
 
        self.assertEqual(a.last_revision(), base_rev)
82
 
        self.assertEqual(b.last_revision(), new_rev)
 
79
        self.assertEqual(a.revision_history(), b.revision_history()[:-1])
83
80
 
84
81
        os.chdir('a')
85
82
        self.run_bzr('pull ../b')
86
 
        self.assertEqual(a.last_revision(), b.last_revision())
 
83
        self.assertEqual(a.revision_history(), b.revision_history())
87
84
        a_tree.commit(message='blah2', allow_pointless=True)
88
85
        b_tree.commit(message='blah3', allow_pointless=True)
89
86
        # no overwrite
94
91
        os.chdir('overwriteme')
95
92
        self.run_bzr('pull --overwrite ../a')
96
93
        overwritten = Branch.open('.')
97
 
        self.assertEqual(overwritten.last_revision(),
98
 
                         a.last_revision())
 
94
        self.assertEqual(overwritten.revision_history(),
 
95
                         a.revision_history())
99
96
        a_tree.merge_from_branch(b_tree.branch)
100
97
        a_tree.commit(message="blah4", allow_pointless=True)
101
98
        os.chdir('../b/subdir')
102
99
        self.run_bzr('pull ../../a')
103
 
        self.assertEqual(a.last_revision(), b.last_revision())
 
100
        self.assertEqual(a.revision_history()[-1], b.revision_history()[-1])
104
101
        sub_tree = WorkingTree.open_containing('.')[0]
105
102
        sub_tree.commit(message="blah5", allow_pointless=True)
106
103
        sub_tree.commit(message="blah6", allow_pointless=True)
146
143
        self.run_bzr('pull -r 3')
147
144
        self.assertEqual(b.revno(),3)
148
145
        self.run_bzr('pull -r 4')
149
 
        self.assertEqual(a.last_revision(), b.last_revision())
 
146
        self.assertEqual(a.revision_history(), b.revision_history())
150
147
 
151
148
    def test_pull_tags(self):
152
149
        """Tags are updated by pull, and revisions named in those tags are
155
152
        # Make a source, sprout a target off it
156
153
        builder = self.make_branch_builder('source')
157
154
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
158
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
159
155
        target_bzrdir = source.bzrdir.sprout('target')
160
156
        source.tags.set_tag('tag-a', 'rev-2')
161
157
        # Pull from source
182
178
        self.build_tree_contents([('a/foo', 'a third change')])
183
179
        a_tree.commit(message='a third change')
184
180
 
185
 
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
 
181
        rev_history_a = a_tree.branch.revision_history()
 
182
        self.assertEqual(len(rev_history_a), 3)
186
183
 
187
184
        b_tree.merge_from_branch(a_tree.branch)
188
185
        b_tree.commit(message='merge')
189
186
 
190
 
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
 
187
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
191
188
 
192
189
        os.chdir('b')
193
190
        self.run_bzr('pull --overwrite ../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())
 
191
        rev_history_b = b_tree.branch.revision_history()
 
192
        self.assertEqual(len(rev_history_b), 3)
 
193
 
 
194
        self.assertEqual(rev_history_b, rev_history_a)
197
195
 
198
196
    def test_overwrite_children(self):
199
197
        # Make sure pull --overwrite sets the revision-history
211
209
        self.build_tree_contents([('a/foo', 'a third change')])
212
210
        a_tree.commit(message='a third change')
213
211
 
214
 
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
 
212
        self.assertEqual(len(a_tree.branch.revision_history()), 3)
215
213
 
216
214
        b_tree.merge_from_branch(a_tree.branch)
217
215
        b_tree.commit(message='merge')
218
216
 
219
 
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
 
217
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
220
218
 
221
219
        self.build_tree_contents([('a/foo', 'a fourth change\n')])
222
220
        a_tree.commit(message='a fourth change')
223
221
 
224
 
        rev_info_a = a_tree.branch.last_revision_info()
225
 
        self.assertEqual(rev_info_a[0], 4)
 
222
        rev_history_a = a_tree.branch.revision_history()
 
223
        self.assertEqual(len(rev_history_a), 4)
226
224
 
227
225
        # With convergence, we could just pull over the
228
226
        # new change, but with --overwrite, we want to switch our history
229
227
        os.chdir('b')
230
228
        self.run_bzr('pull --overwrite ../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)
 
229
        rev_history_b = b_tree.branch.revision_history()
 
230
        self.assertEqual(len(rev_history_b), 4)
 
231
 
 
232
        self.assertEqual(rev_history_b, rev_history_a)
234
233
 
235
234
    def test_pull_remember(self):
236
235
        """Pull changes from one branch to another and test parent location."""
305
304
        self.assertEqual(err,
306
305
                ' M  a\nAll changes applied successfully.\n')
307
306
 
308
 
        self.assertEqualDiff(tree_a.branch.last_revision(),
309
 
                             tree_b.branch.last_revision())
 
307
        self.assertEqualDiff(tree_a.branch.revision_history(),
 
308
                             tree_b.branch.revision_history())
310
309
 
311
310
        testament_a = Testament.from_revision(tree_a.branch.repository,
312
311
                                              tree_a.get_parent_ids()[0])
318
317
        # it is legal to attempt to pull an already-merged bundle
319
318
        out, err = self.run_bzr('pull ../bundle')
320
319
        self.assertEqual(err, '')
321
 
        self.assertEqual(out, 'No revisions or tags to pull.\n')
 
320
        self.assertEqual(out, 'No revisions to pull.\n')
322
321
 
323
322
    def test_pull_verbose_no_files(self):
324
323
        """Pull --verbose should not list modified files"""
384
383
        self.assertNotContainsRe(
385
384
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
386
385
 
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
386
    def test_pull_smart_stacked_streaming_acceptance(self):
397
387
        """'bzr pull -r 123' works on stacked, smart branches, even when the
398
388
        revision specified by the revno is only present in the fallback
420
410
        # being too low. If rpc_count increases, more network roundtrips have
421
411
        # become necessary for this use case. Please do not adjust this number
422
412
        # upwards without agreement from bzr's network support maintainers.
423
 
        self.assertLength(19, self.hpss_calls)
 
413
        self.assertLength(18, self.hpss_calls)
424
414
        remote = Branch.open('stacked')
425
415
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
426
 
 
 
416
    
427
417
    def test_pull_cross_format_warning(self):
428
418
        """You get a warning for probably slow cross-format pulls.
429
419
        """
533
523
        out = self.run_bzr(['pull','-d','to','from'],retcode=1)
534
524
        self.assertEqual(out,
535
525
            ('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
 
            """)