← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: v.ladeuil+lp at free
  • Date: 2007-05-18 18:20:31 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070518182031-gbg2cgidv5l20x9p
Takes Robert comments into account.

* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.

* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
21
21
 
22
22
import os
23
23
 
24
 
from bzrlib import merge_directive
25
24
from bzrlib.branch import Branch
26
25
from bzrlib.bzrdir import BzrDir
27
26
from bzrlib.conflicts import ConflictList, ContentsConflict
34
33
class TestMerge(ExternalBase):
35
34
 
36
35
    def example_branch(test):
37
 
        test.run_bzr('init')
 
36
        test.runbzr('init')
38
37
        file('hello', 'wt').write('foo')
39
 
        test.run_bzr('add hello')
40
 
        test.run_bzr('commit -m setup hello')
 
38
        test.runbzr('add hello')
 
39
        test.runbzr('commit -m setup hello')
41
40
        file('goodbye', 'wt').write('baz')
42
 
        test.run_bzr('add goodbye')
43
 
        test.run_bzr('commit -m setup goodbye')
 
41
        test.runbzr('add goodbye')
 
42
        test.runbzr('commit -m setup goodbye')
44
43
 
45
44
    def test_merge_reprocess(self):
46
45
        d = BzrDir.create_standalone_workingtree('.')
47
46
        d.commit('h')
48
 
        self.run_bzr('merge . --reprocess --merge-type weave')
 
47
        self.run_bzr('merge', '.', '--reprocess', '--merge-type', 'weave')
49
48
 
50
49
    def test_merge(self):
51
50
        from bzrlib.branch import Branch
55
54
        self.example_branch()
56
55
        ancestor = Branch.open('.').revno()
57
56
        os.chdir('..')
58
 
        self.run_bzr('branch a b')
 
57
        self.runbzr('branch a b')
59
58
        os.chdir('b')
60
59
        file('goodbye', 'wt').write('quux')
61
 
        self.run_bzr(['commit',  '-m',  "more u's are always good"])
 
60
        self.runbzr(['commit',  '-m',  "more u's are always good"])
62
61
 
63
62
        os.chdir('../a')
64
63
        file('hello', 'wt').write('quuux')
65
64
        # We can't merge when there are in-tree changes
66
 
        self.run_bzr('merge ../b', retcode=3)
 
65
        self.runbzr('merge ../b', retcode=3)
67
66
        a = WorkingTree.open('.')
68
67
        a_tip = a.commit("Like an epidemic of u's")
69
 
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
 
68
        self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
70
69
                    retcode=3)
71
 
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
72
 
        self.run_bzr('revert --no-backup')
73
 
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
74
 
        self.run_bzr('revert --no-backup')
75
 
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
76
 
        self.run_bzr('revert --no-backup')
77
 
        self.run_bzr('merge ../b -r last:1')
 
70
        self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
 
71
        self.runbzr('revert --no-backup')
 
72
        self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
 
73
        self.runbzr('revert --no-backup')
 
74
        self.runbzr('merge ../b -r last:1..last:1 --reprocess')
 
75
        self.runbzr('revert --no-backup')
 
76
        self.runbzr('merge ../b -r last:1')
78
77
        self.check_file_contents('goodbye', 'quux')
79
78
        # Merging a branch pulls its revision into the tree
80
79
        b = Branch.open('../b')
81
80
        b_tip = b.last_revision()
82
81
        self.failUnless(a.branch.repository.has_revision(b_tip))
83
82
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
84
 
        self.run_bzr('revert --no-backup')
85
 
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
 
83
        self.runbzr('revert --no-backup')
 
84
        out, err = self.runbzr('merge -r revno:1:./hello', retcode=3)
86
85
        self.assertTrue("Not a branch" in err)
87
 
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
 
86
        self.runbzr('merge -r revno:%d:./..revno:%d:../b'
88
87
                    %(ancestor,b.revno()))
89
88
        self.assertEquals(a.get_parent_ids(), 
90
89
                          [a.branch.last_revision(), b.last_revision()])
91
90
        self.check_file_contents('goodbye', 'quux')
92
 
        self.run_bzr('revert --no-backup')
93
 
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
 
91
        self.runbzr('revert --no-backup')
 
92
        self.runbzr('merge -r revno:%d:../b'%b.revno())
94
93
        self.assertEquals(a.get_parent_ids(),
95
94
                          [a.branch.last_revision(), b.last_revision()])
96
95
        a_tip = a.commit('merged')
97
 
        self.run_bzr('merge ../b -r last:1')
 
96
        self.runbzr('merge ../b -r last:1')
98
97
        self.assertEqual([a_tip], a.get_parent_ids())
99
98
 
100
99
    def test_merge_with_missing_file(self):
105
104
        print >> file('sub/a.txt', 'wb'), "hello"
106
105
        print >> file('b.txt', 'wb'), "hello"
107
106
        print >> file('sub/c.txt', 'wb'), "hello"
108
 
        self.run_bzr('init')
109
 
        self.run_bzr('add')
