← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2010-08-02 17:16:12 UTC
  • mto: This revision was merged to the branch mainline in revision 5369.
  • Revision ID: john@arbash-meinel.com-20100802171612-rdh5ods70w2bl3j7
We also have to re-implement it for _simple_set_pyx.pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr branch."""
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import branch, bzrdir
 
22
from bzrlib import (
 
23
    branch,
 
24
    bzrdir,
 
25
    errors,
 
26
    repository,
 
27
    revision as _mod_revision,
 
28
    )
23
29
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
24
 
from bzrlib.tests.blackbox import ExternalBase
 
30
from bzrlib.tests import TestCaseWithTransport
 
31
from bzrlib.tests import (
 
32
    KnownFailure,
 
33
    HardlinkFeature,
 
34
    test_server,
 
35
    )
25
36
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
 
37
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
26
38
from bzrlib.workingtree import WorkingTree
27
39
 
28
40
 
29
 
class TestBranch(ExternalBase):
 
41
class TestBranch(TestCaseWithTransport):
30
42
 
31
43
    def example_branch(self, path='.'):
32
44
        tree = self.make_branch_and_tree(path)
42
54
        self.example_branch('a')
43
55
        self.run_bzr('branch a b')
44
56
        b = branch.Branch.open('b')
45
 
        self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read())
46
57
        self.run_bzr('branch a c -r 1')
 
58
        # previously was erroneously created by branching
 
59
        self.assertFalse(b._transport.has('branch-name'))
47
60
        b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
48
61
 
 
62
    def test_branch_switch_no_branch(self):
 
63
        # No branch in the current directory:
 
64
        #  => new branch will be created, but switch fails
 
65
        self.example_branch('a')
 
66
        self.make_repository('current')
 
67
        self.run_bzr_error(['No WorkingTree exists for'],
 
68
            'branch --switch ../a ../b', working_dir='current')
 
69
        a = branch.Branch.open('a')
 
70
        b = branch.Branch.open('b')
 
71
        self.assertEqual(a.last_revision(), b.last_revision())
 
72
 
 
73
    def test_branch_switch_no_wt(self):
 
74
        # No working tree in the current directory:
 
75
        #  => new branch will be created, but switch fails and the current
 
76
        #     branch is unmodified
 
77
        self.example_branch('a')
 
78
        self.make_branch('current')
 
79
        self.run_bzr_error(['No WorkingTree exists for'],
 
80
            'branch --switch ../a ../b', working_dir='current')
 
81
        a = branch.Branch.open('a')
 
82
        b = branch.Branch.open('b')
 
83
        self.assertEqual(a.last_revision(), b.last_revision())
 
84
        work = branch.Branch.open('current')
 
85
        self.assertEqual(work.last_revision(), _mod_revision.NULL_REVISION)
 
86
 
 
87
    def test_branch_switch_no_checkout(self):
 
88
        # Standalone branch in the current directory:
 
89
        #  => new branch will be created, but switch fails and the current
 
90
        #     branch is unmodified
 
91
        self.example_branch('a')
 
92
        self.make_branch_and_tree('current')
 
93
        self.run_bzr_error(['Cannot switch a branch, only a checkout'],
 
94
            'branch --switch ../a ../b', working_dir='current')
 
95
        a = branch.Branch.open('a')
 
96
        b = branch.Branch.open('b')
 
97
        self.assertEqual(a.last_revision(), b.last_revision())
 
98
        work = branch.Branch.open('current')
 
99
        self.assertEqual(work.last_revision(), _mod_revision.NULL_REVISION)
 
100
 
 
101
    def test_branch_switch_checkout(self):
 
102
        # Checkout in the current directory:
 
103
        #  => new branch will be created and checkout bound to the new branch
 
104
        self.example_branch('a')
 
105
        self.run_bzr('checkout a current')
 
106
        out, err = self.run_bzr('branch --switch ../a ../b', working_dir='current')
 
107
        a = branch.Branch.open('a')
 
108
        b = branch.Branch.open('b')
 
109
        self.assertEqual(a.last_revision(), b.last_revision())
 
110
        work = WorkingTree.open('current')
 
111
        self.assertEndsWith(work.branch.get_bound_location(), '/b/')
 
112
        self.assertContainsRe(err, "Switched to branch: .*/b/")
 
113
 
 
114
    def test_branch_switch_lightweight_checkout(self):
 
115
        # Lightweight checkout in the current directory:
 
116
        #  => new branch will be created and lightweight checkout pointed to
 
117
        #     the new branch
 
118
        self.example_branch('a')
 
119
        self.run_bzr('checkout --lightweight a current')
 
120
        out, err = self.run_bzr('branch --switch ../a ../b', working_dir='current')
 
121
        a = branch.Branch.open('a')
 
122
        b = branch.Branch.open('b')
 
123
        self.assertEqual(a.last_revision(), b.last_revision())
 
124
        work = WorkingTree.open('current')
 
125
        self.assertEndsWith(work.branch.base, '/b/')
 
126
        self.assertContainsRe(err, "Switched to branch: .*/b/")
 
127
 
49
128
    def test_branch_only_copies_history(self):
50
129
        # Knit branches should only push the history for the current revision.
51
130
        format = bzrdir.BzrDirMetaFormat1()
84
163
        self.assertFalse(pushed_repo.has_revision('a-2'))
85
164
        self.assertTrue(pushed_repo.has_revision('b-1'))
86
165
 
 
166
    def test_branch_hardlink(self):
 
167
        self.requireFeature(HardlinkFeature)
 
168
        source = self.make_branch_and_tree('source')
 
169
        self.build_tree(['source/file1'])
 
170
        source.add('file1')
 
171
        source.commit('added file')
 
172
        out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
 
173
        source_stat = os.stat('source/file1')
 
174
        target_stat = os.stat('target/file1')
 
175
        self.assertEqual(source_stat, target_stat)
 
176
 
 
177
    def test_branch_files_from(self):
 
178
        source = self.make_branch_and_tree('source')
 
179
        self.build_tree(['source/file1'])
 
180
        source.add('file1')
 
181
        source.commit('added file')
 
182
        out, err = self.run_bzr('branch source target --files-from source')
 
183
        self.failUnlessExists('target/file1')
 
184
 
 
185
    def test_branch_files_from_hardlink(self):
 
186
        self.requireFeature(HardlinkFeature)
 
187
        source = self.make_branch_and_tree('source')
 
188
        self.build_tree(['source/file1'])
 
189
        source.add('file1')
 
190
        source.commit('added file')
 
191
        source.bzrdir.sprout('second')
 
192
        out, err = self.run_bzr('branch source target --files-from second'
 
193
                                ' --hardlink')
 
194
        source_stat = os.stat('source/file1')
 
195
        second_stat = os.stat('second/file1')
 
196
        target_stat = os.stat('target/file1')
 
197
        self.assertNotEqual(source_stat, target_stat)
 
198
        self.assertEqual(second_stat, target_stat)
 
199
 
 
200
    def test_branch_standalone(self):
 
201
        shared_repo = self.make_repository('repo', shared=True)
 
202
        self.example_branch('source')
 
203
        self.run_bzr('branch --standalone source repo/target')
 
204
        b = branch.Branch.open('repo/target')
 
205
        expected_repo_path = os.path.abspath('repo/target/.bzr/repository')
 
206
        self.assertEqual(strip_trailing_slash(b.repository.base),
 
207
            strip_trailing_slash(local_path_to_url(expected_repo_path)))
 
208
 
 
209
    def test_branch_no_tree(self):
 
210
        self.example_branch('source')
 
211
        self.run_bzr('branch --no-tree source target')
 
212
        self.failIfExists('target/hello')
 
213
        self.failIfExists('target/goodbye')
 
214
 
 
215
    def test_branch_into_existing_dir(self):
 
216
        self.example_branch('a')
 
217
        # existing dir with similar files but no .bzr dir
 
218
        self.build_tree_contents([('b/',)])
 
219
        self.build_tree_contents([('b/hello', 'bar')])  # different content
 
220
        self.build_tree_contents([('b/goodbye', 'baz')])# same content
 
221
        # fails without --use-existing-dir
 
222
        out,err = self.run_bzr('branch a b', retcode=3)
 
223
        self.assertEqual('', out)
 
224
        self.assertEqual('bzr: ERROR: Target directory "b" already exists.\n',
 
225
            err)
 
226
        # force operation
 
227
        self.run_bzr('branch a b --use-existing-dir')
 
228
        # check conflicts
 
229
        self.failUnlessExists('b/hello.moved')
 
230
        self.failIfExists('b/godbye.moved')
 
231
        # we can't branch into branch
 
232
        out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
 
233
        self.assertEqual('', out)
 
234
        self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
 
235
 
 
236
    def test_branch_bind(self):
 
237
        self.example_branch('a')
 
238
        out, err = self.run_bzr('branch a b --bind')
 
239
        self.assertEndsWith(err, "New branch bound to a\n")
 
240
        b = branch.Branch.open('b')
 
241
        self.assertEndsWith(b.get_bound_location(), '/a/')
 
242
 
 
243
    def test_branch_with_post_branch_init_hook(self):
 
244
        calls = []
 
245
        branch.Branch.hooks.install_named_hook('post_branch_init',
 
246
            calls.append, None)
 
247
        self.assertLength(0, calls)
 
248
        self.example_branch('a')
 
249
        self.assertLength(1, calls)
 
250
        self.run_bzr('branch a b')
 
251
        self.assertLength(2, calls)
 
252
 
 
253
    def test_checkout_with_post_branch_init_hook(self):
 
254
        calls = []
 
255
        branch.Branch.hooks.install_named_hook('post_branch_init',
 
256
            calls.append, None)
 
257
        self.assertLength(0, calls)
 
258
        self.example_branch('a')
 
259
        self.assertLength(1, calls)
 
260
        self.run_bzr('checkout a b')
 
261
        self.assertLength(2, calls)
 
262
 
 
263
    def test_lightweight_checkout_with_post_branch_init_hook(self):
 
264
        calls = []
 
265
        branch.Branch.hooks.install_named_hook('post_branch_init',
 
266
            calls.append, None)
 
267
        self.assertLength(0, calls)
 
268
        self.example_branch('a')
 
269
        self.assertLength(1, calls)
 
270
        self.run_bzr('checkout --lightweight a b')
 
271
        self.assertLength(2, calls)
 
272
 
 
273
 
 
274
class TestBranchStacked(TestCaseWithTransport):
 
275
    """Tests for branch --stacked"""
 
276
 
 
277
    def assertRevisionInRepository(self, repo_path, revid):
 
278
        """Check that a revision is in a repository, disregarding stacking."""
 
279
        repo = bzrdir.BzrDir.open(repo_path).open_repository()
 
280
        self.assertTrue(repo.has_revision(revid))
 
281
 
 
282
    def assertRevisionNotInRepository(self, repo_path, revid):
 
283
        """Check that a revision is not in a repository, disregarding stacking."""
 
284
        repo = bzrdir.BzrDir.open(repo_path).open_repository()
 
285
        self.assertFalse(repo.has_revision(revid))
 
286
 
 
287
    def assertRevisionsInBranchRepository(self, revid_list, branch_path):
 
288
        repo = branch.Branch.open(branch_path).repository
 
289
        self.assertEqual(set(revid_list),
 
290
            repo.has_revisions(revid_list))
 
291
 
 
292
    def test_branch_stacked_branch_not_stacked(self):
 
293
        """Branching a stacked branch is not stacked by default"""
 
294
        # We have a mainline
 
295
        trunk_tree = self.make_branch_and_tree('target',
 
296
            format='1.9')
 
297
        trunk_tree.commit('mainline')
 
298
        # and a branch from it which is stacked
 
299
        branch_tree = self.make_branch_and_tree('branch',
 
300
            format='1.9')
 
301
        branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
 
302
        # with some work on it
 
303
        work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
 
304
        work_tree.commit('moar work plz')
 
305
        work_tree.branch.push(branch_tree.branch)
 
306
        # branching our local branch gives us a new stacked branch pointing at
 
307
        # mainline.
 
308
        out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
 
309
        self.assertEqual('', out)
 
310
        self.assertEqual('Branched 2 revision(s).\n',
 
311
            err)
 
312
        # it should have preserved the branch format, and so it should be
 
313
        # capable of supporting stacking, but not actually have a stacked_on
 
314
        # branch configured
 
315
        self.assertRaises(errors.NotStacked,
 
316
            bzrdir.BzrDir.open('newbranch').open_branch().get_stacked_on_url)
 
317
 
 
318
    def test_branch_stacked_branch_stacked(self):
 
319
        """Asking to stack on a stacked branch does work"""
 
320
        # We have a mainline
 
321
        trunk_tree = self.make_branch_and_tree('target',
 
322
            format='1.9')
 
323
        trunk_revid = trunk_tree.commit('mainline')
 
324
        # and a branch from it which is stacked
 
325
        branch_tree = self.make_branch_and_tree('branch',
 
326
            format='1.9')
 
327
        branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
 
328
        # with some work on it
 
329
        work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
 
330
        branch_revid = work_tree.commit('moar work plz')
 
331
        work_tree.branch.push(branch_tree.branch)
 
332
        # you can chain branches on from there
 
333
        out, err = self.run_bzr(['branch', 'branch', '--stacked', 'branch2'])
 
334
        self.assertEqual('', out)
 
335
        self.assertEqual('Created new stacked branch referring to %s.\n' %
 
336
            branch_tree.branch.base, err)
 
337
        self.assertEqual(branch_tree.branch.base,
 
338
            branch.Branch.open('branch2').get_stacked_on_url())
 
339
        branch2_tree = WorkingTree.open('branch2')
 
340
        branch2_revid = work_tree.commit('work on second stacked branch')
 
341
        work_tree.branch.push(branch2_tree.branch)
 
342
        self.assertRevisionInRepository('branch2', branch2_revid)
 
343
        self.assertRevisionsInBranchRepository(
 
344
            [trunk_revid, branch_revid, branch2_revid],
 
345
            'branch2')
 
346
 
 
347
    def test_branch_stacked(self):
 
348
        # We have a mainline
 
349
        trunk_tree = self.make_branch_and_tree('mainline',
 
350
            format='1.9')
 
351
        original_revid = trunk_tree.commit('mainline')
 
352
        self.assertRevisionInRepository('mainline', original_revid)
 
353
        # and a branch from it which is stacked
 
354
        out, err = self.run_bzr(['branch', '--stacked', 'mainline',
 
355
            'newbranch'])
 
356
        self.assertEqual('', out)
 
357
        self.assertEqual('Created new stacked branch referring to %s.\n' %
 
358
            trunk_tree.branch.base, err)
 
359
        self.assertRevisionNotInRepository('newbranch', original_revid)
 
360
        new_branch = branch.Branch.open('newbranch')
 
361
        self.assertEqual(trunk_tree.branch.base, new_branch.get_stacked_on_url())
 
362
 
 
363
    def test_branch_stacked_from_smart_server(self):
 
364
        # We can branch stacking on a smart server
 
365
        self.transport_server = test_server.SmartTCPServer_for_testing
 
366
        trunk = self.make_branch('mainline', format='1.9')
 
367
        out, err = self.run_bzr(
 
368
            ['branch', '--stacked', self.get_url('mainline'), 'shallow'])
 
369
 
 
370
    def test_branch_stacked_from_non_stacked_format(self):
 
371
        """The origin format doesn't support stacking"""
 
