/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2020-02-18 01:57:45 UTC
  • mto: This revision was merged to the branch mainline in revision 7493.
  • Revision ID: jelmer@jelmer.uk-20200218015745-q2ss9tsk74h4nh61
drop use of future.

Show diffs side-by-side

added added

removed removed

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