bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
6614.1.3
by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual. |
1 |
# Copyright (C) 2006, 2007, 2009-2012, 2016 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
16 |
|
17 |
"""Tests for the 'checkout' CLI command."""
|
|
18 |
||
19 |
import os |
|
20 |
||
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
21 |
from breezy import ( |
|
1551.15.60
by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708) |
22 |
branch as _mod_branch, |
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
23 |
controldir, |
|
1551.15.60
by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708) |
24 |
errors, |
25 |
workingtree, |
|
26 |
)
|
|
|
6670.4.3
by Jelmer Vernooij
Fix more imports. |
27 |
from breezy.bzr import ( |
28 |
bzrdir, |
|
29 |
)
|
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
30 |
from breezy.tests import ( |
|
5283.4.5
by Martin Pool
Update remaining subclasses of ExternalBase |
31 |
TestCaseWithTransport, |
|
4580.4.3
by Martin Pool
KnownFailure for #408193 on checkout --hardlink |
32 |
)
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
33 |
from breezy.tests.matchers import ContainsNoVfsCalls |
34 |
from breezy.tests.features import ( |
|
|
4580.4.3
by Martin Pool
KnownFailure for #408193 on checkout --hardlink |
35 |
HardlinkFeature, |
36 |
)
|
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
37 |
|
38 |
||
|
5283.4.5
by Martin Pool
Update remaining subclasses of ExternalBase |
39 |
class TestCheckout(TestCaseWithTransport): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
40 |
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
41 |
def setUp(self): |
42 |
super(TestCheckout, self).setUp() |
|
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
43 |
tree = controldir.ControlDir.create_standalone_workingtree('branch') |
|
6855.4.1
by Jelmer Vernooij
Yet more bees. |
44 |
tree.commit('1', rev_id=b'1', allow_pointless=True) |
|
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
45 |
self.build_tree(['branch/added_in_2']) |
46 |
tree.add('added_in_2') |
|
|
6855.4.1
by Jelmer Vernooij
Yet more bees. |
47 |
tree.commit('2', rev_id=b'2') |
|
1508.1.20
by Robert Collins
Create a checkout command. |
48 |
|
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
49 |
def test_checkout_makes_bound_branch(self): |
|
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
50 |
self.run_bzr('checkout branch checkout') |
|
1508.1.20
by Robert Collins
Create a checkout command. |
51 |
# if we have a checkout, the branch base should be 'branch'
|
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
52 |
source = controldir.ControlDir.open('branch') |
53 |
result = controldir.ControlDir.open('checkout') |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
54 |
self.assertEqual(source.open_branch().controldir.root_transport.base, |
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
55 |
result.open_branch().get_bound_location()) |
56 |
||
57 |
def test_checkout_light_makes_checkout(self): |
|
|
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
58 |
self.run_bzr('checkout --lightweight branch checkout') |
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
59 |
# if we have a checkout, the branch base should be 'branch'
|
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
60 |
source = controldir.ControlDir.open('branch') |
61 |
result = controldir.ControlDir.open('checkout') |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
62 |
self.assertEqual(source.open_branch().controldir.root_transport.base, |
63 |
result.open_branch().controldir.root_transport.base) |
|
|
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
64 |
|
65 |
def test_checkout_dash_r(self): |
|
|
5195.3.1
by Parth Malwankar
heavyweight checkout shows a message indicating history copy. |
66 |
out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout']) |
|
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
67 |
# the working tree should now be at revision '1' with the content
|
68 |
# from 1.
|
|
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
69 |
result = controldir.ControlDir.open('checkout') |
|
6973.12.9
by Jelmer Vernooij
More fixes. |
70 |
self.assertEqual([b'1'], result.open_workingtree().get_parent_ids()) |
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
71 |
self.assertPathDoesNotExist('checkout/added_in_2') |
|
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
72 |
|
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
73 |
def test_checkout_light_dash_r(self): |
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
74 |
out, err = self.run_bzr(['checkout', '--lightweight', '-r', '-2', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
75 |
'branch', 'checkout']) |
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
76 |
# the working tree should now be at revision '1' with the content
|
77 |
# from 1.
|
|
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
78 |
result = controldir.ControlDir.open('checkout') |
|
6973.12.9
by Jelmer Vernooij
More fixes. |
79 |
self.assertEqual([b'1'], result.open_workingtree().get_parent_ids()) |
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
80 |
self.assertPathDoesNotExist('checkout/added_in_2') |
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
81 |
|
|
6437.10.3
by Jelmer Vernooij
Allow checkouts into empty target directories. |
82 |
def test_checkout_into_empty_dir(self): |
|
6653.6.5
by Jelmer Vernooij
Rename make_bzrdir to make_controldir. |
83 |
self.make_controldir('checkout') |
|
6437.10.3
by Jelmer Vernooij
Allow checkouts into empty target directories. |
84 |
out, err = self.run_bzr(['checkout', 'branch', 'checkout']) |
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
85 |
result = controldir.ControlDir.open('checkout') |
|
6437.10.3
by Jelmer Vernooij
Allow checkouts into empty target directories. |
86 |
tree = result.open_workingtree() |
87 |
branch = result.open_branch() |
|
88 |
||
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
89 |
def test_checkout_reconstitutes_working_trees(self): |
|
6622.1.29
by Jelmer Vernooij
Fix some more tests. |
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
|
|
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
92 |
# a branch with no tree will reconsistute the tree.
|
93 |
os.mkdir('treeless-branch') |
|
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
94 |
branch = controldir.ControlDir.create_branch_convenience( |
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
95 |
'treeless-branch', |
96 |
force_new_tree=False, |
|
97 |
format=bzrdir.BzrDirMetaFormat1()) |
|
98 |
# check no tree was created
|
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
99 |
self.assertRaises(errors.NoWorkingTree, |
100 |
branch.controldir.open_workingtree) |
|
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
101 |
out, err = self.run_bzr('checkout treeless-branch') |
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
102 |
# we should have a tree now
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
103 |
branch.controldir.open_workingtree() |
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
104 |
# with no diff
|
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
105 |
out, err = self.run_bzr('diff treeless-branch') |
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
106 |
|
107 |
# now test with no parameters
|
|
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
108 |
branch = controldir.ControlDir.create_branch_convenience( |
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
109 |
'.', |
110 |
force_new_tree=False, |
|
111 |
format=bzrdir.BzrDirMetaFormat1()) |
|
112 |
# check no tree was created
|
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
113 |
self.assertRaises(errors.NoWorkingTree, |
114 |
branch.controldir.open_workingtree) |
|
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
115 |
out, err = self.run_bzr('checkout') |
116 |
# we should have a tree now
|
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
117 |
branch.controldir.open_workingtree() |
|
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
118 |
# with no diff
|
119 |
out, err = self.run_bzr('diff') |
|
|
1551.15.60
by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708) |
120 |
|
|
1551.18.2
by Aaron Bentley
Checkout into existing trees works |
121 |
def _test_checkout_existing_dir(self, lightweight): |
122 |
source = self.make_branch_and_tree('source') |
|
|
6855.4.1
by Jelmer Vernooij
Yet more bees. |
123 |
self.build_tree_contents([('source/file1', b'content1'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
124 |
('source/file2', b'content2'), ]) |
|
1551.18.2
by Aaron Bentley
Checkout into existing trees works |
125 |
source.add(['file1', 'file2']) |
126 |
source.commit('added files') |
|
|
6855.4.1
by Jelmer Vernooij
Yet more bees. |
127 |
self.build_tree_contents([('target/', b''), |
128 |
('target/file1', b'content1'), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
129 |
('target/file2', b'content3'), ]) |
|
1551.18.2
by Aaron Bentley
Checkout into existing trees works |
130 |
cmd = ['checkout', 'source', 'target'] |
131 |
if lightweight: |
|
132 |
cmd.append('--lightweight') |
|
133 |
self.run_bzr('checkout source target') |
|
134 |
# files with unique content should be moved
|
|
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
135 |
self.assertPathExists('target/file2.moved') |
|
1551.18.2
by Aaron Bentley
Checkout into existing trees works |
136 |
# files with content matching tree should not be moved
|
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
137 |
self.assertPathDoesNotExist('target/file1.moved') |
|
1551.18.2
by Aaron Bentley
Checkout into existing trees works |
138 |
|
139 |
def test_checkout_existing_dir_heavy(self): |
|
140 |
self._test_checkout_existing_dir(False) |
|
141 |
||
142 |
def test_checkout_existing_dir_lightweight(self): |
|
143 |
self._test_checkout_existing_dir(True) |
|
144 |
||
|
1551.15.60
by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708) |
145 |
def test_checkout_in_branch_with_r(self): |
146 |
branch = _mod_branch.Branch.open('branch') |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
147 |
branch.controldir.destroy_workingtree() |
|
6423.1.1
by Vincent Ladeuil
Cleanup old blackbox tests and then some. Remove os.chdir() calls, caught a few bugs, make sure we don't leave file handles opened. |
148 |
self.run_bzr('checkout -r 1', working_dir='branch') |
149 |
tree = workingtree.WorkingTree.open('branch') |
|
|
6973.12.9
by Jelmer Vernooij
More fixes. |
150 |
self.assertEqual(b'1', tree.last_revision()) |
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
151 |
branch.controldir.destroy_workingtree() |
|
6423.1.1
by Vincent Ladeuil
Cleanup old blackbox tests and then some. Remove os.chdir() calls, caught a few bugs, make sure we don't leave file handles opened. |
152 |
self.run_bzr('checkout -r 0', working_dir='branch') |
|
6973.12.9
by Jelmer Vernooij
More fixes. |
153 |
self.assertEqual(b'null:', tree.last_revision()) |
|
3123.5.3
by Aaron Bentley
Get tests passing with accelerator_tree |
154 |
|
155 |
def test_checkout_files_from(self): |
|
156 |
branch = _mod_branch.Branch.open('branch') |
|
157 |
self.run_bzr(['checkout', 'branch', 'branch2', '--files-from', |
|
158 |
'branch']) |
|
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
159 |
|
160 |
def test_checkout_hardlink(self): |
|
161 |
self.requireFeature(HardlinkFeature) |
|
162 |
source = self.make_branch_and_tree('source') |
|
163 |
self.build_tree(['source/file1']) |
|
164 |
source.add('file1') |
|
165 |
source.commit('added file') |
|
|
5353.2.2
by John Arbash Meinel
update the test suite. |
166 |
out, err = self.run_bzr('checkout source target --hardlink') |
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
167 |
source_stat = os.stat('source/file1') |
168 |
target_stat = os.stat('target/file1') |
|
|
4826.1.4
by Andrew Bennetts
Remove KnownFailure from test_checkout_hardlink. |
169 |
self.assertEqual(source_stat, target_stat) |
|
5353.2.2
by John Arbash Meinel
update the test suite. |
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') |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
177 |
source.controldir.sprout('second') |
|
5353.2.2
by John Arbash Meinel
update the test suite. |
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) |
|
|
6323.2.1
by Jelmer Vernooij
Add hpss call count tests for checkout. |
183 |
|
|
6437.17.1
by Jelmer Vernooij
Checkouts of colocated branches are always lightweight. |
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') |
|
|
6653.6.1
by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir. |
189 |
target = source.controldir.sprout('file:second,branch=somebranch', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
190 |
create_tree_if_local=False) |
|
6437.17.1
by Jelmer Vernooij
Checkouts of colocated branches are always lightweight. |
191 |
out, err = self.run_bzr('checkout file:,branch=somebranch .', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
192 |
working_dir='second') |
|
6437.17.1
by Jelmer Vernooij
Checkouts of colocated branches are always lightweight. |
193 |
# We should always be creating a lighweight checkout for colocated
|
194 |
# branches.
|
|
|
6614.1.3
by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual. |
195 |
self.assertEqual( |
|
6929.8.6
by Jelmer Vernooij
Fix test. |
196 |
target.open_branch(name='somebranch').user_url, |
|
6437.17.1
by Jelmer Vernooij
Checkouts of colocated branches are always lightweight. |
197 |
target.get_branch_reference(name="")) |
198 |
||
|
6323.2.1
by Jelmer Vernooij
Add hpss call count tests for checkout. |
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() |
|
|
6282.6.12
by Jelmer Vernooij
merge hpss-call-count branch. |
208 |
out, err = self.run_bzr(['checkout', self.get_url('from'), 'target']) |
|
6323.2.1
by Jelmer Vernooij
Add hpss call count tests for checkout. |
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.
|
|
|
6305.5.6
by Jelmer Vernooij
Fix call counts. |
214 |
self.assertLength(10, self.hpss_calls) |
|
6366.1.4
by Jelmer Vernooij
Test connection count calls for most blackbox commands. |
215 |
self.assertLength(1, self.hpss_connections) |
|
6305.5.15
by Jelmer Vernooij
Merge bzr.dev. |
216 |
self.assertThat(self.hpss_calls, ContainsNoVfsCalls) |
|
6323.2.1
by Jelmer Vernooij
Add hpss call count tests for checkout. |
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'), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
225 |
'target']) |
|
6323.2.1
by Jelmer Vernooij
Add hpss call count tests for checkout. |
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.
|
|
|
6404.6.1
by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. |
231 |
self.assertLength(13, self.hpss_calls) |
|
6282.6.42
by Jelmer Vernooij
merge hpss-get-checkout-format. |
232 |
self.assertThat(self.hpss_calls, ContainsNoVfsCalls) |