← 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: Jonathan Riddell
  • Date: 2011-05-25 15:20:26 UTC
  • mto: This revision was merged to the branch mainline in revision 5965.
  • Revision ID: jriddell@canonical.com-20110525152026-ojxh0vfx64x6uvq3
remove debugging

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_switch.py
1
 
# Copyright (C) 2007-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2007-2010 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.controldir import ControlDir
24
23
from bzrlib import (
25
 
    osutils,
26
 
    urlutils,
27
 
    branch,
28
 
    )
 
24
        osutils,
 
25
        urlutils,
 
26
        branch,
 
27
        )
29
28
from bzrlib.workingtree import WorkingTree
30
29
from bzrlib.tests import (
31
 
    TestCaseWithTransport,
32
 
    script,
33
 
    )
34
 
from bzrlib.tests.features import UnicodeFilenameFeature
 
30
        TestCaseWithTransport,
 
31
        script,
 
32
        )
35
33
from bzrlib.directory_service import directories
36
34
 
37
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
38
 
 
39
35
 
40
36
class TestSwitch(TestCaseWithTransport):
41
37
 
153
149
        branchb_id = tree2.commit('bar')
154
150
        checkout = tree1.branch.create_checkout('heavyco/a', lightweight=False)
155
151
        self.run_bzr(['switch', 'branchb'], working_dir='heavyco/a')
156
 
        # Refresh checkout as 'switch' modified it
157
 
        checkout = checkout.bzrdir.open_workingtree()
158
 
        self.assertEqual(branchb_id, checkout.last_revision())
159
 
        self.assertEqual(tree2.branch.base,
160
 
                         checkout.branch.get_bound_location())
161
 
 
162
 
    def test_switch_finds_relative_unicode_branch(self):
163
 
        """Switch will find 'foo' relative to the branch the checkout is of."""
164
 
        self.requireFeature(UnicodeFilenameFeature)
165
 
        self.build_tree(['repo/'])
166
 
        tree1 = self.make_branch_and_tree('repo/brancha')
167
 
        tree1.commit('foo')
168
 
        tree2 = self.make_branch_and_tree(u'repo/branch\xe9')
169
 
        tree2.pull(tree1.branch)
170
 
        branchb_id = tree2.commit('bar')
171
 
        checkout =  tree1.branch.create_checkout('checkout', lightweight=True)
172
 
        self.run_bzr(['switch', u'branch\xe9'], working_dir='checkout')
173
 
        self.assertEqual(branchb_id, checkout.last_revision())
174
 
        checkout = checkout.bzrdir.open_workingtree()
175
 
        self.assertEqual(tree2.branch.base, checkout.branch.base)
176
 
 
177
 
    def test_switch_finds_relative_unicode_branch(self):
178
 
        """Switch will find 'foo' relative to the branch the checkout is of."""
179
 
        self.requireFeature(UnicodeFilenameFeature)
180
 
        self.build_tree(['repo/'])
181
 
        tree1 = self.make_branch_and_tree('repo/brancha')
182
 
        tree1.commit('foo')
183
 
        tree2 = self.make_branch_and_tree(u'repo/branch\xe9')
184
 
        tree2.pull(tree1.branch)
185
 
        branchb_id = tree2.commit('bar')
186
 
        checkout =  tree1.branch.create_checkout('checkout', lightweight=True)
187
 
        self.run_bzr(['switch', u'branch\xe9'], working_dir='checkout')
188
 
        self.assertEqual(branchb_id, checkout.last_revision())
189
 
        checkout = checkout.bzrdir.open_workingtree()
190
 
        self.assertEqual(tree2.branch.base, checkout.branch.base)
 
152
        self.assertEqual(branchb_id, checkout.last_revision())
 
153
        self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
191
154
 
192
155
    def test_switch_revision(self):
193
156
        tree = self._create_sample_tree()
196
159
        self.assertPathExists('checkout/file-1')
197
160
        self.assertPathDoesNotExist('checkout/file-2')
198
161
 
199
 
    def test_switch_into_colocated(self):
200
 
        # Create a new colocated branch from an existing non-colocated branch.
201
 
        tree = self.make_branch_and_tree('.', format='development-colo')
202
 
        self.build_tree(['file-1', 'file-2'])
203
 
        tree.add('file-1')
204
 
        revid1 = tree.commit('rev1')
205
 
        tree.add('file-2')
206
 
        revid2 = tree.commit('rev2')
207
 
        self.run_bzr(['switch', '-b', 'anotherbranch'])
208
 
        self.assertEqual(
209
 
            set(['', 'anotherbranch']),
210
 
            set(tree.branch.bzrdir.get_branches().keys()))
