← 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: Andrew Bennetts
  • Date: 2010-10-13 00:26:41 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101013002641-9tlh9k89mlj1666m
Keep docs-plain working.

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
 
30
29
from bzrlib.branch import Branch
31
30
from bzrlib.directory_service import directories
32
31
from bzrlib.osutils import pathjoin
33
 
from bzrlib.tests import (
34
 
    fixtures,
35
 
    script,
36
 
    )
 
32
from bzrlib.tests import TestCaseWithTransport
37
33
from bzrlib.uncommit import uncommit
38
34
from bzrlib.workingtree import WorkingTree
39
35
 
40
36
 
41
 
class TestPull(tests.TestCaseWithTransport):
 
37
class TestPull(TestCaseWithTransport):
42
38
 
43
39
    def example_branch(self, path='.'):
44
40
        tree = self.make_branch_and_tree(path)
54
50
    def test_pull(self):
55
51
        """Pull changes from one branch to another."""
56
52
        a_tree = self.example_branch('a')
57
 
        base_rev = a_tree.branch.last_revision()
58
53
        os.chdir('a')
59
54
        self.run_bzr('pull', retcode=3)
60
55
        self.run_bzr('missing', retcode=3)
73
68
        self.run_bzr('pull')
74
69
        os.mkdir('subdir')
75
70
        b_tree.add('subdir')
76
 
        new_rev = b_tree.commit(message='blah', allow_pointless=True)
 
71
        b_tree.commit(message='blah', allow_pointless=True)
77
72
 
78
73
        os.chdir('..')
79
74
        a = Branch.open('a')
80
75
        b = Branch.open('b')
81
 
        self.assertEqual(a.last_revision(), base_rev)
82
 
        self.assertEqual(b.last_revision(), new_rev)
 
76
        self.assertEqual(a.revision_history(), b.revision_history()[:-1])
83
77
 
84
78
        os.chdir('a')
85
79
        self.run_bzr('pull ../b')
86
 
        self.assertEqual(a.last_revision(), b.last_revision())
 
80
        self.assertEqual(a.revision_history(), b.revision_history())
87
81
        a_tree.commit(message='blah2', allow_pointless=True)
88
82
        b_tree.commit(message='blah3', allow_pointless=True)
89
83
        # no overwrite
94
88
        os.chdir('overwriteme')
95
89
        self.run_bzr('pull --overwrite ../a')
96
90
        overwritten = Branch.open('.')
97
 
        self.assertEqual(overwritten.last_revision(),
98
 
                         a.last_revision())
 
91
        self.assertEqual(overwritten.revision_history(),
 
92
                         a.revision_history())
99
93
        a_tree.merge_from_branch(b_tree.branch)
100
94
        a_tree.commit(message="blah4", allow_pointless=True)
101
95
        os.chdir('../b/subdir')
102
96
        self.run_bzr('pull ../../a')
103
 
        self.assertEqual(a.last_revision(), b.last_revision())
 
97
        self.assertEqual(a.revision_history()[-1], b.revision_history()[-1])
104
98
        sub_tree = WorkingTree.open_containing('.')[0]
105
99
        sub_tree.commit(message="blah5", allow_pointless=True)
106
100
        sub_tree.commit(message="blah6", allow_pointless=True)
146
140
        self.run_bzr('pull -r 3')
147
141
        self.assertEqual(b.revno(),3)
148
142
        self.run_bzr('pull -r 4')
149
 
        self.assertEqual(a.last_revision(), b.last_revision())
 
143
        self.assertEqual(a.revision_history(), b.revision_history())
150
144
 
151
 
    def test_pull_tags(self):
152
 
        """Tags are updated by pull, and revisions named in those tags are
153
 
        fetched.
154
 
        """
155
 
        # Make a source, sprout a target off it
156
 
        builder = self.make_branch_builder('source')
157
 
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
158
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
159
 
        target_bzrdir = source.bzrdir.sprout('target')
160
 
        source.tags.set_tag('tag-a', 'rev-2')
161
 
        # Pull from source
162
 
        self.run_bzr('pull -d target source')
163
 
        target = target_bzrdir.open_branch()
