/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-11-19 18:28:52 UTC
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20201119182852-4za22s5mhakix4dq
Remove sixish data type.

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.features import (
35
34
    HardlinkFeature,
36
 
    KnownFailure,
37
35
    )
38
36
 
39
37
 
40
 
class TestCheckout(ExternalBase):
 
38
class TestCheckout(TestCaseWithTransport):
41
39
 
42
40
    def setUp(self):
43
41
        super(TestCheckout, self).setUp()
44
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('branch')
45
 
        tree.commit('1', rev_id='1', allow_pointless=True)
 
42
        tree = controldir.ControlDir.create_standalone_workingtree('branch')
 
43
        tree.commit('1', rev_id=b'1', allow_pointless=True)
46
44
        self.build_tree(['branch/added_in_2'])
47
45
        tree.add('added_in_2')
48
 
        tree.commit('2', rev_id='2')
 
46
        tree.commit('2', rev_id=b'2')
49
47
 
50
48
    def test_checkout_makes_bound_branch(self):
51
49
        self.run_bzr('checkout branch checkout')
52
50
        # 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,
 
51
        source = controldir.ControlDir.open('branch')
 
52
        result = controldir.ControlDir.open('checkout')
 
53
        self.assertEqual(source.open_branch().controldir.root_transport.base,
56
54
                         result.open_branch().get_bound_location())
57
55
 
58
56
    def test_checkout_light_makes_checkout(self):
59
57
        self.run_bzr('checkout --lightweight branch checkout')
60
58
        # 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)
 
59
        source = controldir.ControlDir.open('branch')
 
60
        result = controldir.ControlDir.open('checkout')
 
61
        self.assertEqual(source.open_branch().controldir.root_transport.base,
 
62
                         result.open_branch().controldir.root_transport.base)
65
63
 
66
64
    def test_checkout_dash_r(self):
67
 
        self.run_bzr('checkout -r -2 branch checkout')
 
65
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
68
66
        # the working tree should now be at revision '1' with the content
69
67
        # from 1.
70
 
        result = bzrdir.BzrDir.open('checkout')
71
 
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
72
 
        self.failIfExists('checkout/added_in_2')
 
68
        result = controldir.ControlDir.open('checkout')
 
69
        self.assertEqual([b'1'], result.open_workingtree().get_parent_ids())
 
70
        self.assertPathDoesNotExist('checkout/added_in_2')
73
71
 
74
72
    def test_checkout_light_dash_r(self):
75
 
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
 
73
        out, err = self.run_bzr(['checkout', '--lightweight', '-r', '-2',
 
74
                                 'branch', 'checkout'])
76
75
        # the working tree should now be at revision '1' with the content
77
76
        # from 1.
78
 
        result = bzrdir.BzrDir.open('checkout')
79
 
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
80
 
        self.failIfExists('checkout/added_in_2')
 
77
        result = controldir.ControlDir.open('checkout')
 
78
        self.assertEqual([b'1'], result.open_workingtree().get_parent_ids())
 
79
        self.assertPathDoesNotExist('checkout/added_in_2')
 
80
 
 
81
    def test_checkout_into_empty_dir(self):
 
82
        self.make_controldir('checkout')
 
83
        out, err = self.run_bzr(['checkout', 'branch', 'checkout'])
 
84
        result = controldir.ControlDir.open('checkout')
 
85
        tree = result.open_workingtree()
 
86
        branch = result.open_branch()
81
87
 
82
88
    def test_checkout_reconstitutes_working_trees(self):
83
 
        # doing a 'bzr checkout' in the directory of a branch with no tree
84
 
        # or a 'bzr checkout path' with path the name of a directory with
 
89
        # doing a 'brz checkout' in the directory of a branch with no tree
 
90
        # or a 'brz checkout path' with path the name of a directory with
85
91
        # a branch with no tree will reconsistute the tree.
86
92
        os.mkdir('treeless-branch')