372
        trunk = self.make_branch('trunk', format='pack-0.92')
 
373
        out, err = self.run_bzr(
 
374
            ['branch', '--stacked', 'trunk', 'shallow'])
 
375
        # We should notify the user that we upgraded their format
 
376
        self.assertEqualDiff(
 
377
            'Source repository format does not support stacking, using format:\n'
 
378
            '  Packs 5 (adds stacking support, requires bzr 1.6)\n'
 
379
            'Source branch format does not support stacking, using format:\n'
 
380
            '  Branch format 7\n'
 
381
            'Doing on-the-fly conversion from RepositoryFormatKnitPack1() to RepositoryFormatKnitPack5().\n'
 
382
            'This may take some time. Upgrade the repositories to the same format for better performance.\n'
 
383
            'Created new stacked branch referring to %s.\n' % (trunk.base,),
 
384
            err)
 
385
 
 
386
    def test_branch_stacked_from_rich_root_non_stackable(self):
 
387
        trunk = self.make_branch('trunk', format='rich-root-pack')
 
388
        out, err = self.run_bzr(
 
389
            ['branch', '--stacked', 'trunk', 'shallow'])
 
390
        # We should notify the user that we upgraded their format
 
391
        self.assertEqualDiff(
 
392
            'Source repository format does not support stacking, using format:\n'
 
393
            '  Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
 
394
            'Source branch format does not support stacking, using format:\n'
 
395
            '  Branch format 7\n'
 
396
            'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
 
397
            'This may take some time. Upgrade the repositories to the same format for better performance.\n'
 
398
            'Created new stacked branch referring to %s.\n' % (trunk.base,),
 
399
            err)
 