110
 
        self.run_bzr(['commit', '-m', 'added a'])
111
 
        self.run_bzr('branch . ../b')
 
107
        self.runbzr('init')
 
108
        self.runbzr('add')
 
109
        self.runbzr(('commit', '-m', 'added a'))
 
110
        self.runbzr('branch . ../b')
112
111
        print >> file('sub/a.txt', 'ab'), "there"
113
112
        print >> file('b.txt', 'ab'), "there"
114
113
        print >> file('sub/c.txt', 'ab'), "there"
115
 
        self.run_bzr(['commit', '-m', 'Added there'])
 
114
        self.runbzr(('commit', '-m', 'Added there'))
116
115
        os.unlink('sub/a.txt')
117
116
        os.unlink('sub/c.txt')
118
117
        os.rmdir('sub')
119
118
        os.unlink('b.txt')
120
 
        self.run_bzr(['commit', '-m', 'Removed a.txt'])
 
119
        self.runbzr(('commit', '-m', 'Removed a.txt'))
121
120
        os.chdir('../b')
122
121
        print >> file('sub/a.txt', 'ab'), "something"
123
122
        print >> file('b.txt', 'ab'), "something"
124
123
        print >> file('sub/c.txt', 'ab'), "something"
125
 
        self.run_bzr(['commit', '-m', 'Modified a.txt'])
126
 
        self.run_bzr('merge ../a/', retcode=1)
 
124
        self.runbzr(('commit', '-m', 'Modified a.txt'))
 
125
        self.runbzr('merge ../a/', retcode=1)
127
126
        self.assert_(os.path.exists('sub/a.txt.THIS'))
128
127
        self.assert_(os.path.exists('sub/a.txt.BASE'))
129
128
        os.chdir('../a')
130
 
        self.run_bzr('merge ../b/', retcode=1)
 
129
        self.runbzr('merge ../b/', retcode=1)
131
130
        self.assert_(os.path.exists('sub/a.txt.OTHER'))
132
131
        self.assert_(os.path.exists('sub/a.txt.BASE'))
133
132
 
154
153
        self.assertEqual(None, branch_b.get_parent())
155
154
        # test merge for failure without parent set
156
155
        os.chdir('branch_b')
157
 
        out = self.run_bzr('merge', retcode=3)
 
156
        out = self.runbzr('merge', retcode=3)
158
157
        self.assertEquals(out,
159
158
                ('','bzr: ERROR: No location specified or remembered\n'))
160
159
        # test implicit --remember when no parent set, this merge conflicts
161
160
        self.build_tree(['d'])
162
161
        tree_b.add('d')
163
 
        out = self.run_bzr('merge ../branch_a', retcode=3)
 
162
        out = self.runbzr('merge ../branch_a', retcode=3)
164
163
        self.assertEquals(out,
165
164
                ('','bzr: ERROR: Working tree has uncommitted changes.\n'))
166
165
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
167
166
        # test implicit --remember after resolving conflict
168
167
        tree_b.commit('commit d')
169
 
        out, err = self.run_bzr('merge')
 
168
        out, err = self.runbzr('merge')
170
169
        
171
170
        base = urlutils.local_path_from_url(branch_a.base)
172
171
        self.assertEquals(out, 'Merging from remembered location %s\n' % (base,))
173
172
        self.assertEquals(err, '+N  b\nAll changes applied successfully.\n')
174
173
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
175
 
        # re-open tree as external run_bzr modified it
 
174
        # re-open tree as external runbzr modified it
176
175
        tree_b = branch_b.bzrdir.open_workingtree()
177
176
        tree_b.commit('merge branch_a')
178
177
        # test explicit --remember
179
 
        out, err = self.run_bzr('merge ../branch_c --remember')
 
178
        out, err = self.runbzr('merge ../branch_c --remember')
180
179
        self.assertEquals(out, '')
181
180
        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')
182
181
        self.assertEquals(abspath(branch_b.get_parent()),
183
182
                          abspath(branch_c.bzrdir.root_transport.base))
184
 
        # re-open tree as external run_bzr modified it
 
183
        # re-open tree as external runbzr modified it
185
184
        tree_b = branch_b.bzrdir.open_workingtree()
186
185
        tree_b.commit('merge branch_c')
187
186
 
205
204
        f.close()
206
205
        tree_b.commit('message')
207
206
        os.chdir('branch_b')
208
 
        file('../bundle', 'wb').write(self.run_bzr('bundle ../branch_a')[0])
 
207
        file('../bundle', 'wb').write(self.runbzr('bundle ../branch_a')[0])
209
208
        os.chdir('../branch_a')
210
 
        self.run_bzr('merge ../bundle', retcode=1)
 
209
        self.runbzr('merge ../bundle', retcode=1)
211
210
        testament_a = Testament.from_revision(tree_a.branch.repository,
212
211
                                              tree_b.get_parent_ids()[0])
