~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-28 06:58:22 UTC
  • mfrom: (2379.2.3 hpss-chroot)
  • Revision ID: pqm@pqm.ubuntu.com-20070328065822-999550a858a3ced3
(robertc) Fix chroot urls to not expose the url of the transport they are protecting, allowing regular url operations to work on them. (Robert Collins, Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006, 2007, 2009-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for the 'checkout' CLI command."""
18
18
 
 
19
from cStringIO import StringIO
19
20
import os
20
 
 
21
 
from bzrlib import (
22
 
    branch as _mod_branch,
23
 
    bzrdir,
24
 
    controldir,
25
 
    errors,
26
 
    workingtree,
27
 
    )
28
 
from bzrlib.tests import (
29
 
    TestCaseWithTransport,
30
 
    )
31
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
32
 
from bzrlib.tests.features import (
33
 
    HardlinkFeature,
34
 
    )
35
 
 
36
 
 
37
 
class TestCheckout(TestCaseWithTransport):
38
 
 
 
21
import re
 
22
import shutil
 
23
import sys
 
24
 
 
25
import bzrlib.bzrdir as bzrdir
 
26
import bzrlib.errors as errors
 
27
from bzrlib.tests.blackbox import ExternalBase
 
28
 
 
29
 
 
30
class TestCheckout(ExternalBase):
 
31
    
39
32
    def setUp(self):
40
33
        super(TestCheckout, self).setUp()
41
 
        tree = controldir.ControlDir.create_standalone_workingtree('branch')
 
34
        tree = bzrdir.BzrDir.create_standalone_workingtree('branch')
42
35
        tree.commit('1', rev_id='1', allow_pointless=True)
43
36
        self.build_tree(['branch/added_in_2'])
44
37
        tree.add('added_in_2')
45
38
        tree.commit('2', rev_id='2')
46
39
 
47
40
    def test_checkout_makes_bound_branch(self):
48
 
        self.run_bzr('checkout branch checkout')
 
41
        self.runbzr('checkout branch checkout')
49
42
        # if we have a checkout, the branch base should be 'branch'
50
 
        source = controldir.ControlDir.open('branch')
51
 
        result = controldir.ControlDir.open('checkout')
 
43
        source = bzrdir.BzrDir.open('branch')
 
44
        result = bzrdir.BzrDir.open('checkout')
52
45
        self.assertEqual(source.open_branch().bzrdir.root_transport.base,
53
46
                         result.open_branch().get_bound_location())
54
47
 
55
48
    def test_checkout_light_makes_checkout(self):
56
 
        self.run_bzr('checkout --lightweight branch checkout')
 
49
        self.runbzr('checkout --lightweight branch checkout')
57
50
        # if we have a checkout, the branch base should be 'branch'
58
 
        source = controldir.ControlDir.open('branch')
59
 
        result = controldir.ControlDir.open('checkout')
 
51
        source = bzrdir.BzrDir.open('branch')
 
52
        result = bzrdir.BzrDir.open('checkout')
60
53
        self.assertEqual(source.open_branch().bzrdir.root_transport.base,
61
54
                         result.open_branch().bzrdir.root_transport.base)
62
55
 
63
56
    def test_checkout_dash_r(self):
64
 
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
 
57
        self.runbzr('checkout -r -2 branch checkout')
65
58
        # the working tree should now be at revision '1' with the content
66
59
        # from 1.
67
 
        result = controldir.ControlDir.open('checkout')
 
60
        result = bzrdir.BzrDir.open('checkout')
68
61
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
69
 
        self.assertPathDoesNotExist('checkout/added_in_2')
 
62
        self.failIfExists('checkout/added_in_2')
70
63
 
71
64
    def test_checkout_light_dash_r(self):
72
 
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
73
 
            'branch', 'checkout'])
 
65
        self.runbzr('checkout --lightweight -r -2 branch checkout')
74
66
        # the working tree should now be at revision '1' with the content
75
67
        # from 1.
76
 
        result = controldir.ControlDir.open('checkout')
 
68
        result = bzrdir.BzrDir.open('checkout')
77
69
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
78
 
        self.assertPathDoesNotExist('checkout/added_in_2')
79
 
 
80
 
    def test_checkout_into_empty_dir(self):
81
 
        self.make_bzrdir('checkout')
82
 
        out, err = self.run_bzr(['checkout', 'branch', 'checkout'])
83
 
        result = controldir.ControlDir.open('checkout')
84
 
        tree = result.open_workingtree()
85
 
        branch = result.open_branch()
 
70
        self.failIfExists('checkout/added_in_2')
86
71
 
87
72
    def test_checkout_reconstitutes_working_trees(self):
88
73
        # doing a 'bzr checkout' in the directory of a branch with no tree
89
74
        # or a 'bzr checkout path' with path the name of a directory with
90
75
        # a branch with no tree will reconsistute the tree.
91
76
        os.mkdir('treeless-branch')
92
 
        branch = controldir.ControlDir.create_branch_convenience(
 
77
        branch = bzrdir.BzrDir.create_branch_convenience(
93
78
            'treeless-branch',
94
79
            force_new_tree=False,
95
80
            format=bzrdir.BzrDirMetaFormat1())
96
81
        # check no tree was created
97
82
        self.assertRaises(errors.NoWorkingTree, branch.bzrdir.open_workingtree)
98
 
        out, err = self.run_bzr('checkout treeless-branch')
 
83
        out, err = self.run_bzr('checkout', 'treeless-branch')
99
84
        # we should have a tree now
100
85
        branch.bzrdir.open_workingtree()
101
86
        # with no diff
102
 
        out, err = self.run_bzr('diff treeless-branch')
 
87
        out, err = self.run_bzr('diff', 'treeless-branch')
103
88
 
104
89
        # now test with no parameters
105
 
        branch = controldir.ControlDir.create_branch_convenience(
 
90
        branch = bzrdir.BzrDir.create_branch_convenience(
106
91
            '.',
107
92
            force_new_tree=False,
108
93
            format=bzrdir.BzrDirMetaFormat1())
113
98
        branch.bzrdir.open_workingtree()
114
99
        # with no diff
115
100
        out, err = self.run_bzr('diff')
116
 
 
117
 
    def _test_checkout_existing_dir(self, lightweight):
118
 
        source = self.make_branch_and_tree('source')
119
 
        self.build_tree_contents([('source/file1', 'content1'),
120
 
                                  ('source/file2', 'content2'),])
121
 
        source.add(['file1', 'file2'])
122
 
        source.commit('added files')
123
 
        self.build_tree_contents([('target/', ''),
124
 
                                  ('target/file1', 'content1'),
125
 
                                  ('target/file2', 'content3'),])
126
 
        cmd = ['checkout', 'source', 'target']
127
 
        if lightweight:
128
 
            cmd.append('--lightweight')
129
 
        self.run_bzr('checkout source target')
130
 
        # files with unique content should be moved
131
 
        self.assertPathExists('target/file2.moved')
132
 
        # files with content matching tree should not be moved
133
 
        self.assertPathDoesNotExist('target/file1.moved')
134
 
 
135
 
    def test_checkout_existing_dir_heavy(self):
136
 
        self._test_checkout_existing_dir(False)
137
 
 
138
 
    def test_checkout_existing_dir_lightweight(self):
139
 
        self._test_checkout_existing_dir(True)
140
 
 
141
 
    def test_checkout_in_branch_with_r(self):
142
 
        branch = _mod_branch.Branch.open('branch')
143
 
        branch.bzrdir.destroy_workingtree()
144
 
        self.run_bzr('checkout -r 1', working_dir='branch')
145
 
        tree = workingtree.WorkingTree.open('branch')
146
 
        self.assertEqual('1', tree.last_revision())
147
 
        branch.bzrdir.destroy_workingtree()
148
 
        self.run_bzr('checkout -r 0', working_dir='branch')
149
 
        self.assertEqual('null:', tree.last_revision())
150
 
 
151
 
    def test_checkout_files_from(self):
152
 
        branch = _mod_branch.Branch.open('branch')
153
 
        self.run_bzr(['checkout', 'branch', 'branch2', '--files-from',
154
 
                      'branch'])
155
 
 
156
 
    def test_checkout_hardlink(self):
157
 
        self.requireFeature(HardlinkFeature)
158
 
        source = self.make_branch_and_tree('source')
159
 
        self.build_tree(['source/file1'])
160
 
        source.add('file1')
161
 
        source.commit('added file')
162
 
        out, err = self.run_bzr('checkout source target --hardlink')
163
 
        source_stat = os.stat('source/file1')
164
 
        target_stat = os.stat('target/file1')
165
 
        self.assertEqual(source_stat, target_stat)
166
 
 
167
 
    def test_checkout_hardlink_files_from(self):
168
 
        self.requireFeature(HardlinkFeature)
169
 
        source = self.make_branch_and_tree('source')
170
 
        self.build_tree(['source/file1'])
171
 
        source.add('file1')
172
 
        source.commit('added file')
173
 
        source.bzrdir.sprout('second')
174
 
        out, err = self.run_bzr('checkout source target --hardlink'
175
 
                                ' --files-from second')
176
 
        second_stat = os.stat('second/file1')
177
 
        target_stat = os.stat('target/file1')
178
 
        self.assertEqual(second_stat, target_stat)
179
 
 
180
 
    def test_colo_checkout(self):
181
 
        source = self.make_branch_and_tree('source', format='development-colo')
182
 
        self.build_tree(['source/file1'])
183
 
        source.add('file1')
184
 
        source.commit('added file')
185
 
        target = source.bzrdir.sprout('file:second,branch=somebranch',
186
 
            create_tree_if_local=False)
187
 
        out, err = self.run_bzr('checkout file:,branch=somebranch .',
188
 
            working_dir='second')
189
 
        # We should always be creating a lighweight checkout for colocated
190
 
        # branches.
191
 
        self.assertEqual(
192
 
            target.open_branch(name='somebranch').base,
193
 
            target.get_branch_reference(name=""))
194
 
 
195
 
 
196
 
class TestSmartServerCheckout(TestCaseWithTransport):
197
 
 
198
 
    def test_heavyweight_checkout(self):
199
 
        self.setup_smart_server_with_call_log()
200
 
        t = self.make_branch_and_tree('from')
201
 
        for count in range(9):
202
 
            t.commit(message='commit %d' % count)
203
 
        self.reset_smart_call_log()
204
 
        out, err = self.run_bzr(['checkout', self.get_url('from'), 'target'])
205
 
        # This figure represent the amount of work to perform this use case. It
206
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
207
 
        # being too low. If rpc_count increases, more network roundtrips have
208
 
        # become necessary for this use case. Please do not adjust this number
209
 
        # upwards without agreement from bzr's network support maintainers.
210
 
        self.assertLength(10, self.hpss_calls)
211
 
        self.assertLength(1, self.hpss_connections)
212
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
213
 
 
214
 
    def test_lightweight_checkout(self):
215
 
        self.setup_smart_server_with_call_log()
216
 
        t = self.make_branch_and_tree('from')
217
 
        for count in range(9):
218
 
            t.commit(message='commit %d' % count)
219
 
        self.reset_smart_call_log()
220
 
        out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
221
 
            'target'])
222
 
        # This figure represent the amount of work to perform this use case. It
223
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
224
 
        # being too low. If rpc_count increases, more network roundtrips have
225
 
        # become necessary for this use case. Please do not adjust this number
226
 
        # upwards without agreement from bzr's network support maintainers.
227
 
        self.assertLength(13, self.hpss_calls)
228
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)