← 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: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

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,
26
27
    urlutils,
27
28
    )
28
29
 
31
32
from bzrlib.osutils import pathjoin
32
33
from bzrlib.tests import (
33
34
    fixtures,
34
 
    TestCaseWithTransport,
 
35
    script,
35
36
    )
36
37
from bzrlib.uncommit import uncommit
37
38
from bzrlib.workingtree import WorkingTree
38
39
 
39
40
 
40
 
class TestPull(TestCaseWithTransport):
 
41
class TestPull(tests.TestCaseWithTransport):
41
42
 
42
43
    def example_branch(self, path='.'):
43
44
        tree = self.make_branch_and_tree(path)
53
54
    def test_pull(self):
54
55
        """Pull changes from one branch to another."""
55
56
        a_tree = self.example_branch('a')
 
57
        base_rev = a_tree.branch.last_revision()
56
58
        os.chdir('a')
57
59
        self.run_bzr('pull', retcode=3)
58
60
        self.run_bzr('missing', retcode=3)
71
73
        self.run_bzr('pull')
72
74
        os.mkdir('subdir')
73
75
        b_tree.add('subdir')
74
 
        b_tree.commit(message='blah', allow_pointless=True)
 
76
        new_rev = b_tree.commit(message='blah', allow_pointless=True)
75
77
 
76
78
        os.chdir('..')
77
79
        a = Branch.open('a')
78
80
        b = Branch.open('b')
79
 
        self.assertEqual(a.revision_history(), b.revision_history()[:-1])
 
81
        self.assertEqual(a.last_revision(), base_rev)
 
82
        self.assertEqual(b.last_revision(), new_rev)
80
83
 
81
84
        os.chdir('a')
82
85
        self.run_bzr('pull ../b')
83
 
        self.assertEqual(a.revision_history(), b.revision_history())
 
86
        self.assertEqual(a.last_revision(), b.last_revision())
84
87
        a_tree.commit(message='blah2', allow_pointless=True)
85
88
        b_tree.commit(message='blah3', allow_pointless=True)
86
89
        # no overwrite
91
94
        os.chdir('overwriteme')
92
95
        self.run_bzr('pull --overwrite ../a')
93
96
        overwritten = Branch.open('.')
94
 
        self.assertEqual(overwritten.revision_history(),
95
 
                         a.revision_history())
 
97
        self.assertEqual(overwritten.last_revision(),
 
98
                         a.last_revision())
96
99
        a_tree.merge_from_branch(b_tree.branch)
97
100
        a_tree.commit(message="blah4", allow_pointless=True)
98
101
        os.chdir('../b/subdir')
99
102
        self.run_bzr('pull ../../a')
100
 
        self.assertEqual(a.revision_history()[-1], b.revision_history()[-1])
 
103
        self.assertEqual(a.last_revision(), b.last_revision())
101
104
        sub_tree = WorkingTree.open_containing('.')[0]
102
105
        sub_tree.commit(message="blah5", allow_pointless=True)
103
106
        sub_tree.commit(message="blah6", allow_pointless=True)
143
146
        self.run_bzr('pull -r 3')
144
147
        self.assertEqual(b.revno(),3)
145
148
        self.run_bzr('pull -r 4')
146
 
        self.assertEqual(a.revision_history(), b.revision_history())
 
149
        self.assertEqual(a.last_revision(), b.last_revision())
147
150
 
148
151
    def test_pull_tags(self):
