← 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: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_switch.py
22
22
 
23
23
from bzrlib.workingtree import WorkingTree
24
24
from bzrlib.tests.blackbox import ExternalBase
25
 
from bzrlib.directory_service import directories
26
25
 
27
26
 
28
27
class TestSwitch(ExternalBase):
29
28
 
30
 
    def _create_sample_tree(self):
31
 
        tree = self.make_branch_and_tree('branch-1')
32
 
        self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
33
 
        tree.add('file-1')
34
 
        tree.commit('rev1')
35
 
        tree.add('file-2')
36
 
        tree.commit('rev2')
37
 
        return tree
38
 
 
39
29
    def test_switch_up_to_date_light_checkout(self):
40
30
        self.make_branch_and_tree('branch')
41
31
        self.run_bzr('branch branch branch2')
144
134
        self.assertEqual(branchb_id, checkout.last_revision())
145
135
        self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
146
136
 
147
 
    def test_switch_revision(self):
148
 
        tree = self._create_sample_tree()
149
 
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
150
 
        self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
151
 
        self.failUnlessExists('checkout/file-1')
152
 
        self.failIfExists('checkout/file-2')
153
 
 
154
 
    def test_switch_only_revision(self):
155
 
        tree = self._create_sample_tree()
156
 
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
157
 
        self.failUnlessExists('checkout/file-1')
158
 
        self.failUnlessExists('checkout/file-2')
159
 
        self.run_bzr(['switch', '-r1'], working_dir='checkout')
160
 
        self.failUnlessExists('checkout/file-1')
161
 
        self.failIfExists('checkout/file-2')
162
 
        # Check that we don't accept a range
163
 
        self.run_bzr_error(
164
 
            ['bzr switch --revision takes exactly one revision identifier'],
165
 
            ['switch', '-r0..2'], working_dir='checkout')
166
 
 
167
137
    def prepare_lightweight_switch(self):
168
138
        branch = self.make_branch('branch')
169
139
        branch.create_checkout('tree', lightweight=True)
213
183
        # The new branch should have been created at the same level as
214
184
        # 'branch', because we did not have a '/' segment
215
185
        self.assertEqual(branch.base[:-1] + '2/', tree.branch.base)
216
 
 
217
 
    def test_create_branch_directory_services(self):
218
 
        branch = self.make_branch('branch')
219
 
        tree = branch.create_checkout('tree', lightweight=True)
220
 
        class FooLookup(object):
221
 
            def look_up(self, name, url):
222
 
                return 'foo-'+name
223
 
        directories.register('foo:', FooLookup, 'Create branches named foo-')
224
 
        self.addCleanup(directories.remove, 'foo:')
225
 
        self.run_bzr('switch -b foo:branch2', working_dir='tree')
226
 
        tree = WorkingTree.open('tree')
227
 
        self.assertEndsWith(tree.branch.base, 'foo-branch2/')