← 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

(robertc) Fix RemoteBranch's handling of the ignore_fallbacks
        parameter to Branch.open. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008, 2009 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
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import (
23
 
    branch,
24
 
    bzrdir,
25
 
    errors,
26
 
    repository,
27
 
    revision as _mod_revision,
28
 
    )
 
22
from bzrlib import (branch, bzrdir, errors, repository)
29
23
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
30
 
from bzrlib.tests import TestCaseWithTransport
 
24
from bzrlib.tests.blackbox import ExternalBase
31
25
from bzrlib.tests import (
32
26
    KnownFailure,
33
27
    HardlinkFeature,
34
 
    test_server,
35
28
    )
36
29
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
37
30
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
38
31
from bzrlib.workingtree import WorkingTree
39
32
 
40
33
 
41
 
class TestBranch(TestCaseWithTransport):
 
34
class TestBranch(ExternalBase):
42
35
 
43
36
    def example_branch(self, path='.'):
44
37
        tree = self.make_branch_and_tree(path)
59
52
        self.assertFalse(b._transport.has('branch-name'))
60
53
        b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
61
54
 
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
 
 
128
55
    def test_branch_only_copies_history(self):
129
56
        # Knit branches should only push the history for the current revision.
130
57
        format = bzrdir.BzrDirMetaFormat1()
172
99
        out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
173
100
        source_stat = os.stat('source/file1')
174
101
        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)
 
102
        same_file = (source_stat == target_stat)
 
103
        if same_file:
 
104
            pass
 
105
        else:
 
106
            # https://bugs.edge.launchpad.net/bzr/+bug/408193
 
107
            self.assertContainsRe(err, "hardlinking working copy files is "
 
108
                "not currently supported")
 
109
            raise KnownFailure("--hardlink doesn't work in formats "
 
110
                "that support content filtering (#408193)")
199
111
 
200
112
    def test_branch_standalone(self):
201
113
        shared_repo = self.make_repository('repo', shared=True)
233
145
        self.assertEqual('', out)
234
146
        self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
235
147
 
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):
 
148
 
 
149
class TestBranchStacked(ExternalBase):
275
150
    """Tests for branch --stacked"""
276
151
 
277
152
    def assertRevisionInRepository(self, repo_path, revid):
362
237
 
363
238
    def test_branch_stacked_from_smart_server(self):
364
239
        # We can branch stacking on a smart server
365
 
        self.transport_server = test_server.SmartTCPServer_for_testing
 
240
        from bzrlib.smart.server import SmartTCPServer_for_testing
 
241
        self.transport_server = SmartTCPServer_for_testing
366
242
        trunk = self.make_branch('mainline', format='1.9')
367
243
        out, err = self.run_bzr(
368
244
            ['branch', '--stacked', self.get_url('mainline'), 'shallow'])
378
254
            '  Packs 5 (adds stacking support, requires bzr 1.6)\n'
379
255
            'Source branch format does not support stacking, using format:\n'
380
256
            '  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
257
            'Created new stacked branch referring to %s.\n' % (trunk.base,),
384
258
            err)
385
259
 
393
267
            '  Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
394
268
            'Source branch format does not support stacking, using format:\n'
395
269
            '  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
270
            'Created new stacked branch referring to %s.\n' % (trunk.base,),
399
271
            err)
400
272
 
401
273
 
402
 
class TestSmartServerBranching(TestCaseWithTransport):
 
274
class TestSmartServerBranching(ExternalBase):
403
275
 
404
276
    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
405
277
        self.setup_smart_server_with_call_log()