1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
|
# Copyright (C) 2005-2010 Canonical Ltd
# Authors: Robert Collins <robert.collins@canonical.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
from cStringIO import StringIO
import os
from bzrlib import (
bzrdir,
conflicts,
errors,
workingtree,
)
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
from bzrlib.lockdir import LockDir
from bzrlib.mutabletree import needs_tree_write_lock
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
from bzrlib.transport import get_transport
from bzrlib.workingtree import (
TreeEntry,
TreeDirectory,
TreeFile,
TreeLink,
)
class TestTreeDirectory(TestCaseWithTransport):
def test_kind_character(self):
self.assertEqual(TreeDirectory().kind_character(), '/')
class TestTreeEntry(TestCaseWithTransport):
def test_kind_character(self):
self.assertEqual(TreeEntry().kind_character(), '???')
class TestTreeFile(TestCaseWithTransport):
def test_kind_character(self):
self.assertEqual(TreeFile().kind_character(), '')
class TestTreeLink(TestCaseWithTransport):
def test_kind_character(self):
self.assertEqual(TreeLink().kind_character(), '')
class TestDefaultFormat(TestCaseWithTransport):
def test_get_set_default_format(self):
old_format = workingtree.WorkingTreeFormat.get_default_format()
# default is 3
self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
try:
# the default branch format is used by the meta dir format
# which is not the default bzrdir format at this point
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
dir.create_repository()
dir.create_branch()
result = dir.create_workingtree()
self.assertEqual(result, 'A tree')
finally:
workingtree.WorkingTreeFormat.set_default_format(old_format)
self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
def test_open(self):
tree = self.make_branch_and_tree('.')
open_direct = workingtree.WorkingTree.open('.')
self.assertEqual(tree.basedir, open_direct.basedir)
open_no_args = workingtree.WorkingTree.open()
self.assertEqual(tree.basedir, open_no_args.basedir)
def test_open_containing(self):
tree = self.make_branch_and_tree('.')
open_direct, relpath = workingtree.WorkingTree.open_containing('.')
self.assertEqual(tree.basedir, open_direct.basedir)
self.assertEqual('', relpath)
open_no_args, relpath = workingtree.WorkingTree.open_containing()
self.assertEqual(tree.basedir, open_no_args.basedir)
self.assertEqual('', relpath)
open_subdir, relpath = workingtree.WorkingTree.open_containing('subdir')
self.assertEqual(tree.basedir, open_subdir.basedir)
self.assertEqual('subdir', relpath)
class SampleTreeFormat(workingtree.WorkingTreeFormat):
"""A sample format
this format is initializable, unsupported to aid in testing the
open and open_downlevel routines.
"""
def get_format_string(self):
"""See WorkingTreeFormat.get_format_string()."""
return "Sample tree format."
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
accelerator_tree=None, hardlink=False):
"""Sample branches cannot be created."""
t = a_bzrdir.get_workingtree_transport(self)
t.put_bytes('format', self.get_format_string())
return 'A tree'
def is_supported(self):
return False
def open(self, transport, _found=False):
return "opened tree."
class TestWorkingTreeFormat(TestCaseWithTransport):
"""Tests for the WorkingTreeFormat facility."""
def test_find_format(self):
# is the right format object found for a working tree?
# create a branch with a few known format objects.
self.build_tree(["foo/", "bar/"])
def check_format(format, url):
dir = format._matchingbzrdir.initialize(url)
dir.create_repository()
dir.create_branch()
format.initialize(dir)
t = get_transport(url)
found_format = workingtree.WorkingTreeFormat.find_format(dir)
self.failUnless(isinstance(found_format, format.__class__))
check_format(workingtree.WorkingTreeFormat3(), "bar")
def test_find_format_no_tree(self):
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
self.assertRaises(errors.NoWorkingTree,
workingtree.WorkingTreeFormat.find_format,
dir)
def test_find_format_unknown_format(self):
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
dir.create_repository()
dir.create_branch()
SampleTreeFormat().initialize(dir)
self.assertRaises(errors.UnknownFormatError,
workingtree.WorkingTreeFormat.find_format,
dir)
def test_register_unregister_format(self):
format = SampleTreeFormat()
# make a control dir
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
dir.create_repository()
dir.create_branch()
# make a branch
format.initialize(dir)
# register a format for it.
workingtree.WorkingTreeFormat.register_format(format)
# which branch.Open will refuse (not supported)
self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
# but open_downlevel will work
self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
# unregister the format
workingtree.WorkingTreeFormat.unregister_format(format)
class TestWorkingTreeFormat3(TestCaseWithTransport):
"""Tests specific to WorkingTreeFormat3."""
def test_disk_layout(self):
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
control.create_repository()
control.create_branch()
tree = workingtree.WorkingTreeFormat3().initialize(control)
# we want:
# format 'Bazaar-NG Working Tree format 3'
# inventory = blank inventory
# pending-merges = ''
# stat-cache = ??
# no inventory.basis yet
t = control.get_workingtree_transport(None)
self.assertEqualDiff('Bazaar-NG Working Tree format 3',
t.get('format').read())
self.assertEqualDiff(t.get('inventory').read(),
'<inventory format="5">\n'
'</inventory>\n',
)
self.assertEqualDiff('### bzr hashcache v5\n',
t.get('stat-cache').read())
self.assertFalse(t.has('inventory.basis'))
# no last-revision file means 'None' or 'NULLREVISION'
self.assertFalse(t.has('last-revision'))
# TODO RBC 20060210 do a commit, check the inventory.basis is created
# correctly and last-revision file becomes present.
def test_uses_lockdir(self):
"""WorkingTreeFormat3 uses its own LockDir:
- lock is a directory
- when the WorkingTree is locked, LockDir can see that
"""
t = self.get_transport()
url = self.get_url()
dir = bzrdir.BzrDirMetaFormat1().initialize(url)
repo = dir.create_repository()
branch = dir.create_branch()
try:
tree = workingtree.WorkingTreeFormat3().initialize(dir)
except errors.NotLocalUrl:
raise TestSkipped('Not a local URL')
self.assertIsDirectory('.bzr', t)
self.assertIsDirectory('.bzr/checkout', t)
self.assertIsDirectory('.bzr/checkout/lock', t)
our_lock = LockDir(t, '.bzr/checkout/lock')
self.assertEquals(our_lock.peek(), None)
tree.lock_write()
self.assertTrue(our_lock.peek())
tree.unlock()
self.assertEquals(our_lock.peek(), None)
def test_missing_pending_merges(self):
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
control.create_repository()
control.create_branch()
tree = workingtree.WorkingTreeFormat3().initialize(control)
tree._transport.delete("pending-merges")
self.assertEqual([], tree.get_parent_ids())
class TestFormat2WorkingTree(TestCaseWithTransport):
"""Tests that are specific to format 2 trees."""
def create_format2_tree(self, url):
return self.make_branch_and_tree(
url, format=bzrdir.BzrDirFormat6())
def test_conflicts(self):
# test backwards compatability
tree = self.create_format2_tree('.')
self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
None)
file('lala.BASE', 'wb').write('labase')
expected = conflicts.ContentsConflict('lala')
self.assertEqual(list(tree.conflicts()), [expected])
file('lala', 'wb').write('la')
tree.add('lala', 'lala-id')
expected = conflicts.ContentsConflict('lala', file_id='lala-id')
self.assertEqual(list(tree.conflicts()), [expected])
file('lala.THIS', 'wb').write('lathis')
file('lala.OTHER', 'wb').write('laother')
# When "text conflict"s happen, stem, THIS and OTHER are text
expected = conflicts.TextConflict('lala', file_id='lala-id')
self.assertEqual(list(tree.conflicts()), [expected])
os.unlink('lala.OTHER')
os.mkdir('lala.OTHER')
expected = conflicts.ContentsConflict('lala', file_id='lala-id')
self.assertEqual(list(tree.conflicts()), [expected])
class InstrumentedTree(object):
"""A instrumented tree to check the needs_tree_write_lock decorator."""
def __init__(self):
self._locks = []
def lock_tree_write(self):
self._locks.append('t')
@needs_tree_write_lock
def method_with_tree_write_lock(self, *args, **kwargs):
"""A lock_tree_write decorated method that returns its arguments."""
return args, kwargs
@needs_tree_write_lock
def method_that_raises(self):
"""This method causes an exception when called with parameters.
This allows the decorator code to be checked - it should still call
unlock.
"""
def unlock(self):
self._locks.append('u')
class TestInstrumentedTree(TestCase):
def test_needs_tree_write_lock(self):
"""@needs_tree_write_lock should be semantically transparent."""
tree = InstrumentedTree()
self.assertEqual(
'method_with_tree_write_lock',
tree.method_with_tree_write_lock.__name__)
self.assertDocstring(
"A lock_tree_write decorated method that returns its arguments.",
tree.method_with_tree_write_lock)
args = (1, 2, 3)
kwargs = {'a':'b'}
result = tree.method_with_tree_write_lock(1,2,3, a='b')
self.assertEqual((args, kwargs), result)
self.assertEqual(['t', 'u'], tree._locks)
self.assertRaises(TypeError, tree.method_that_raises, 'foo')
self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
class TestRevert(TestCaseWithTransport):
def test_revert_conflicts_recursive(self):
this_tree = self.make_branch_and_tree('this-tree')
self.build_tree_contents([('this-tree/foo/',),
('this-tree/foo/bar', 'bar')])
this_tree.add(['foo', 'foo/bar'])
this_tree.commit('created foo/bar')
other_tree = this_tree.bzrdir.sprout('other-tree').open_workingtree()
self.build_tree_contents([('other-tree/foo/bar', 'baz')])
other_tree.commit('changed bar')
self.build_tree_contents([('this-tree/foo/bar', 'qux')])
this_tree.commit('changed qux')
this_tree.merge_from_branch(other_tree.branch)
self.assertEqual(1, len(this_tree.conflicts()))
this_tree.revert(['foo'])
self.assertEqual(0, len(this_tree.conflicts()))
class TestAutoResolve(TestCaseWithTransport):
def test_auto_resolve(self):
base = self.make_branch_and_tree('base')
self.build_tree_contents([('base/hello', 'Hello')])
base.add('hello', 'hello_id')
base.commit('Hello')
other = base.bzrdir.sprout('other').open_workingtree()
self.build_tree_contents([('other/hello', 'hELLO')])
other.commit('Case switch')
this = base.bzrdir.sprout('this').open_workingtree()
self.failUnlessExists('this/hello')
self.build_tree_contents([('this/hello', 'Hello World')])
this.commit('Add World')
this.merge_from_branch(other.branch)
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
this.conflicts())
this.auto_resolve()
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
this.conflicts())
self.build_tree_contents([('this/hello', '<<<<<<<')])
this.auto_resolve()
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
this.conflicts())
self.build_tree_contents([('this/hello', '=======')])
this.auto_resolve()
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
this.conflicts())
self.build_tree_contents([('this/hello', '\n>>>>>>>')])
remaining, resolved = this.auto_resolve()
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
this.conflicts())
self.assertEqual([], resolved)
self.build_tree_contents([('this/hello', 'hELLO wORLD')])
remaining, resolved = this.auto_resolve()
self.assertEqual([], this.conflicts())
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
resolved)
self.failIfExists('this/hello.BASE')
def test_auto_resolve_dir(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/hello/'])
tree.add('hello', 'hello-id')
file_conflict = conflicts.TextConflict('file', None, 'hello-id')
tree.set_conflicts(conflicts.ConflictList([file_conflict]))
tree.auto_resolve()
class TestFindTrees(TestCaseWithTransport):
def test_find_trees(self):
self.make_branch_and_tree('foo')
self.make_branch_and_tree('foo/bar')
# Sticking a tree inside a control dir is heinous, so let's skip it
self.make_branch_and_tree('foo/.bzr/baz')
self.make_branch('qux')
trees = workingtree.WorkingTree.find_trees('.')
self.assertEqual(2, len(list(trees)))
|