← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Johan Walles
  • Date: 2009-05-07 05:08:46 UTC
  • mfrom: (4342 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090507050846-nkwvcyauf1eh653q
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_switch.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
20
20
 
21
21
import os
22
22
 
23
 
from bzrlib import (
24
 
        osutils,
25
 
        urlutils,
26
 
        branch,
27
 
        )
28
23
from bzrlib.workingtree import WorkingTree
29
 
from bzrlib.tests import (
30
 
        TestCaseWithTransport,
31
 
        script,
32
 
        )
33
 
from bzrlib.directory_service import directories
34
 
 
35
 
 
36
 
class TestSwitch(TestCaseWithTransport):
37
 
 
38
 
    def _create_sample_tree(self):
39
 
        tree = self.make_branch_and_tree('branch-1')
40
 
        self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
41
 
        tree.add('file-1')
42
 
        tree.commit('rev1')
43
 
        tree.add('file-2')
44
 
        tree.commit('rev2')
45
 
        return tree
 
24
from bzrlib.tests.blackbox import ExternalBase
 
25
 
 
26
 
 
27
class TestSwitch(ExternalBase):
46
28
 
47
29
    def test_switch_up_to_date_light_checkout(self):
48
30
        self.make_branch_and_tree('branch')
136
118
        """Using switch on a heavy checkout should find master sibling
137
119
 
138
120
        The behaviour of lighweight and heavy checkouts should be
139
 
        consistent when using the convenient "switch to sibling" feature
 
121
        consistentwhen using the convenient "switch to sibling" feature
140
122
        Both should switch to a sibling of the branch
141
123
        they are bound to, and not a sibling of themself"""
142
124
 
151
133
        self.run_bzr(['switch', 'branchb'], working_dir='heavyco/a')
152
134
        self.assertEqual(branchb_id, checkout.last_revision())
153
135
        self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
154
 
 
155
 
    def test_switch_revision(self):
156
 
        tree = self._create_sample_tree()
157
 
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
158
 
        self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
159
 
        self.assertPathExists('checkout/file-1')
160
 
        self.assertPathDoesNotExist('checkout/file-2')
161
 
 
162
 
    def test_switch_only_revision(self):
163
 
        tree = self._create_sample_tree()
164
 
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
165
 
        self.assertPathExists('checkout/file-1')
166
 
        self.assertPathExists('checkout/file-2')
167
 
        self.run_bzr(['switch', '-r1'], working_dir='checkout')
168
 
        self.assertPathExists('checkout/file-1')
169
 
        self.assertPathDoesNotExist('checkout/file-2')
170
 
        # Check that we don't accept a range
171
 
        self.run_bzr_error(
172
 
            ['bzr switch --revision takes exactly one revision identifier'],
173
 
            ['switch', '-r0..2'], working_dir='checkout')
174
 
 
175
 
    def prepare_lightweight_switch(self):
176
 
        branch = self.make_branch('branch')
177
 
        branch.create_checkout('tree', lightweight=True)
178
 
        osutils.rename('branch', 'branch1')
179
 
 
180
 
    def test_switch_lightweight_after_branch_moved(self):
181
 
        self.prepare_lightweight_switch()
182
 
        self.run_bzr('switch --force ../branch1', working_dir='tree')
183
 
        branch_location = WorkingTree.open('tree').branch.base
184
 
        self.assertEndsWith(branch_location, 'branch1/')
185
 
 
186
 
    def test_switch_lightweight_after_branch_moved_relative(self):
187
 
        self.prepare_lightweight_switch()
188
 
        self.run_bzr('switch --force branch1', working_dir='tree')
189
 
        branch_location = WorkingTree.open('tree').branch.base
190
 
        self.assertEndsWith(branch_location, 'branch1/')
191
 
 
192
 
    def test_create_branch_no_branch(self):
193
 
        self.prepare_lightweight_switch()
194
 
        self.run_bzr_error(['cannot create branch without source branch'],
195
 
            'switch --create-branch ../branch2', working_dir='tree')
196
 
 
197
 
    def test_create_branch(self):
198
 
        branch = self.make_branch('branch')
199
 
        tree = branch.create_checkout('tree', lightweight=True)
200
 
        tree.commit('one', rev_id='rev-1')
201
 
        self.run_bzr('switch --create-branch ../branch2', working_dir='tree')
202
 
        tree = WorkingTree.open('tree')
203
 
        self.assertEndsWith(tree.branch.base, '/branch2/')
204
 
 
205
 
    def test_create_branch_local(self):
206
 
        branch = self.make_branch('branch')
207
 
        tree = branch.create_checkout('tree', lightweight=True)
208
 
        tree.commit('one', rev_id='rev-1')
209
 
        self.run_bzr('switch --create-branch branch2', working_dir='tree')
210
 
        tree = WorkingTree.open('tree')
211
 
        # The new branch should have been created at the same level as
212
 
        # 'branch', because we did not have a '/' segment
213
 
        self.assertEqual(branch.base[:-1] + '2/', tree.branch.base)
214
 
 
215
 
    def test_create_branch_short_name(self):
216
 
        branch = self.make_branch('branch')
217
 
        tree = branch.create_checkout('tree', lightweight=True)
218
 
        tree.commit('one', rev_id='rev-1')
219
 
        self.run_bzr('switch -b branch2', working_dir='tree')
220
 
        tree = WorkingTree.open('tree')
221
 
        # The new branch should have been created at the same level as
222
 
        # 'branch', because we did not have a '/' segment
223
 
        self.assertEqual(branch.base[:-1] + '2/', tree.branch.base)
224
 
 
225
 
    def test_create_branch_directory_services(self):
226
 
        branch = self.make_branch('branch')
227
 
        tree = branch.create_checkout('tree', lightweight=True)
228
 
        class FooLookup(object):
229
 
            def look_up(self, name, url):
230
 
                return 'foo-'+name
231
 
        directories.register('foo:', FooLookup, 'Create branches named foo-')
232
 
        self.addCleanup(directories.remove, 'foo:')
233
 
        self.run_bzr('switch -b foo:branch2', working_dir='tree')
234
 
        tree = WorkingTree.open('tree')
235
 
        self.assertEndsWith(tree.branch.base, 'foo-branch2/')
236
 
 
237
 
    def test_switch_with_post_switch_hook(self):
238
 
        from bzrlib import branch as _mod_branch
239
 
        calls = []
240
 
        _mod_branch.Branch.hooks.install_named_hook('post_switch',
241
 
            calls.append, None)
242
 
        self.make_branch_and_tree('branch')
243
 
        self.run_bzr('branch branch branch2')
244
 
        self.run_bzr('checkout branch checkout')
245
 
        os.chdir('checkout')
246
 
        self.assertLength(0, calls)
247
 
        out, err = self.run_bzr('switch ../branch2')
248
 
        self.assertLength(1, calls)
249
 
 
250
 
    def test_switch_lightweight_co_with_post_switch_hook(self):
251
 
        from bzrlib import branch as _mod_branch
252
 
        calls = []
253
 
        _mod_branch.Branch.hooks.install_named_hook('post_switch',
254
 
            calls.append, None)
255
 
        self.make_branch_and_tree('branch')
256
 
        self.run_bzr('branch branch branch2')
257
 
        self.run_bzr('checkout --lightweight branch checkout')
258
 
        os.chdir('checkout')
259
 
        self.assertLength(0, calls)
260
 
        out, err = self.run_bzr('switch ../branch2')
261
 
        self.assertLength(1, calls)
262
 
 
263
 
    def test_switch_lightweight_directory(self):
264
 
        """Test --directory option"""
265
 
 
266
 
        # create a source branch
267
 
        a_tree = self.make_branch_and_tree('a')
268
 
        self.build_tree_contents([('a/a', 'initial\n')])
269
 
        a_tree.add('a')
270
 
        a_tree.commit(message='initial')
271
 
 
272
 
        # clone and add a differing revision
273
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
274
 
        self.build_tree_contents([('b/a', 'initial\nmore\n')])
275
 
        b_tree.commit(message='more')
276
 
 
277
 
        self.run_bzr('checkout --lightweight a checkout')
278
 
        self.run_bzr('switch --directory checkout b')
279
 
        self.assertFileEqual('initial\nmore\n', 'checkout/a')
280
 
 
281
 
class TestSwitchParentLocationBase(TestCaseWithTransport):
282
 
 
283
 
    def setUp(self):
284
 
        """Set up a repository and branch ready for testing."""
285
 
        super(TestSwitchParentLocationBase, self).setUp()
286
 
        self.script_runner = script.ScriptRunner()
287
 
        self.script_runner.run_script(self, '''
288
 
                $ bzr init-repo --no-trees repo
289
 
                Shared repository...
290
 
                Location:
291
 
                  shared repository: repo
292
 
                $ bzr init repo/trunk
293
 
                Created a repository branch...
294
 
                Using shared repository: ...
295
 
                ''')
296
 
 
297
 
    def assertParent(self, expected_parent, branch):
298
 
        """Verify that the parent is not None and is set correctly."""
299
 
        actual_parent = branch.get_parent()
300
 
        self.assertIsSameRealPath(urlutils.local_path_to_url(expected_parent),
301
 
                                  branch.get_parent())
302
 
 
303
 
 
304
 
class TestSwitchParentLocation(TestSwitchParentLocationBase):
305
 
 
306
 
    def _checkout_and_switch(self, option=''):
307
 
        self.script_runner.run_script(self, '''
308
 
                $ bzr checkout %(option)s repo/trunk checkout
309
 
                $ cd checkout
310
 
                $ bzr switch --create-branch switched
311
 
                2>Tree is up to date at revision 0.
312
 
                2>Switched to branch:...switched...
313
 
                $ cd ..
314
 
                ''' % locals())
315
 
        bound_branch = branch.Branch.open_containing('checkout')[0]
316
 
        master_branch = branch.Branch.open_containing('repo/switched')[0]
317
 
        return (bound_branch, master_branch)
318
 
 
319
 
    def test_switch_parent_lightweight(self):
320
 
        """Lightweight checkout using bzr switch."""
321
 
        bb, mb = self._checkout_and_switch(option='--lightweight')
322
 
        self.assertParent('repo/trunk', bb)
323
 
        self.assertParent('repo/trunk', mb)
324
 
 
325
 
    def test_switch_parent_heavyweight(self):
326
 
        """Heavyweight checkout using bzr switch."""
327
 
        bb, mb = self._checkout_and_switch()
328
 
        self.assertParent('repo/trunk', bb)
329
 
        self.assertParent('repo/trunk', mb)
330