211
 
 
212
 
    def test_switch_into_unrelated_colocated(self):
213
 
        # Create a new colocated branch from an existing non-colocated branch.
214
 
        tree = self.make_branch_and_tree('.', format='development-colo')
215
 
        self.build_tree(['file-1', 'file-2'])
216
 
        tree.add('file-1')
217
 
        revid1 = tree.commit('rev1')
218
 
        tree.add('file-2')
219
 
        revid2 = tree.commit('rev2')
220
 
        tree.bzrdir.create_branch(name='foo')
221
 
        self.run_bzr_error(['Cannot switch a branch, only a checkout.'],
222
 
            'switch foo')
223
 
        self.run_bzr(['switch', '--force', 'foo'])
224
 
 
225
 
    def test_switch_existing_colocated(self):
226
 
        # Create a branch branch-1 that initially is a checkout of 'foo'
227
 
        # Use switch to change it to 'anotherbranch'
228
 
        repo = self.make_repository('branch-1', format='development-colo')
229
 
        target_branch = repo.bzrdir.create_branch(name='foo')
230
 
        repo.bzrdir.set_branch_reference(target_branch)
231
 
        tree = repo.bzrdir.create_workingtree()
232
 
        self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
233
 
        tree.add('file-1')
234
 
        revid1 = tree.commit('rev1')
235
 
        tree.add('file-2')
236
 
        revid2 = tree.commit('rev2')
237
 
        otherbranch = tree.bzrdir.create_branch(name='anotherbranch')
238
 
        otherbranch.generate_revision_history(revid1)
239
 
        self.run_bzr(['switch', 'anotherbranch'], working_dir='branch-1')
240
 
        tree = WorkingTree.open("branch-1")
241
 
        self.assertEqual(tree.last_revision(), revid1)
242
 
        self.assertEqual(tree.branch.control_url, otherbranch.control_url)
243
 
 
244
 
    def test_switch_new_colocated(self):
245
 
        # Create a branch branch-1 that initially is a checkout of 'foo'
246
 
        # Use switch to create 'anotherbranch' which derives from that
247
 
        repo = self.make_repository('branch-1', format='development-colo')
248
 
        target_branch = repo.bzrdir.create_branch(name='foo')
249
 
        repo.bzrdir.set_branch_reference(target_branch)
250
 
        tree = repo.bzrdir.create_workingtree()
251
 
        self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
252
 
        tree.add('file-1')
253
 
        revid1 = tree.commit('rev1')
254
 
        self.run_bzr(['switch', '-b', 'anotherbranch'], working_dir='branch-1')
255
 
        bzrdir = ControlDir.open("branch-1")
256
 
        self.assertEqual(
257
 
            set([b.name for b in bzrdir.list_branches()]),
258
 
            set(["foo", "anotherbranch"]))
259
 
        self.assertEqual(bzrdir.open_branch().name, "anotherbranch")
260
 
        self.assertEqual(bzrdir.open_branch().last_revision(), revid1)
261
 
 
262
 
    def test_switch_new_colocated_unicode(self):
263
 
        # Create a branch branch-1 that initially is a checkout of 'foo'
264
 
        # Use switch to create 'branch\xe9' which derives from that
265
 
        self.requireFeature(UnicodeFilenameFeature)
266
 
        repo = self.make_repository('branch-1', format='development-colo')
267
 
        target_branch = repo.bzrdir.create_branch(name='foo')
268
 
        repo.bzrdir.set_branch_reference(target_branch)
269
 
        tree = repo.bzrdir.create_workingtree()
270
 
        self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
271
 
        tree.add('file-1')
272
 
        revid1 = tree.commit('rev1')
273
 
        self.run_bzr(['switch', '-b', u'branch\xe9'], working_dir='branch-1')
274
 
        bzrdir = ControlDir.open("branch-1")
275
 
        self.assertEqual(
276
 
            set([b.name for b in bzrdir.list_branches()]),
277
 
            set(["foo", u"branch\xe9"]))
278
 
        self.assertEqual(bzrdir.open_branch().name, u"branch\xe9")
279
 
        self.assertEqual(bzrdir.open_branch().last_revision(), revid1)
280
 
 
281
162
    def test_switch_only_revision(self):
282
163
        tree = self._create_sample_tree()
283
164
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
304
185
 
305
186
    def test_switch_lightweight_after_branch_moved_relative(self):
306
187
        self.prepare_lightweight_switch()
307
 
        self.run_bzr('switch --force branch1',
308
 
                     working_dir='tree')
 
