← 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: Canonical.com Patch Queue Manager
  • Date: 2007-09-20 02:40:52 UTC
  • mfrom: (2835.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070920024052-y2l7r5o00zrpnr73
No longer propagate index differences automatically (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
# -*- coding: utf-8 -*-
3
 
 
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
6
5
# the Free Software Foundation; either version 2 of the License, or
7
6
# (at your option) any later version.
8
 
 
 
7
#
9
8
# This program is distributed in the hope that it will be useful,
10
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
11
# GNU General Public License for more details.
13
 
 
 
12
#
14
13
# You should have received a copy of the GNU General Public License
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
22
21
import sys
23
22
 
24
23
from bzrlib.branch import Branch
25
 
from bzrlib.osutils import abspath
 
24
from bzrlib.osutils import pathjoin
26
25
from bzrlib.tests.blackbox import ExternalBase
27
26
from bzrlib.uncommit import uncommit
 
27
from bzrlib.workingtree import WorkingTree
 
28
from bzrlib import urlutils
28
29
 
29
30
 
30
31
class TestPull(ExternalBase):
31
32
 
32
 
    def example_branch(test):
33
 
        test.runbzr('init')
34
 
        file('hello', 'wt').write('foo')
35
 
        test.runbzr('add hello')
36
 
        test.runbzr('commit -m setup hello')
37
 
        file('goodbye', 'wt').write('baz')
38
 
        test.runbzr('add goodbye')
39
 
        test.runbzr('commit -m setup goodbye')
 
33
    def example_branch(self, path='.'):
 
34
        tree = self.make_branch_and_tree(path)
 
35
        self.build_tree_contents([
 
36
            (pathjoin(path, 'hello'),   'foo'),
 
37
            (pathjoin(path, 'goodbye'), 'baz')])
 
38
        tree.add('hello')
 
39
        tree.commit(message='setup')
 
40
        tree.add('goodbye')
 
41
        tree.commit(message='setup')
 
42
        return tree
40
43
 
41
44
    def test_pull(self):
42
45
        """Pull changes from one branch to another."""
43
 
        os.mkdir('a')
 
46
        a_tree = self.example_branch('a')
44
47
        os.chdir('a')
45
 
 
46
 
        self.example_branch()
47
 
        self.runbzr('pull', retcode=3)
48
 
        self.runbzr('missing', retcode=3)
49
 
        self.runbzr('missing .')
50
 
        self.runbzr('missing')
 
48
        self.run_bzr('pull', retcode=3)
 
49
        self.run_bzr('missing', retcode=3)
 
50
        self.run_bzr('missing .')
 
51
        self.run_bzr('missing')
51
52
        # this will work on windows because we check for the same branch
52
53
        # in pull - if it fails, it is a regression
53
 
        self.runbzr('pull')
54
 
        self.runbzr('pull /', retcode=3)
 
54
        self.run_bzr('pull')
 
55
        self.run_bzr('pull /', retcode=3)
55
56
        if sys.platform not in ('win32', 'cygwin'):
56
 
            self.runbzr('pull')
 
57
            self.run_bzr('pull')
57
58
 
58
59
        os.chdir('..')
59
 
        self.runbzr('branch a b')
 
60
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
60
61
        os.chdir('b')
61
 
        self.runbzr('pull')
 
62
        self.run_bzr('pull')
62
63
        os.mkdir('subdir')
63
 
        self.runbzr('add subdir')
64
 
        self.runbzr('commit -m blah --unchanged')
65
 
        os.chdir('../a')
66
 
        a = Branch.open('.')
67
 
        b = Branch.open('../b')
68
 
        self.assertEquals(a.revision_history(), b.revision_history()[:-1])
69
 
        self.runbzr('pull ../b')
70
 
        self.assertEquals(a.revision_history(), b.revision_history())
71
 
        self.runbzr('commit -m blah2 --unchanged')
72
 
        os.chdir('../b')
73
 
        self.runbzr('commit -m blah3 --unchanged')
 
64
        b_tree.add('subdir')
 
65
        b_tree.commit(message='blah', allow_pointless=True)
 
66
 
 
67
        os.chdir('..')
 
68
        a = Branch.open('a')
 
69
        b = Branch.open('b')
 
70
        self.assertEqual(a.revision_history(), b.revision_history()[:-1])
 
71
 
 
72
        os.chdir('a')
 
73
        self.run_bzr('pull ../b')
 
74
        self.assertEqual(a.revision_history(), b.revision_history())
 
75
        a_tree.commit(message='blah2', allow_pointless=True)
 
76
        b_tree.commit(message='blah3', allow_pointless=True)
74
77
        # no overwrite
75
 
        self.runbzr('pull ../a', retcode=3)
 
78
        os.chdir('../b')
 
79
        self.run_bzr('pull ../a', retcode=3)
76
80
        os.chdir('..')
77
 
        self.runbzr('branch b overwriteme')
 
81
        b_tree.bzrdir.sprout('overwriteme')
78
82
        os.chdir('overwriteme')
79
 
        self.runbzr('pull --overwrite ../a')
 
83
        self.run_bzr('pull --overwrite ../a')
80
84
        overwritten = Branch.open('.')
81
85
        self.assertEqual(overwritten.revision_history(),
82
86
                         a.revision_history())
83
 
        os.chdir('../a')
84
 
        self.runbzr('merge ../b')
85
 
        self.runbzr('commit -m blah4 --unchanged')
 
87
        a_tree.merge_from_branch(b_tree.branch)
 
88
        a_tree.commit(message="blah4", allow_pointless=True)
86
89
        os.chdir('../b/subdir')
87
 
        self.runbzr('pull ../../a')
88
 
        self.assertEquals(a.revision_history()[-1], b.revision_history()[-1])
89
 
        self.runbzr('commit -m blah5 --unchanged')
90
 
        self.runbzr('commit -m blah6 --unchanged')
 
90
        self.run_bzr('pull ../../a')
 
91
        self.assertEqual(a.revision_history()[-1], b.revision_history()[-1])
 
92
        sub_tree = WorkingTree.open_containing('.')[0]
 
93
        sub_tree.commit(message="blah5", allow_pointless=True)
 
94
        sub_tree.commit(message="blah6", allow_pointless=True)
91
95
        os.chdir('..')
92
 
        self.runbzr('pull ../a')
 
96
        self.run_bzr('pull ../a')
93
97
        os.chdir('../a')
94
 
        self.runbzr('commit -m blah7 --unchanged')
95
 
        self.runbzr('merge ../b')
96
 
        self.runbzr('commit -m blah8 --unchanged')
97
 
        self.runbzr('pull ../b')
98
 
        self.runbzr('pull ../b')
 
98
        a_tree.commit(message="blah7", allow_pointless=True)
 
99
        a_tree.merge_from_branch(b_tree.branch)
 
100
        a_tree.commit(message="blah8", allow_pointless=True)
 
101
        self.run_bzr('pull ../b')
 
102
        self.run_bzr('pull ../b')
 
103
 
 
104
    def test_pull_dash_d(self):
 
105
        self.example_branch('a')
 
106
        self.make_branch_and_tree('b')
 
107
        self.make_branch_and_tree('c')
 
108
        # pull into that branch
 
109
        self.run_bzr('pull -d b a')
 
110
        # pull into a branch specified by a url
 
111
        c_url = urlutils.local_path_to_url('c')
 
112
        self.assertStartsWith(c_url, 'file://')
 
113
        self.run_bzr(['pull', '-d', c_url, 'a'])
99
114
 
100
115
    def test_pull_revision(self):
101
116
        """Pull some changes from one branch to another."""
102
 
        os.mkdir('a')
103
 
        os.chdir('a')
104
 
 
105
 
        self.example_branch()
106
 
        file('hello2', 'wt').write('foo')
107
 
        self.runbzr('add hello2')
108
 
        self.runbzr('commit -m setup hello2')
109
 
        file('goodbye2', 'wt').write('baz')
110
 
        self.runbzr('add goodbye2')
111
 
        self.runbzr('commit -m setup goodbye2')
112
 
 
113
 
        os.chdir('..')
114
 
        self.runbzr('branch -r 1 a b')
 
117
        a_tree = self.example_branch('a')
 
118
        self.build_tree_contents([
 
119
            ('a/hello2',   'foo'),
 
120
            ('a/goodbye2', 'baz')])
 
121
        a_tree.add('hello2')
 
122
        a_tree.commit(message="setup")
 
123
        a_tree.add('goodbye2')
 
124
        a_tree.commit(message="setup")
 
125
 
 
126
        b_tree = a_tree.bzrdir.sprout('b',
 
127
                   revision_id=a_tree.branch.get_rev_id(1)).open_workingtree()
115
128
        os.chdir('b')
116
 
        self.runbzr('pull -r 2')
 
129
        self.run_bzr('pull -r 2')
117
130
        a = Branch.open('../a')
118
131
        b = Branch.open('.')
119
 
        self.assertEquals(a.revno(),4)
120
 
        self.assertEquals(b.revno(),2)
121
 
        self.runbzr('pull -r 3')
122
 
        self.assertEquals(b.revno(),3)
123
 
        self.runbzr('pull -r 4')
124
 
        self.assertEquals(a.revision_history(), b.revision_history())
 
132
        self.assertEqual(a.revno(),4)
 
133
        self.assertEqual(b.revno(),2)
 
134
        self.run_bzr('pull -r 3')
 
135
        self.assertEqual(b.revno(),3)
 
136
        self.run_bzr('pull -r 4')
 
137
        self.assertEqual(a.revision_history(), b.revision_history())
125
138
 
126
139
 
127
140
    def test_overwrite_uptodate(self):
128
141
        # Make sure pull --overwrite overwrites
129
142
        # even if the target branch has merged
130
143
        # everything already.
131
 
        bzr = self.run_bzr
132
 
 
133
 
        def get_rh(expected_len):
134
 
            rh = self.capture('revision-history')
135
 
            # Make sure we don't have trailing empty revisions
136
 
            rh = rh.strip().split('\n')
137
 
            self.assertEqual(len(rh), expected_len)
138
 
            return rh
139
 
 
140
 
        os.mkdir('a')
141
 
        os.chdir('a')
142
 
        bzr('init')
143
 
        open('foo', 'wb').write('original\n')
144
 
        bzr('add', 'foo')
145
 
        bzr('commit', '-m', 'initial commit')
146
 
 
147
 
        os.chdir('..')
148
 
        bzr('branch', 'a', 'b')
149
 
 
150
 
        os.chdir('a')
151
 
        open('foo', 'wb').write('changed\n')
152
 
        bzr('commit', '-m', 'later change')
153
 
 
154
 
        open('foo', 'wb').write('another\n')
155
 
        bzr('commit', '-m', 'a third change')
156
 
 
157
 
        rev_history_a = get_rh(3)
158
 
 
159
 
        os.chdir('../b')
160
 
        bzr('merge', '../a')
161
 
        bzr('commit', '-m', 'merge')
162
 
 
163
 
        rev_history_b = get_rh(2)
164
 
 
165
 
        bzr('pull', '--overwrite', '../a')
166
 
        rev_history_b = get_rh(3)
 
144
        a_tree = self.make_branch_and_tree('a')
 
145
        self.build_tree_contents([('a/foo', 'original\n')])
 
146
        a_tree.add('foo')
 
147
        a_tree.commit(message='initial commit')
 
148
 
 
149
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
150
 
 
151
        self.build_tree_contents([('a/foo', 'changed\n')])
 
152
        a_tree.commit(message='later change')
 
153
 
 
154
        self.build_tree_contents([('a/foo', 'a third change')])
 
155
        a_tree.commit(message='a third change')
 
156
 
 
157
        rev_history_a = a_tree.branch.revision_history()
 
158
        self.assertEqual(len(rev_history_a), 3)
 
159
 
 
160
        b_tree.merge_from_branch(a_tree.branch)
 
161
        b_tree.commit(message='merge')
 
162
 
 
163
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
 
164
 
 
165
        os.chdir('b')
 
166
        self.run_bzr('pull --overwrite ../a')
 
167
        rev_history_b = b_tree.branch.revision_history()
 
168
        self.assertEqual(len(rev_history_b), 3)
167
169
 
168
170
        self.assertEqual(rev_history_b, rev_history_a)
169
171
 
170
172
    def test_overwrite_children(self):
171
173
        # Make sure pull --overwrite sets the revision-history
172
174
        # to be identical to the pull source, even if we have convergence
173
 
        bzr = self.run_bzr
174
 
 
175
 
        def get_rh(expected_len):
176
 
            rh = self.capture('revision-history')
177
 
            # Make sure we don't have trailing empty revisions
178
 
            rh = rh.strip().split('\n')
179
 
            self.assertEqual(len(rh), expected_len)
180
 
            return rh
181
 
 
182
 
        os.mkdir('a')
183
 
        os.chdir('a')
184
 
        bzr('init')
185
 
        open('foo', 'wb').write('original\n')
186
 
        bzr('add', 'foo')
187
 
        bzr('commit', '-m', 'initial commit')
188
 
 
189
 
        os.chdir('..')
190
 
        bzr('branch', 'a', 'b')
191
 
 
192
 
        os.chdir('a')
193
 
        open('foo', 'wb').write('changed\n')
194
 
        bzr('commit', '-m', 'later change')
195
 
 
196
 
        open('foo', 'wb').write('another\n')
197
 
        bzr('commit', '-m', 'a third change')
198
 
 
199
 
        rev_history_a = get_rh(3)
200
 
 
201
 
        os.chdir('../b')
202
 
        bzr('merge', '../a')
203
 
        bzr('commit', '-m', 'merge')
204
 
 
205
 
        rev_history_b = get_rh(2)
206
 
 
207
 
        os.chdir('../a')
208
 
        open('foo', 'wb').write('a fourth change\n')
209
 
        bzr('commit', '-m', 'a fourth change')
210
 
 
211
 
        rev_history_a = get_rh(4)
 
175
        a_tree = self.make_branch_and_tree('a')
 
176
        self.build_tree_contents([('a/foo', 'original\n')])
 
177
        a_tree.add('foo')
 
178
        a_tree.commit(message='initial commit')
 
179
 
 
180
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
181
 
 
182
        self.build_tree_contents([('a/foo', 'changed\n')])
 
183
        a_tree.commit(message='later change')
 
184
 
 
185
        self.build_tree_contents([('a/foo', 'a third change')])
 
186
        a_tree.commit(message='a third change')
 
187
 
 
188
        self.assertEqual(len(a_tree.branch.revision_history()), 3)
 
189
 
 
190
        b_tree.merge_from_branch(a_tree.branch)
 
191
        b_tree.commit(message='merge')
 
192
 
 
193
        self.assertEqual(len(b_tree.branch.revision_history()), 2)
 
194
 
 
195
        self.build_tree_contents([('a/foo', 'a fourth change\n')])
 
196
        a_tree.commit(message='a fourth change')
 
197
 
 
198
        rev_history_a = a_tree.branch.revision_history()
 
199
        self.assertEqual(len(rev_history_a), 4)
212
200
 
213
201
        # With convergence, we could just pull over the
214
202
        # new change, but with --overwrite, we want to switch our history
215
 
        os.chdir('../b')
216
 
        bzr('pull', '--overwrite', '../a')
217
 
        rev_history_b = get_rh(4)
 
203
        os.chdir('b')
 
204
        self.run_bzr('pull --overwrite ../a')
 
205
        rev_history_b = b_tree.branch.revision_history()
 
206
        self.assertEqual(len(rev_history_b), 4)
218
207
 
219
208
        self.assertEqual(rev_history_b, rev_history_a)
220
209
 
239
228
        self.assertEqual(None, branch_b.get_parent())
240
229
        # test pull for failure without parent set
241
230
        os.chdir('branch_b')
242
 
        out = self.runbzr('pull', retcode=3)
243
 
        self.assertEquals(out,
 
231
        out = self.run_bzr('pull', retcode=3)
 
232
        self.assertEqual(out,
244
233
                ('','bzr: ERROR: No pull location known or specified.\n'))
245
234
        # test implicit --remember when no parent set, this pull conflicts
246
235
        self.build_tree(['d'])
247
236
        tree_b.add('d')
248
237
        tree_b.commit('commit d')
249
 
        out = self.runbzr('pull ../branch_a', retcode=3)
250
 
        self.assertEquals(out,
251
 
                ('','bzr: ERROR: These branches have diverged.  Try merge.\n'))
252
 
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
 
238
        out = self.run_bzr('pull ../branch_a', retcode=3)
 
239
        self.assertEqual(out,
 
240
                ('','bzr: ERROR: These branches have diverged.'
 
241
                    ' Use the merge command to reconcile them.\n'))
 
242
        self.assertEqual(branch_b.get_parent(), parent)
253
243
        # test implicit --remember after resolving previous failure
254
244
        uncommit(branch=branch_b, tree=tree_b)
255
245
        transport.delete('branch_b/d')
256
 
        self.runbzr('pull')
257
 
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
 
246
        self.run_bzr('pull')
 
247
        self.assertEqual(branch_b.get_parent(), parent)
258
248
        # test explicit --remember
259
 
        self.runbzr('pull ../branch_c --remember')
260
 
        self.assertEquals(abspath(branch_b.get_parent()),
261
 
                          abspath(branch_c.bzrdir.root_transport.base))
 
249
        self.run_bzr('pull ../branch_c --remember')
 
250
        self.assertEqual(branch_b.get_parent(),
 
251
                          branch_c.bzrdir.root_transport.base)
 
252
 
 
253
    def test_pull_bundle(self):
 
254
        from bzrlib.testament import Testament
 
255
        # Build up 2 trees and prepare for a pull
 
256
        tree_a = self.make_branch_and_tree('branch_a')
 
257
        f = open('branch_a/a', 'wb')
 
258
        f.write('hello')
 
259
        f.close()
 
260
        tree_a.add('a')
 
261
        tree_a.commit('message')
 
262
 
 
263
        tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
 
264
 
 
265
        # Make a change to 'a' that 'b' can pull
 
266
        f = open('branch_a/a', 'wb')
 
267
        f.write('hey there')
 
268
        f.close()
 
269
        tree_a.commit('message')
 
270
 
 
271
        # Create the bundle for 'b' to pull
 
272
        os.chdir('branch_a')
 
273
        self.run_bzr('bundle ../branch_b -o ../bundle')
 
274
 
 
275
        os.chdir('../branch_b')
 
276
        out, err = self.run_bzr('pull ../bundle')
 
277
        self.assertEqual(out,
 
278
                         'Now on revision 2.\n')
 
279
        self.assertEqual(err,
 
280
                ' M  a\nAll changes applied successfully.\n')
 
281
 
 
282
        self.assertEqualDiff(tree_a.branch.revision_history(),
 
283
                             tree_b.branch.revision_history())
 
284
 
 
285
        testament_a = Testament.from_revision(tree_a.branch.repository,
 
286
                                              tree_a.get_parent_ids()[0])
 
287
        testament_b = Testament.from_revision(tree_b.branch.repository,
 
288
                                              tree_b.get_parent_ids()[0])
 
289
        self.assertEqualDiff(testament_a.as_text(),
 
290
                             testament_b.as_text())
 
291
 
 
292
        # it is legal to attempt to pull an already-merged bundle
 
293
        out, err = self.run_bzr('pull ../bundle')
 
294
        self.assertEqual(err, '')
 
295
        self.assertEqual(out, 'No revisions to pull.\n')
 
296
 
 
297
    def test_pull_verbose_no_files(self):
 
298
        """Pull --verbose should not list modified files"""
 
299
        tree_a = self.make_branch_and_tree('tree_a')
 
300
        self.build_tree(['tree_a/foo'])
 
301
        tree_a.add('foo')
 
302
        tree_a.commit('bar')
 
303
        tree_b = self.make_branch_and_tree('tree_b')
 
304
        out = self.run_bzr('pull --verbose -d tree_b tree_a')[0]
 
305
        self.assertContainsRe(out, 'bar')
 
306
        self.assertNotContainsRe(out, 'added:')
 
307
        self.assertNotContainsRe(out, 'foo')