1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
1399.1.12
by Robert Collins
add new test script |
2 |
# Authors: Robert Collins <robert.collins@canonical.com>
|
3 |
#
|
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
18 |
from cStringIO import StringIO |
1399.1.12
by Robert Collins
add new test script |
19 |
import os |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
20 |
|
21 |
import bzrlib |
|
1399.1.12
by Robert Collins
add new test script |
22 |
from bzrlib.branch import Branch |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
23 |
import bzrlib.bzrdir as bzrdir |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
24 |
from bzrlib.bzrdir import BzrDir |
1534.10.20
by Aaron Bentley
Got all tests passing |
25 |
from bzrlib.conflicts import * |
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
26 |
import bzrlib.errors as errors |
1508.1.3
by Robert Collins
Do not consider urls to be relative paths within working trees. |
27 |
from bzrlib.errors import NotBranchError, NotVersionedError |
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
28 |
from bzrlib.lockdir import LockDir |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
29 |
from bzrlib.osutils import pathjoin, getcwd, has_symlinks |
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
30 |
from bzrlib.tests import TestCaseWithTransport, TestSkipped |
1399.1.12
by Robert Collins
add new test script |
31 |
from bzrlib.trace import mutter |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
32 |
from bzrlib.transport import get_transport |
33 |
import bzrlib.workingtree as workingtree |
|
1457.1.1
by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own. |
34 |
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink, |
35 |
WorkingTree) |
|
1399.1.12
by Robert Collins
add new test script |
36 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
37 |
class TestTreeDirectory(TestCaseWithTransport): |
1399.1.12
by Robert Collins
add new test script |
38 |
|
39 |
def test_kind_character(self): |
|
40 |
self.assertEqual(TreeDirectory().kind_character(), '/') |
|
41 |
||
42 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
43 |
class TestTreeEntry(TestCaseWithTransport): |
1399.1.12
by Robert Collins
add new test script |
44 |
|
45 |
def test_kind_character(self): |
|
46 |
self.assertEqual(TreeEntry().kind_character(), '???') |
|
47 |
||
48 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
49 |
class TestTreeFile(TestCaseWithTransport): |
1399.1.12
by Robert Collins
add new test script |
50 |
|
51 |
def test_kind_character(self): |
|
52 |
self.assertEqual(TreeFile().kind_character(), '') |
|
53 |
||
54 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
55 |
class TestTreeLink(TestCaseWithTransport): |
1399.1.12
by Robert Collins
add new test script |
56 |
|
57 |
def test_kind_character(self): |
|
58 |
self.assertEqual(TreeLink().kind_character(), '') |
|
59 |
||
60 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
61 |
class TestDefaultFormat(TestCaseWithTransport): |
62 |
||
63 |
def test_get_set_default_format(self): |
|
64 |
old_format = workingtree.WorkingTreeFormat.get_default_format() |
|
65 |
# default is 3
|
|
66 |
self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3)) |
|
67 |
workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat()) |
|
68 |
try: |
|
69 |
# the default branch format is used by the meta dir format
|
|
70 |
# which is not the default bzrdir format at this point
|
|
71 |
dir = bzrdir.BzrDirMetaFormat1().initialize('.') |
|
72 |
dir.create_repository() |
|
73 |
dir.create_branch() |
|
74 |
result = dir.create_workingtree() |
|
75 |
self.assertEqual(result, 'A tree') |
|
76 |
finally: |
|
77 |
workingtree.WorkingTreeFormat.set_default_format(old_format) |
|
78 |
self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format()) |
|
79 |
||
80 |
||
81 |
class SampleTreeFormat(workingtree.WorkingTreeFormat): |
|
82 |
"""A sample format
|
|
83 |
||
84 |
this format is initializable, unsupported to aid in testing the
|
|
85 |
open and open_downlevel routines.
|
|
86 |
"""
|
|
87 |
||
88 |
def get_format_string(self): |
|
89 |
"""See WorkingTreeFormat.get_format_string()."""
|
|
90 |
return "Sample tree format." |
|
91 |
||
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
92 |
def initialize(self, a_bzrdir, revision_id=None): |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
93 |
"""Sample branches cannot be created."""
|
94 |
t = a_bzrdir.get_workingtree_transport(self) |
|
95 |
t.put('format', StringIO(self.get_format_string())) |
|
96 |
return 'A tree' |
|
97 |
||
98 |
def is_supported(self): |
|
99 |
return False |
|
100 |
||
101 |
def open(self, transport, _found=False): |
|
102 |
return "opened tree." |
|
103 |
||
104 |
||
105 |
class TestWorkingTreeFormat(TestCaseWithTransport): |
|
106 |
"""Tests for the WorkingTreeFormat facility."""
|
|
107 |
||
108 |
def test_find_format(self): |
|
109 |
# is the right format object found for a working tree?
|
|
110 |
# create a branch with a few known format objects.
|
|
111 |
self.build_tree(["foo/", "bar/"]) |
|
112 |
def check_format(format, url): |
|
113 |
dir = format._matchingbzrdir.initialize(url) |
|
114 |
dir.create_repository() |
|
115 |
dir.create_branch() |
|
116 |
format.initialize(dir) |
|
117 |
t = get_transport(url) |
|
118 |
found_format = workingtree.WorkingTreeFormat.find_format(dir) |
|
119 |
self.failUnless(isinstance(found_format, format.__class__)) |
|
120 |
check_format(workingtree.WorkingTreeFormat3(), "bar") |
|
121 |
||
122 |
def test_find_format_no_tree(self): |
|
123 |
dir = bzrdir.BzrDirMetaFormat1().initialize('.') |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
124 |
self.assertRaises(errors.NoWorkingTree, |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
125 |
workingtree.WorkingTreeFormat.find_format, |
126 |
dir) |
|
127 |
||
128 |
def test_find_format_unknown_format(self): |
|
129 |
dir = bzrdir.BzrDirMetaFormat1().initialize('.') |
|
130 |
dir.create_repository() |
|
131 |
dir.create_branch() |
|
132 |
SampleTreeFormat().initialize(dir) |
|
133 |
self.assertRaises(errors.UnknownFormatError, |
|
134 |
workingtree.WorkingTreeFormat.find_format, |
|
135 |
dir) |
|
136 |
||
137 |
def test_register_unregister_format(self): |
|
138 |
format = SampleTreeFormat() |
|
139 |
# make a control dir
|
|
140 |
dir = bzrdir.BzrDirMetaFormat1().initialize('.') |
|
141 |
dir.create_repository() |
|
142 |
dir.create_branch() |
|
143 |
# make a branch
|
|
144 |
format.initialize(dir) |
|
145 |
# register a format for it.
|
|
146 |
workingtree.WorkingTreeFormat.register_format(format) |
|
147 |
# which branch.Open will refuse (not supported)
|
|
148 |
self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.') |
|
149 |
# but open_downlevel will work
|
|
150 |
self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.')) |
|
151 |
# unregister the format
|
|
152 |
workingtree.WorkingTreeFormat.unregister_format(format) |
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
153 |
|
154 |
||
155 |
class TestWorkingTreeFormat3(TestCaseWithTransport): |
|
156 |
"""Tests specific to WorkingTreeFormat3."""
|
|
157 |
||
158 |
def test_disk_layout(self): |
|
159 |
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url()) |
|
160 |
control.create_repository() |
|
161 |
control.create_branch() |
|
162 |
tree = workingtree.WorkingTreeFormat3().initialize(control) |
|
163 |
# we want:
|
|
164 |
# format 'Bazaar-NG Working Tree format 3'
|
|
165 |
# inventory = blank inventory
|
|
166 |
# pending-merges = ''
|
|
167 |
# stat-cache = ??
|
|
168 |
# no inventory.basis yet
|
|
169 |
t = control.get_workingtree_transport(None) |
|
1553.5.81
by Martin Pool
Revert change to WorkingTreeFormat3 format string; too many things want it the old way |
170 |
self.assertEqualDiff('Bazaar-NG Working Tree format 3', |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
171 |
t.get('format').read()) |
172 |
self.assertEqualDiff('<inventory format="5">\n' |
|
173 |
'</inventory>\n', |
|
174 |
t.get('inventory').read()) |
|
175 |
self.assertEqualDiff('### bzr hashcache v5\n', |
|
176 |
t.get('stat-cache').read()) |
|
177 |
self.assertFalse(t.has('inventory.basis')) |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
178 |
# no last-revision file means 'None' or 'NULLREVISION'
|
179 |
self.assertFalse(t.has('last-revision')) |
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
180 |
# TODO RBC 20060210 do a commit, check the inventory.basis is created
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
181 |
# correctly and last-revision file becomes present.
|
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
182 |
|
183 |
def test_uses_lockdir(self): |
|
184 |
"""WorkingTreeFormat3 uses its own LockDir:
|
|
185 |
|
|
186 |
- lock is a directory
|
|
187 |
- when the WorkingTree is locked, LockDir can see that
|
|
188 |
"""
|
|
189 |
t = self.get_transport() |
|
190 |
url = self.get_url() |
|
191 |
dir = bzrdir.BzrDirMetaFormat1().initialize(url) |
|
192 |
repo = dir.create_repository() |
|
193 |
branch = dir.create_branch() |
|
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
194 |
try: |
195 |
tree = workingtree.WorkingTreeFormat3().initialize(dir) |
|
196 |
except errors.NotLocalUrl: |
|
197 |
raise TestSkipped('Not a local URL') |
|
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
198 |
self.assertIsDirectory('.bzr', t) |
199 |
self.assertIsDirectory('.bzr/checkout', t) |
|
200 |
self.assertIsDirectory('.bzr/checkout/lock', t) |
|
201 |
our_lock = LockDir(t, '.bzr/checkout/lock') |
|
202 |
self.assertEquals(our_lock.peek(), None) |
|
1553.5.75
by Martin Pool
Additional WorkingTree LockDir test |
203 |
tree.lock_write() |
204 |
self.assertTrue(our_lock.peek()) |
|
205 |
tree.unlock() |
|
206 |
self.assertEquals(our_lock.peek(), None) |
|
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
207 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
208 |
|
209 |
class TestFormat2WorkingTree(TestCaseWithTransport): |
|
210 |
"""Tests that are specific to format 2 trees."""
|
|
211 |
||
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
212 |
def create_format2_tree(self, url): |
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
213 |
return self.make_branch_and_tree( |
214 |
url, format=bzrlib.bzrdir.BzrDirFormat6()) |
|
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
215 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
216 |
def test_conflicts(self): |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
217 |
# test backwards compatability
|
218 |
tree = self.create_format2_tree('.') |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
219 |
self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts, |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
220 |
None) |
221 |
file('lala.BASE', 'wb').write('labase') |
|
1534.10.20
by Aaron Bentley
Got all tests passing |
222 |
expected = ContentsConflict('lala') |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
223 |
self.assertEqual(list(tree.conflicts()), [expected]) |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
224 |
file('lala', 'wb').write('la') |
225 |
tree.add('lala', 'lala-id') |
|
1534.10.20
by Aaron Bentley
Got all tests passing |
226 |
expected = ContentsConflict('lala', file_id='lala-id') |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
227 |
self.assertEqual(list(tree.conflicts()), [expected]) |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
228 |
file('lala.THIS', 'wb').write('lathis') |
229 |
file('lala.OTHER', 'wb').write('laother') |
|
230 |
# When "text conflict"s happen, stem, THIS and OTHER are text
|
|
1534.10.20
by Aaron Bentley
Got all tests passing |
231 |
expected = TextConflict('lala', file_id='lala-id') |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
232 |
self.assertEqual(list(tree.conflicts()), [expected]) |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
233 |
os.unlink('lala.OTHER') |
234 |
os.mkdir('lala.OTHER') |
|
1534.10.20
by Aaron Bentley
Got all tests passing |
235 |
expected = ContentsConflict('lala', file_id='lala-id') |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
236 |
self.assertEqual(list(tree.conflicts()), [expected]) |