213
212
        testament_b = Testament.from_revision(tree_b.branch.repository,
217
216
        tree_a.set_conflicts(ConflictList())
218
217
        tree_a.commit('message')
219
218
        # it is legal to attempt to merge an already-merged bundle
220
 
        output = self.run_bzr('merge ../bundle')[1]
 
219
        output = self.runbzr('merge ../bundle')[1]
221
220
        # but it does nothing
222
221
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
223
222
        self.assertEqual('Nothing to do.\n', output)
234
233
        tree_a.commit('commit 2')
235
234
        tree_a.rename_one('file_2', 'file_ii')
236
235
        ## os.chdir('b')
237
 
        self.run_bzr('merge a --uncommitted -d b')
 
236
        self.run_bzr('merge', 'a', '--uncommitted', '-d', 'b')
238
237
        self.failUnlessExists('b/file_1')
239
238
        self.failUnlessExists('b/file_ii')
240
239
        tree_b.revert([])
241
240
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
242
 
                           'merge /a --uncommitted -r1 -d b')
 
241
                           'merge', '/a', '--uncommitted', '-r1',
 
242
                           '-d', 'b')
243
243
 
244
244
    def pullable_branch(self):
245
245
        os.mkdir('a')
246
246
        os.chdir('a')
247
247
        self.example_branch()
248
248
        os.chdir('..')
249
 
        self.run_bzr('branch a b')
 
249
        self.runbzr('branch a b')
250
250
        os.chdir('b')
251
251
        file('goodbye', 'wt').write('quux')
252
 
        self.run_bzr(['commit', '-m', "mode u's are always good"])
 
252
        self.runbzr(['commit', '-m', "mode u's are always good"])
253
253
        os.chdir('../a')
254
254
 
255
255
    def pullable_branch(self):
266
266
    def test_merge_pull(self):
267
267
        self.pullable_branch()
268
268
        os.chdir('a')
269
 
        (out, err) = self.run_bzr('merge --pull ../b')
 
269
        (out, err) = self.run_bzr('merge', '--pull', '../b')
270
270
        self.assertContainsRe(err, 'Now on revision 2\\.')
271
271
        tree_a = WorkingTree.open('.')
272
272
        self.assertEqual([self.id2], tree_a.get_parent_ids())
281
281
        self.build_tree(['tree_a/file/'])
282
282
        tree_a.commit('changed file to directory')
283
283
        os.chdir('tree_b')
284
 
        self.run_bzr('merge ../tree_a')
 
284
        self.run_bzr('merge', '../tree_a')
285
285
        self.assertEqual('directory', file_kind('file'))
286
286
        tree_b.revert([])
287
287
        self.assertEqual('file', file_kind('file'))
288
288
        self.build_tree_contents([('file', 'content_2')])
289
289
        tree_b.commit('content change')
290
 
        self.run_bzr('merge ../tree_a', retcode=1)
 
290
        self.run_bzr('merge', '../tree_a', retcode=1)
291
291
        self.assertEqual(tree_b.conflicts(),
292
292
                         [ContentsConflict('file', file_id='file-id')])
293
 
 
294
 
    def test_directive_cherrypick(self):
295
 
        source = self.make_branch_and_tree('source')
296
 
        self.build_tree(['source/a'])
297
 
        source.add('a')
298
 
        source.commit('Added a', rev_id='rev1')
299
 
        self.build_tree(['source/b'])
300
 
        source.add('b')
301
 
        source.commit('Added b', rev_id='rev2')
302
 
        target = self.make_branch_and_tree('target')
303
 
        target.commit('empty commit')
304
 
        self.write_directive('directive', source.branch, 'target', 'rev2',
305
 
                             'rev1')
306
 
        self.run_bzr('merge -d target directive')
307
 
        self.failIfExists('target/a')
308
 
        self.failUnlessExists('target/b')
309
 
 
310
 
    def write_directive(self, filename, source, target, revision_id,
311
 
                        base_revision_id=None, mangle_patch=False):
312
 
        md = merge_directive.MergeDirective2.from_objects(
313
 
            source.repository, revision_id, 0, 0, target,
314
 
            base_revision_id=base_revision_id)
315
 
        if mangle_patch:
316
 
            md.patch = 'asdf\n'
317
 
        self.build_tree_contents([(filename, ''.join(md.to_lines()))])
318
 
 
319
 
    def test_directive_verify_warning(self):
320
 
        source = self.make_branch_and_tree('source')
321
 
        self.build_tree(['source/a'])
322
 
        source.add('a')
323
 
        source.commit('Added a', rev_id='rev1')
324
 
        target = self.make_branch_and_tree('target')
325
 
        target.commit('empty commit')
326
 
        self.write_directive('directive', source.branch, 'target', 'rev1')
327
 
        err = self.run_bzr('merge -d target directive')[1]
328
 
        self.assertNotContainsRe(err, 'Preview patch does not match changes')
329
 
        target.revert([])
330
 
        self.write_directive('directive', source.branch, 'target', 'rev1',
331
 
                             mangle_patch=True)
332
 
        err = self.run_bzr('merge -d target directive')[1]
333
 
        self.assertContainsRe(err, 'Preview patch does not match changes')