400
 
 
401
 
 
402
class TestSmartServerBranching(TestCaseWithTransport):
 
403
 
 
404
    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
 
405
        self.setup_smart_server_with_call_log()
 
406
        t = self.make_branch_and_tree('from')
 
407
        for count in range(9):
 
408
            t.commit(message='commit %d' % count)
 
409
        self.reset_smart_call_log()
 
410
        out, err = self.run_bzr(['branch', self.get_url('from'),
 
411
            self.get_url('target')])
 
412
        # This figure represent the amount of work to perform this use case. It
 
413
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
414
        # being too low. If rpc_count increases, more network roundtrips have
 
415
        # become necessary for this use case. Please do not adjust this number
 
416
        # upwards without agreement from bzr's network support maintainers.
 
417
        self.assertLength(38, self.hpss_calls)
 
418
 
 
419
    def test_branch_from_trivial_branch_streaming_acceptance(self):
 
420
        self.setup_smart_server_with_call_log()
 
421
        t = self.make_branch_and_tree('from')
 
422
        for count in range(9):
 
423
            t.commit(message='commit %d' % count)
 
424
        self.reset_smart_call_log()
 
425
        out, err = self.run_bzr(['branch', self.get_url('from'),
 
426
            'local-target'])
 
427
        # This figure represent the amount of work to perform this use case. It
 