149
152
        """Tags are updated by pull, and revisions named in those tags are
152
155
        # Make a source, sprout a target off it
153
156
        builder = self.make_branch_builder('source')
154
157
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
155
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
158
        source.get_config_stack().set('branch.fetch_tags', True)
156
159
        target_bzrdir = source.bzrdir.sprout('target')
157
160
        source.tags.set_tag('tag-a', 'rev-2')
158
161
        # Pull from source
179
182
        self.build_tree_contents([('a/foo', 'a third change')])
180
183
        a_tree.commit(message='a third change')
181
184
 
182
 
        rev_history_a = a_tree.branch.revision_history()
183
 
        self.assertEqual(len(rev_history_a), 3)
 
185
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
184
186
 
185
187
        b_tree.merge_from_branch(a_tree.branch)
186
188
        b_tree.commit(message='merge')
187
189
 
188
 
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
 
190
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
189
191
 
190
192
        os.chdir('b')
191
193
        self.run_bzr('pull --overwrite ../a')
192
 
        rev_history_b = b_tree.branch.revision_history()
193
 
        self.assertEqual(len(rev_history_b), 3)
194
 
 
195
 
        self.assertEqual(rev_history_b, rev_history_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())
196
197
 
197
198
    def test_overwrite_children(self):
198
199
        # Make sure pull --overwrite sets the revision-history
210
211
        self.build_tree_contents([('a/foo', 'a third change')])
211
212
        a_tree.commit(message='a third change')
212
213
 
213
 
        self.assertEqual(len(a_tree.branch.revision_history()), 3)
 
214
        self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
214
215
 
215
216
        b_tree.merge_from_branch(a_tree.branch)
216
217
        b_tree.commit(message='merge')
217
218
 
218
 
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
 
219
        self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
219
220
 
220
221
        self.build_tree_contents([('a/foo', 'a fourth change\n')])
221
222
        a_tree.commit(message='a fourth change')
222
223
 
223
 
        rev_history_a = a_tree.branch.revision_history()
224
 
        self.assertEqual(len(rev_history_a), 4)
 
224
        rev_info_a = a_tree.branch.last_revision_info()
 
225
        self.assertEqual(rev_info_a[0], 4)
225
226
 
226
227
        # With convergence, we could just pull over the
227
228
        # new change, but with --overwrite, we want to switch our history
228
229
        os.chdir('b')
229
230
        self.run_bzr('pull --overwrite ../a')
230
 
        rev_history_b = b_tree.branch.revision_history()
231
 
        self.assertEqual(len(rev_history_b), 4)
232
 
 
233
 
        self.assertEqual(rev_history_b, rev_history_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)
234
234
 
235
235
    def test_pull_remember(self):
236
236
        """Pull changes from one branch to another and test parent location."""
305
305
        self.assertEqual(err,
306
306
                ' M  a\nAll changes applied successfully.\n')
307
307
 
308
 
        self.assertEqualDiff(tree_a.branch.revision_history(),
309
 
                             tree_b.branch.revision_history())
 
308
        self.assertEqualDiff(tree_a.branch.last_revision(),
 
309
                             tree_b.branch.last_revision())
310
310
 
311
311
        testament_a = Testament.from_revision(tree_a.branch.repository,
312
312
                                              tree_a.get_parent_ids()[0])
318
318
        # it is legal to attempt to pull an already-merged bundle
319
319
        out, err = self.run_bzr('pull ../bundle')
320
320
        self.assertEqual(err, '')
321
 
        self.assertEqual(out, 'No revisions to pull.\n')
 
321
        self.assertEqual(out, 'No revisions or tags to pull.\n')
322
322
 
323
323
    def test_pull_verbose_no_files(self):
324
324
        """Pull --verbose should not list modified files"""
421
421
        # become necessary for this use case. Please do not adjust this number
422
422
        # upwards without agreement from bzr's network support maintainers.
423
423
        self.assertLength(19, self.hpss_calls)
 
424
        self.assertLength(1, self.hpss_connections)
424
425
        remote = Branch.open('stacked')
425
426
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
426
 
    
 
427
 
427
428
    def test_pull_cross_format_warning(self):
428
429
        """You get a warning for probably slow cross-format pulls.
429
430
        """
533
534
        out = self.run_bzr(['pull','-d','to','from'],retcode=1)
534
535
        self.assertEqual(out,
535
536
            ('No revisions to pull.\nConflicting tags:\n    mytag\n', ''))
 
537
 
 
538
    def test_pull_tag_notification(self):
 
539
        """pulling tags with conflicts will change the exit code"""
 
540
        # create a branch, see that --show-base fails
 
541
        from_tree = self.make_branch_and_tree('from')
 
542
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
543
        to_tree = self.make_branch_and_tree('to')
 
544
        out = self.run_bzr(['pull', '-d', 'to', 'from'])
 
545
        self.assertEqual(out,
 
546
            ('1 tag(s) updated.\n', ''))
 
547
 
 
548
    def test_pull_tag_overwrite(self):
 
549
        """pulling tags with --overwrite only reports changed tags."""
 
550
        # create a branch, see that --show-base fails
 
551
        from_tree = self.make_branch_and_tree('from')
 
552
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
553
        to_tree = self.make_branch_and_tree('to')
 
554
        to_tree.branch.tags.set_tag("mytag", "somerevid")
 
555
        out = self.run_bzr(['pull', '--overwrite', '-d', 'to', 'from'])
 
556
        self.assertEqual(out,
 
557
            ('No revisions or tags to pull.\n', ''))
 
558
 
 
559
 
 
560
class TestPullOutput(script.TestCaseWithTransportAndScript):
 
561
 
 
562
    def test_pull_log_format(self):
 
563
        self.run_script("""
 
564
            $ bzr init trunk
 
565
            Created a standalone tree (format: 2a)
 
566
            $ cd trunk
 
567
            $ echo foo > file
 
568
            $ bzr add
 
569
            adding file
 
570
            $ bzr commit -m 'we need some foo'
 
571
            2>Committing to:...trunk/
 
572
            2>added file
 
573
            2>Committed revision 1.
 
574
            $ cd ..
 
575
            $ bzr init feature
 
576
            Created a standalone tree (format: 2a)
 
577
            $ cd feature
 
578
            $ bzr pull -v ../trunk -Olog_format=line
 
579
            Now on revision 1.
 
580
            Added Revisions:
 
581
            1: jrandom@example.com ...we need some foo
 
582
            2>+N  file
 
583
            2>All changes applied successfully.
 
584
            """)