87
 
        branch = bzrdir.BzrDir.create_branch_convenience(
 
93
        branch = controldir.ControlDir.create_branch_convenience(
88
94
            'treeless-branch',
89
95
            force_new_tree=False,
90
96
            format=bzrdir.BzrDirMetaFormat1())
91
97
        # check no tree was created
92
 
        self.assertRaises(errors.NoWorkingTree, branch.bzrdir.open_workingtree)
 
98
        self.assertRaises(errors.NoWorkingTree,
 
99
                          branch.controldir.open_workingtree)
93
100
        out, err = self.run_bzr('checkout treeless-branch')
94
101
        # we should have a tree now
95
 
        branch.bzrdir.open_workingtree()
 
102
        branch.controldir.open_workingtree()
96
103
        # with no diff
97
104
        out, err = self.run_bzr('diff treeless-branch')
98
105
 
99
106
        # now test with no parameters
100
 
        branch = bzrdir.BzrDir.create_branch_convenience(
 
107
        branch = controldir.ControlDir.create_branch_convenience(
101
108
            '.',
102
109
            force_new_tree=False,
103
110
            format=bzrdir.BzrDirMetaFormat1())
104
111
        # check no tree was created
105
 
        self.assertRaises(errors.NoWorkingTree, branch.bzrdir.open_workingtree)
 
112
        self.assertRaises(errors.NoWorkingTree,
 
113
                          branch.controldir.open_workingtree)
106
114
        out, err = self.run_bzr('checkout')
107
115
        # we should have a tree now
108
 
        branch.bzrdir.open_workingtree()
 
116
        branch.controldir.open_workingtree()
109
117
        # with no diff
110
118
        out, err = self.run_bzr('diff')
111
119
 
112
120
    def _test_checkout_existing_dir(self, lightweight):
113
121
        source = self.make_branch_and_tree('source')
114
 
        self.build_tree_contents([('source/file1', 'content1'),
115
 
                                  ('source/file2', 'content2'),])
 
122
        self.build_tree_contents([('source/file1', b'content1'),
 
123
                                  ('source/file2', b'content2'), ])
116
124
        source.add(['file1', 'file2'])
117
125
        source.commit('added files')
118
 
        self.build_tree_contents([('target/', ''),
119
 
                                  ('target/file1', 'content1'),
120
 
                                  ('target/file2', 'content3'),])
 
126
        self.build_tree_contents([('target/', b''),
 
127
                                  ('target/file1', b'content1'),
 
128
                                  ('target/file2', b'content3'), ])
121
129
        cmd = ['checkout', 'source', 'target']
122
130
        if lightweight:
123
131
            cmd.append('--lightweight')
124
132
        self.run_bzr('checkout source target')
125
133
        # files with unique content should be moved
126
 
        self.failUnlessExists('target/file2.moved')
 
134
        self.assertPathExists('target/file2.moved')
127
135
        # files with content matching tree should not be moved
128
 
        self.failIfExists('target/file1.moved')
 
136
        self.assertPathDoesNotExist('target/file1.moved')
129
137
 
130
138
    def test_checkout_existing_dir_heavy(self):
131
139
        self._test_checkout_existing_dir(False)
135
143
 
136
144
    def test_checkout_in_branch_with_r(self):
137
145
        branch = _mod_branch.Branch.open('branch')
138
 
        branch.bzrdir.destroy_workingtree()
139
 
        os.chdir('branch')
140
 
        self.run_bzr('checkout -r 1')
141
 
        tree = workingtree.WorkingTree.open('.')
142
 
        self.assertEqual('1', tree.last_revision())
143
 
        branch.bzrdir.destroy_workingtree()
144
 
        self.run_bzr('checkout -r 0')
145
 
        self.assertEqual('null:', tree.last_revision())
 
146
        branch.controldir.destroy_workingtree()
 
147
        self.run_bzr('checkout -r 1', working_dir='branch')
 
148
        tree = workingtree.WorkingTree.open('branch')
 
149
        self.assertEqual(b'1', tree.last_revision())
 
150
        branch.controldir.destroy_workingtree()
 
151
        self.run_bzr('checkout -r 0', working_dir='branch')
 
152
        self.assertEqual(b'null:', tree.last_revision())
146
153
 
147
154
    def test_checkout_files_from(self):
148
155
        branch = _mod_branch.Branch.open('branch')
155
162
        self.build_tree(['source/file1'])
156
163
        source.add('file1')
157
164
        source.commit('added file')
158
 
        out, err = self.run_bzr(['checkout', 'source', 'target',
159
 
            '--files-from', 'source',
160
 
            '--hardlink'])
 
165
        out, err = self.run_bzr('checkout source target --hardlink')
161
166
        source_stat = os.stat('source/file1')
162
167
        target_stat = os.stat('target/file1')
163
168
        self.assertEqual(source_stat, target_stat)
 
169
 
 
170
    def test_checkout_hardlink_files_from(self):
 
171
        self.requireFeature(HardlinkFeature)
 
172
        source = self.make_branch_and_tree('source')
 
173
        self.build_tree(['source/file1'])
 
174
        source.add('file1')
 
175
        source.commit('added file')
 
176
        source.controldir.sprout('second')
 
177
        out, err = self.run_bzr('checkout source target --hardlink'
 
178
                                ' --files-from second')
 
179
        second_stat = os.stat('second/file1')
 
180
        target_stat = os.stat('target/file1')
 
181
        self.assertEqual(second_stat, target_stat)
 
182
 
 
183
    def test_colo_checkout(self):
 
184
        source = self.make_branch_and_tree('source', format='development-colo')
 
185
        self.build_tree(['source/file1'])
 
186
        source.add('file1')
 
187
        source.commit('added file')
 
188
        target = source.controldir.sprout('file:second,branch=somebranch',
 
189
                                          create_tree_if_local=False)
 
190
        out, err = self.run_bzr('checkout file:,branch=somebranch .',
 
191
                                working_dir='second')
 
192
        # We should always be creating a lighweight checkout for colocated
 
193
        # branches.
 
194
        self.assertEqual(
 
195
            target.open_branch(name='somebranch').user_url,
 
196
            target.get_branch_reference(name=""))