164
 
        # The tag is present, and so is its revision.
165
 
        self.assertEqual('rev-2', target.tags.lookup_tag('tag-a'))
166
 
        target.repository.get_revision('rev-2')
167
145
 
168
146
    def test_overwrite_uptodate(self):
169
147
        # Make sure pull --overwrite overwrites
182
160
        self.build_tree_contents([('a/foo', 'a third change')])
183
161
        a_tree.commit(message='a third change')
184
162
 
185
 
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
 
163
        rev_history_a = a_tree.branch.revision_history()
 
164
        self.assertEqual(len(rev_history_a), 3)
186
165
 
187
166
        b_tree.merge_from_branch(a_tree.branch)
188
167
        b_tree.commit(message='merge')
189
168
 
190
 
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
 
169
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
191
170
 
192
171
        os.chdir('b')
193
172
        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())
 
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)
197
177
 
198
178
    def test_overwrite_children(self):
199
179
        # Make sure pull --overwrite sets the revision-history
211
191
        self.build_tree_contents([('a/foo', 'a third change')])
212
192
        a_tree.commit(message='a third change')
213
193
 
214
 
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
 
194
        self.assertEqual(len(a_tree.branch.revision_history()), 3)
215
195
 
216
196
        b_tree.merge_from_branch(a_tree.branch)
217
197
        b_tree.commit(message='merge')
218
198
 
219
 
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
 
199
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
220
200
 
221
201
        self.build_tree_contents([('a/foo', 'a fourth change\n')])
222
202
        a_tree.commit(message='a fourth change')
223
203
 
224
 
        rev_info_a = a_tree.branch.last_revision_info()
225
 
        self.assertEqual(rev_info_a[0], 4)
 
204
        rev_history_a = a_tree.branch.revision_history()
 
205
        self.assertEqual(len(rev_history_a), 4)
226
206
 
227
207
        # With convergence, we could just pull over the
228
208
        # new change, but with --overwrite, we want to switch our history
229
209
        os.chdir('b')
230
210
        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)
 
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)
234
215
 
235
216
    def test_pull_remember(self):
236
217
        """Pull changes from one branch to another and test parent location."""
305
286
        self.assertEqual(err,
306
287
                ' M  a\nAll changes applied successfully.\n')
307
288
 
308
 
        self.assertEqualDiff(tree_a.branch.last_revision(),
309
 
                             tree_b.branch.last_revision())
 
289
        self.assertEqualDiff(tree_a.branch.revision_history(),
 
290
                             tree_b.branch.revision_history())
310
291
 
311
292
        testament_a = Testament.from_revision(tree_a.branch.repository,
312
293
                                              tree_a.get_parent_ids()[0])
318
299
        # it is legal to attempt to pull an already-merged bundle
319
300
        out, err = self.run_bzr('pull ../bundle')
320
301
        self.assertEqual(err, '')
321
 
        self.assertEqual(out, 'No revisions or tags to pull.\n')
 
302
        self.assertEqual(out, 'No revisions to pull.\n')
322
303
 
323
304
    def test_pull_verbose_no_files(self):
324
305
        """Pull --verbose should not list modified files"""
384
365
        self.assertNotContainsRe(
385
366
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
386
367
 
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
368
    def test_pull_smart_stacked_streaming_acceptance(self):
397
369
        """'bzr pull -r 123' works on stacked, smart branches, even when the
398
370
        revision specified by the revno is only present in the fallback
420
392
        # being too low. If rpc_count increases, more network roundtrips have
421
393
        # become necessary for this use case. Please do not adjust this number
422
394
        # upwards without agreement from bzr's network support maintainers.
423
 
        self.assertLength(19, self.hpss_calls)
 
395
        self.assertLength(18, self.hpss_calls)
424
396
        remote = Branch.open('stacked')
425
397
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
426
 
 
 
398
    
427
399
    def test_pull_cross_format_warning(self):
428
400
        """You get a warning for probably slow cross-format pulls.
429
401
        """
523
495
        self.assertEqual(out,
524
496
                         ('','bzr: ERROR: Need working tree for --show-base.\n'))
525
497
 
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', ''))
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
 
            """)
 
498