428
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
429
        # being too low. If rpc_count increases, more network roundtrips have
 
430
        # become necessary for this use case. Please do not adjust this number
 
431
        # upwards without agreement from bzr's network support maintainers.
 
432
        self.assertLength(10, self.hpss_calls)
 
433
 
 
434
    def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
 
435
        self.setup_smart_server_with_call_log()
 
436
        t = self.make_branch_and_tree('trunk')
 
437
        for count in range(8):
 
438
            t.commit(message='commit %d' % count)
 
439
        tree2 = t.branch.bzrdir.sprout('feature', stacked=True
 
440
            ).open_workingtree()
 
441
        local_tree = t.branch.bzrdir.sprout('local-working').open_workingtree()
 
442
        local_tree.commit('feature change')
 
443
        local_tree.branch.push(tree2.branch)
 
444
        self.reset_smart_call_log()
 
445
        out, err = self.run_bzr(['branch', self.get_url('feature'),
 
446
            'local-target'])
 
447
        # This figure represent the amount of work to perform this use case. It
 
448
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
449
        # being too low. If rpc_count increases, more network roundtrips have
 
450
        # become necessary for this use case. Please do not adjust this number
 
451
        # upwards without agreement from bzr's network support maintainers.
 
452
        self.assertLength(15, self.hpss_calls)
 
453
 
87
454
 
88
455
class TestRemoteBranch(TestCaseWithSFTPServer):
89
456