4763.2.4
by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry. |
1 |
# Copyright (C) 2006, 2007, 2009, 2010 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 |
from cStringIO import StringIO |
|
20 |
import os |
|
21 |
import re |
|
22 |
import shutil |
|
23 |
import sys |
|
24 |
||
1551.15.60
by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708) |
25 |
from bzrlib import ( |
26 |
branch as _mod_branch, |
|
27 |
bzrdir, |
|
28 |
errors, |
|
29 |
workingtree, |
|
30 |
)
|
|
5283.4.5
by Martin Pool
Update remaining subclasses of ExternalBase |
31 |
from bzrlib.tests import ( |
32 |
TestCaseWithTransport, |
|
4580.4.3
by Martin Pool
KnownFailure for #408193 on checkout --hardlink |
33 |
)
|
34 |
from bzrlib.tests import ( |
|
35 |
HardlinkFeature, |
|
36 |
KnownFailure, |
|
37 |
)
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
38 |
|
39 |
||
5283.4.5
by Martin Pool
Update remaining subclasses of ExternalBase |
40 |
class TestCheckout(TestCaseWithTransport): |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
41 |
|
1508.1.20
by Robert Collins
Create a checkout command. |
42 |
def setUp(self): |
43 |
super(TestCheckout, self).setUp() |
|
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
44 |
tree = bzrdir.BzrDir.create_standalone_workingtree('branch') |
45 |
tree.commit('1', rev_id='1', allow_pointless=True) |
|
46 |
self.build_tree(['branch/added_in_2']) |
|
47 |
tree.add('added_in_2') |
|
48 |
tree.commit('2', rev_id='2') |
|
1508.1.20
by Robert Collins
Create a checkout command. |
49 |
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
50 |
def test_checkout_makes_bound_branch(self): |
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
51 |
self.run_bzr('checkout branch checkout') |
1508.1.20
by Robert Collins
Create a checkout command. |
52 |
# 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, |
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
56 |
result.open_branch().get_bound_location()) |
57 |
||
58 |
def test_checkout_light_makes_checkout(self): |
|
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
59 |
self.run_bzr('checkout --lightweight branch checkout') |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
60 |
# 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, |
|
1508.1.20
by Robert Collins
Create a checkout command. |
64 |
result.open_branch().bzrdir.root_transport.base) |
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
65 |
|
66 |
def test_checkout_dash_r(self): |
|
5195.3.1
by Parth Malwankar
heavyweight checkout shows a message indicating history copy. |
67 |
out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout']) |
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
68 |
# the working tree should now be at revision '1' with the content
|
69 |
# from 1.
|
|
70 |
result = bzrdir.BzrDir.open('checkout') |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
71 |
self.assertEqual(['1'], result.open_workingtree().get_parent_ids()) |
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
72 |
self.failIfExists('checkout/added_in_2') |
73 |
||
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
74 |
def test_checkout_light_dash_r(self): |
5195.3.1
by Parth Malwankar
heavyweight checkout shows a message indicating history copy. |
75 |
out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2', |
76 |
'branch', 'checkout']) |
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
77 |
# the working tree should now be at revision '1' with the content
|
78 |
# from 1.
|
|
79 |
result = bzrdir.BzrDir.open('checkout') |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
80 |
self.assertEqual(['1'], result.open_workingtree().get_parent_ids()) |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
81 |
self.failIfExists('checkout/added_in_2') |
82 |
||
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
83 |
def test_checkout_reconstitutes_working_trees(self): |
84 |
# doing a 'bzr checkout' in the directory of a branch with no tree
|
|
85 |
# or a 'bzr checkout path' with path the name of a directory with
|
|
86 |
# a branch with no tree will reconsistute the tree.
|
|
87 |
os.mkdir('treeless-branch') |
|
88 |
branch = bzrdir.BzrDir.create_branch_convenience( |
|
89 |
'treeless-branch', |
|
90 |
force_new_tree=False, |
|
91 |
format=bzrdir.BzrDirMetaFormat1()) |
|
92 |
# check no tree was created
|
|
93 |
self.assertRaises(errors.NoWorkingTree, branch.bzrdir.open_workingtree) |
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
94 |
out, err = self.run_bzr('checkout treeless-branch') |
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
95 |
# we should have a tree now
|
96 |
branch.bzrdir.open_workingtree() |
|
97 |
# with no diff
|
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
98 |
out, err = self.run_bzr('diff treeless-branch') |
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
99 |
|
100 |
# now test with no parameters
|
|
101 |
branch = bzrdir.BzrDir.create_branch_convenience( |
|
102 |
'.', |
|
103 |
force_new_tree=False, |
|
104 |
format=bzrdir.BzrDirMetaFormat1()) |
|
105 |
# check no tree was created
|
|
106 |
self.assertRaises(errors.NoWorkingTree, branch.bzrdir.open_workingtree) |
|
107 |
out, err = self.run_bzr('checkout') |
|
108 |
# we should have a tree now
|
|
109 |
branch.bzrdir.open_workingtree() |
|
110 |
# with no diff
|
|
111 |
out, err = self.run_bzr('diff') |
|
1551.15.60
by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708) |
112 |
|
1551.18.2
by Aaron Bentley
Checkout into existing trees works |
113 |
def _test_checkout_existing_dir(self, lightweight): |
114 |
source = self.make_branch_and_tree('source') |
|
115 |
self.build_tree_contents([('source/file1', 'content1'), |
|
116 |
('source/file2', 'content2'),]) |
|
117 |
source.add(['file1', 'file2']) |
|
118 |
source.commit('added files') |
|
119 |
self.build_tree_contents([('target/', ''), |
|
120 |
('target/file1', 'content1'), |
|
121 |
('target/file2', 'content3'),]) |
|
122 |
cmd = ['checkout', 'source', 'target'] |
|
123 |
if lightweight: |
|
124 |
cmd.append('--lightweight') |
|
125 |
self.run_bzr('checkout source target') |
|
126 |
# files with unique content should be moved
|
|
127 |
self.failUnlessExists('target/file2.moved') |
|
128 |
# files with content matching tree should not be moved
|
|
129 |
self.failIfExists('target/file1.moved') |
|
130 |
||
131 |
def test_checkout_existing_dir_heavy(self): |
|
132 |
self._test_checkout_existing_dir(False) |
|
133 |
||
134 |
def test_checkout_existing_dir_lightweight(self): |
|
135 |
self._test_checkout_existing_dir(True) |
|
136 |
||
1551.15.60
by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708) |
137 |
def test_checkout_in_branch_with_r(self): |
138 |
branch = _mod_branch.Branch.open('branch') |
|
139 |
branch.bzrdir.destroy_workingtree() |
|
140 |
os.chdir('branch') |
|
141 |
self.run_bzr('checkout -r 1') |
|
142 |
tree = workingtree.WorkingTree.open('.') |
|
143 |
self.assertEqual('1', tree.last_revision()) |
|
144 |
branch.bzrdir.destroy_workingtree() |
|
145 |
self.run_bzr('checkout -r 0') |
|
2598.5.12
by Aaron Bentley
Merge bzr.dev |
146 |
self.assertEqual('null:', tree.last_revision()) |
3123.5.3
by Aaron Bentley
Get tests passing with accelerator_tree |
147 |
|
148 |
def test_checkout_files_from(self): |
|
149 |
branch = _mod_branch.Branch.open('branch') |
|
150 |
self.run_bzr(['checkout', 'branch', 'branch2', '--files-from', |
|
151 |
'branch']) |
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
152 |
|
153 |
def test_checkout_hardlink(self): |
|
154 |
self.requireFeature(HardlinkFeature) |
|
155 |
source = self.make_branch_and_tree('source') |
|
156 |
self.build_tree(['source/file1']) |
|
157 |
source.add('file1') |
|
158 |
source.commit('added file') |
|
4580.4.3
by Martin Pool
KnownFailure for #408193 on checkout --hardlink |
159 |
out, err = self.run_bzr(['checkout', 'source', 'target', |
160 |
'--files-from', 'source', |
|
161 |
'--hardlink']) |
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
162 |
source_stat = os.stat('source/file1') |
163 |
target_stat = os.stat('target/file1') |
|
4826.1.4
by Andrew Bennetts
Remove KnownFailure from test_checkout_hardlink. |
164 |
self.assertEqual(source_stat, target_stat) |