188
        self.run_bzr('switch --force branch1', working_dir='tree')
309
189
        branch_location = WorkingTree.open('tree').branch.base
310
190
        self.assertEndsWith(branch_location, 'branch1/')
311
191
 
398
278
        self.run_bzr('switch --directory checkout b')
399
279
        self.assertFileEqual('initial\nmore\n', 'checkout/a')
400
280
 
401
 
 
402
281
class TestSwitchParentLocationBase(TestCaseWithTransport):
403
282
 
404
283
    def setUp(self):
449
328
        self.assertParent('repo/trunk', bb)
450
329
        self.assertParent('repo/trunk', mb)
451
330
 
452
 
 
453
 
class TestSwitchDoesntOpenMasterBranch(TestCaseWithTransport):
454
 
    # See https://bugs.launchpad.net/bzr/+bug/812285
455
 
    # "bzr switch --create-branch" can point the new branch's parent to the
456
 
    # master branch, but it doesn't have to open it to do so.
457
 
 
458
 
    def test_switch_create_doesnt_open_master_branch(self):
459
 
        master = self.make_branch_and_tree('master')
460
 
        master.commit('one')
461
 
        # Note: not a lightweight checkout
462
 
        checkout = master.branch.create_checkout('checkout')
463
 
        opened = []
464
 
        def open_hook(branch):
465
 
            # Just append the final directory of the branch
466
 
            name = branch.base.rstrip('/').rsplit('/', 1)[1]
467
 
            opened.append(name)
468
 
        branch.Branch.hooks.install_named_hook('open', open_hook,
469
 
                                               'open_hook_logger')
470
 
        self.run_bzr('switch --create-branch -d checkout feature')
471
 
        # We only open the master branch 1 time.
472
 
        # This test should be cleaner to write, but see bug:
473
 
        #  https://bugs.launchpad.net/bzr/+bug/812295
474
 
        self.assertEqual(1, opened.count('master'))
475
 
 
476
 
 
477
 
class TestSmartServerSwitch(TestCaseWithTransport):
478
 
 
479
 
    def test_switch_lightweight(self):
480
 
        self.setup_smart_server_with_call_log()
481
 
        t = self.make_branch_and_tree('from')
482
 
        for count in range(9):
483
 
            t.commit(message='commit %d' % count)
484
 
        out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
485
 
            'target'])
486
 
        self.reset_smart_call_log()
487
 
        self.run_bzr(['switch', self.get_url('from')], working_dir='target')
488
 
        # This figure represent the amount of work to perform this use case. It
489
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
490
 
        # being too low. If rpc_count increases, more network roundtrips have
491
 
        # become necessary for this use case. Please do not adjust this number
492
 
        # upwards without agreement from bzr's network support maintainers.
493
 
        self.assertLength(24, self.hpss_calls)
494
 
        self.assertLength(4, self.hpss_connections)
495
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
496
 
 
497
 
 
498
 
class TestSwitchUncommitted(TestCaseWithTransport):
499
 
 
500
 
    def prepare(self):
501
 
        tree = self.make_branch_and_tree('orig')
502
 
        tree.commit('')
503
 
        tree.branch.bzrdir.sprout('new')
504
 
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
505
 
        self.build_tree(['checkout/a'])
506
 
        self.assertPathExists('checkout/a')
507
 
        checkout.add('a')
508
 
        return checkout
509
 
 
510
 
    def test_store_and_restore_uncommitted(self):
511
 
        checkout = self.prepare()
512
 
        self.run_bzr(['switch', '--store', '-d', 'checkout', 'new'])
513
 
        self.build_tree(['checkout/b'])
514
 
        checkout.add('b')
515
 
        self.assertPathDoesNotExist('checkout/a')
516
 
        self.assertPathExists('checkout/b')
517
 
        self.run_bzr(['switch', '--store', '-d', 'checkout', 'orig'])
518
 
        self.assertPathExists('checkout/a')
519
 
        self.assertPathDoesNotExist('checkout/b')
520
 
 
521
 
    def test_does_not_store(self):
522
 
        self.prepare()
523
 
        self.run_bzr(['switch', '-d', 'checkout', 'new'])
524
 
        self.assertPathExists('checkout/a')
525
 
 
526
 
    def test_does_not_restore_changes(self):
527
 
        self.prepare()
528
 
        self.run_bzr(['switch', '--store', '-d', 'checkout', 'new'])
529
 
        self.assertPathDoesNotExist('checkout/a')
530
 
        self.run_bzr(['switch', '-d', 'checkout', 'orig'])
531
 
        self.assertPathDoesNotExist('checkout/a')