15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from cStringIO import StringIO
27
19
from bzrlib.branch import Branch
28
from bzrlib.bzrdir import BzrDir
29
from bzrlib.lockdir import LockDir
30
from bzrlib.mutabletree import needs_tree_write_lock
31
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
32
from bzrlib.transport import get_transport
33
from bzrlib.workingtree import (
41
class TestTreeDirectory(TestCaseWithTransport):
20
from bzrlib.errors import NotVersionedError
21
from bzrlib.tests import TestCaseInTempDir
22
from bzrlib.trace import mutter
23
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
26
class TestTreeDirectory(TestCaseInTempDir):
43
28
def test_kind_character(self):
44
29
self.assertEqual(TreeDirectory().kind_character(), '/')
47
class TestTreeEntry(TestCaseWithTransport):
32
class TestTreeEntry(TestCaseInTempDir):
49
34
def test_kind_character(self):
50
35
self.assertEqual(TreeEntry().kind_character(), '???')
53
class TestTreeFile(TestCaseWithTransport):
38
class TestTreeFile(TestCaseInTempDir):
55
40
def test_kind_character(self):
56
41
self.assertEqual(TreeFile().kind_character(), '')
59
class TestTreeLink(TestCaseWithTransport):
44
class TestTreeLink(TestCaseInTempDir):
61
46
def test_kind_character(self):
62
47
self.assertEqual(TreeLink().kind_character(), '')
65
class TestDefaultFormat(TestCaseWithTransport):
67
def test_get_set_default_format(self):
68
old_format = workingtree.WorkingTreeFormat.get_default_format()
70
self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
71
workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
73
# the default branch format is used by the meta dir format
74
# which is not the default bzrdir format at this point
75
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
76
dir.create_repository()
78
result = dir.create_workingtree()
79
self.assertEqual(result, 'A tree')
81
workingtree.WorkingTreeFormat.set_default_format(old_format)
82
self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
85
class SampleTreeFormat(workingtree.WorkingTreeFormat):
88
this format is initializable, unsupported to aid in testing the
89
open and open_downlevel routines.
92
def get_format_string(self):
93
"""See WorkingTreeFormat.get_format_string()."""
94
return "Sample tree format."
96
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
97
accelerator_tree=None, hardlink=False):
98
"""Sample branches cannot be created."""
99
t = a_bzrdir.get_workingtree_transport(self)
100
t.put_bytes('format', self.get_format_string())
103
def is_supported(self):
106
def open(self, transport, _found=False):
107
return "opened tree."
110
class TestWorkingTreeFormat(TestCaseWithTransport):
111
"""Tests for the WorkingTreeFormat facility."""
113
def test_find_format(self):
114
# is the right format object found for a working tree?
115
# create a branch with a few known format objects.
116
self.build_tree(["foo/", "bar/"])
117
def check_format(format, url):
118
dir = format._matchingbzrdir.initialize(url)
119
dir.create_repository()
121
format.initialize(dir)
122
t = get_transport(url)
123
found_format = workingtree.WorkingTreeFormat.find_format(dir)
124
self.failUnless(isinstance(found_format, format.__class__))
125
check_format(workingtree.WorkingTreeFormat3(), "bar")
127
def test_find_format_no_tree(self):
128
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
129
self.assertRaises(errors.NoWorkingTree,
130
workingtree.WorkingTreeFormat.find_format,
133
def test_find_format_unknown_format(self):
134
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
135
dir.create_repository()
137
SampleTreeFormat().initialize(dir)
138
self.assertRaises(errors.UnknownFormatError,
139
workingtree.WorkingTreeFormat.find_format,
142
def test_register_unregister_format(self):
143
format = SampleTreeFormat()
145
dir = bzrdir.BzrDirMetaFormat1().initialize('.')
146
dir.create_repository()
149
format.initialize(dir)
150
# register a format for it.
151
workingtree.WorkingTreeFormat.register_format(format)
152
# which branch.Open will refuse (not supported)
153
self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
154
# but open_downlevel will work
155
self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
156
# unregister the format
157
workingtree.WorkingTreeFormat.unregister_format(format)
160
class TestWorkingTreeFormat3(TestCaseWithTransport):
161
"""Tests specific to WorkingTreeFormat3."""
163
def test_disk_layout(self):
164
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
165
control.create_repository()
166
control.create_branch()
167
tree = workingtree.WorkingTreeFormat3().initialize(control)
169
# format 'Bazaar-NG Working Tree format 3'
170
# inventory = blank inventory
171
# pending-merges = ''
173
# no inventory.basis yet
174
t = control.get_workingtree_transport(None)
175
self.assertEqualDiff('Bazaar-NG Working Tree format 3',
176
t.get('format').read())
177
self.assertEqualDiff(t.get('inventory').read(),
178
'<inventory format="5">\n'
181
self.assertEqualDiff('### bzr hashcache v5\n',
182
t.get('stat-cache').read())
183
self.assertFalse(t.has('inventory.basis'))
184
# no last-revision file means 'None' or 'NULLREVISION'
185
self.assertFalse(t.has('last-revision'))
186
# TODO RBC 20060210 do a commit, check the inventory.basis is created
187
# correctly and last-revision file becomes present.
189
def test_uses_lockdir(self):
190
"""WorkingTreeFormat3 uses its own LockDir:
192
- lock is a directory
193
- when the WorkingTree is locked, LockDir can see that
195
t = self.get_transport()
197
dir = bzrdir.BzrDirMetaFormat1().initialize(url)
198
repo = dir.create_repository()
199
branch = dir.create_branch()
201
tree = workingtree.WorkingTreeFormat3().initialize(dir)
202
except errors.NotLocalUrl:
203
raise TestSkipped('Not a local URL')
204
self.assertIsDirectory('.bzr', t)
205
self.assertIsDirectory('.bzr/checkout', t)
206
self.assertIsDirectory('.bzr/checkout/lock', t)
207
our_lock = LockDir(t, '.bzr/checkout/lock')
208
self.assertEquals(our_lock.peek(), None)
50
class TestWorkingTree(TestCaseInTempDir):
52
def test_listfiles(self):
53
branch = Branch.initialize('.')
55
print >> open('file', 'w'), "content"
56
os.symlink('target', 'symlink')
57
tree = branch.working_tree()
58
files = list(tree.list_files())
59
self.assertEqual(files[0], ('dir', '?', 'directory', None, TreeDirectory()))
60
self.assertEqual(files[1], ('file', '?', 'file', None, TreeFile()))
61
self.assertEqual(files[2], ('symlink', '?', 'symlink', None, TreeLink()))
63
def test_construct_with_branch(self):
64
branch = Branch.initialize('.')
65
tree = WorkingTree(branch.base, branch)
66
self.assertEqual(branch, tree.branch)
67
self.assertEqual(branch.base, tree.basedir)
69
def test_construct_without_branch(self):
70
branch = Branch.initialize('.')
71
tree = WorkingTree(branch.base)
72
self.assertEqual(branch.base, tree.branch.base)
73
self.assertEqual(branch.base, tree.basedir)
75
def test_basic_relpath(self):
76
# for comprehensive relpath tests, see whitebox.py.
77
branch = Branch.initialize('.')
78
tree = WorkingTree(branch.base)
79
self.assertEqual('child',
80
tree.relpath(os.path.join(os.getcwd(), 'child')))
82
def test_lock_locks_branch(self):
83
branch = Branch.initialize('.')
84
tree = WorkingTree(branch.base)
86
self.assertEqual(1, tree.branch._lock_count)
87
self.assertEqual('r', tree.branch._lock_mode)
89
self.assertEqual(None, tree.branch._lock_count)
210
self.assertTrue(our_lock.peek())
91
self.assertEqual(1, tree.branch._lock_count)
92
self.assertEqual('w', tree.branch._lock_mode)
212
self.assertEquals(our_lock.peek(), None)
214
def test_missing_pending_merges(self):
215
control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
216
control.create_repository()
217
control.create_branch()
218
tree = workingtree.WorkingTreeFormat3().initialize(control)
219
tree._transport.delete("pending-merges")
220
self.assertEqual([], tree.get_parent_ids())
223
class TestFormat2WorkingTree(TestCaseWithTransport):
224
"""Tests that are specific to format 2 trees."""
226
def create_format2_tree(self, url):
227
return self.make_branch_and_tree(
228
url, format=bzrdir.BzrDirFormat6())
230
def test_conflicts(self):
231
# test backwards compatability
232
tree = self.create_format2_tree('.')
233
self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
235
file('lala.BASE', 'wb').write('labase')
236
expected = conflicts.ContentsConflict('lala')
237
self.assertEqual(list(tree.conflicts()), [expected])
238
file('lala', 'wb').write('la')
239
tree.add('lala', 'lala-id')
240
expected = conflicts.ContentsConflict('lala', file_id='lala-id')
241
self.assertEqual(list(tree.conflicts()), [expected])
242
file('lala.THIS', 'wb').write('lathis')
243
file('lala.OTHER', 'wb').write('laother')
244
# When "text conflict"s happen, stem, THIS and OTHER are text
245
expected = conflicts.TextConflict('lala', file_id='lala-id')
246
self.assertEqual(list(tree.conflicts()), [expected])
247
os.unlink('lala.OTHER')
248
os.mkdir('lala.OTHER')
249
expected = conflicts.ContentsConflict('lala', file_id='lala-id')
250
self.assertEqual(list(tree.conflicts()), [expected])
253
class InstrumentedTree(object):
254
"""A instrumented tree to check the needs_tree_write_lock decorator."""
259
def lock_tree_write(self):
260
self._locks.append('t')
262
@needs_tree_write_lock
263
def method_with_tree_write_lock(self, *args, **kwargs):
264
"""A lock_tree_write decorated method that returns its arguments."""
267
@needs_tree_write_lock
268
def method_that_raises(self):
269
"""This method causes an exception when called with parameters.
94
self.assertEqual(None, tree.branch._lock_count)
96
def get_pullable_branches(self):
97
self.build_tree(['from/', 'from/file', 'to/'])
98
br_a = Branch.initialize('from')
100
br_a.working_tree().commit('foo', rev_id='A')
101
br_b = Branch.initialize('to')
105
br_a, br_b = self.get_pullable_branches()
106
br_b.working_tree().pull(br_a)
107
self.failUnless(br_b.has_revision('A'))
108
self.assertEqual(['A'], br_b.revision_history())
110
def test_pull_overwrites(self):
111
br_a, br_b = self.get_pullable_branches()
112
br_b.working_tree().commit('foo', rev_id='B')
113
self.assertEqual(['B'], br_b.revision_history())
114
br_b.working_tree().pull(br_a, overwrite=True)
115
self.failUnless(br_b.has_revision('A'))
116
self.failUnless(br_b.has_revision('B'))
117
self.assertEqual(['A'], br_b.revision_history())
119
def test_revert(self):
120
"""Test selected-file revert"""
121
b = Branch.initialize('.')
123
self.build_tree(['hello.txt'])
124
file('hello.txt', 'w').write('initial hello')
126
self.assertRaises(NotVersionedError,
127
b.working_tree().revert, ['hello.txt'])
271
This allows the decorator code to be checked - it should still call
276
self._locks.append('u')
279
class TestInstrumentedTree(TestCase):
281
def test_needs_tree_write_lock(self):
282
"""@needs_tree_write_lock should be semantically transparent."""
283
tree = InstrumentedTree()
285
'method_with_tree_write_lock',
286
tree.method_with_tree_write_lock.__name__)
288
"A lock_tree_write decorated method that returns its arguments.",
289
tree.method_with_tree_write_lock.__doc__)
292
result = tree.method_with_tree_write_lock(1,2,3, a='b')
293
self.assertEqual((args, kwargs), result)
294
self.assertEqual(['t', 'u'], tree._locks)
295
self.assertRaises(TypeError, tree.method_that_raises, 'foo')
296
self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
299
class TestRevert(TestCaseWithTransport):
301
def test_revert_conflicts_recursive(self):
302
this_tree = self.make_branch_and_tree('this-tree')
303
self.build_tree_contents([('this-tree/foo/',),
304
('this-tree/foo/bar', 'bar')])
305
this_tree.add(['foo', 'foo/bar'])
306
this_tree.commit('created foo/bar')
307
other_tree = this_tree.bzrdir.sprout('other-tree').open_workingtree()
308
self.build_tree_contents([('other-tree/foo/bar', 'baz')])
309
other_tree.commit('changed bar')
310
self.build_tree_contents([('this-tree/foo/bar', 'qux')])
311
this_tree.commit('changed qux')
312
this_tree.merge_from_branch(other_tree.branch)
313
self.assertEqual(1, len(this_tree.conflicts()))
314
this_tree.revert(['foo'])
315
self.assertEqual(0, len(this_tree.conflicts()))
318
class TestAutoResolve(TestCaseWithTransport):
320
def test_auto_resolve(self):
321
base = self.make_branch_and_tree('base')
322
self.build_tree_contents([('base/hello', 'Hello')])
323
base.add('hello', 'hello_id')
325
other = base.bzrdir.sprout('other').open_workingtree()
326
self.build_tree_contents([('other/hello', 'hELLO')])
327
other.commit('Case switch')
328
this = base.bzrdir.sprout('this').open_workingtree()
329
self.failUnlessExists('this/hello')
330
self.build_tree_contents([('this/hello', 'Hello World')])
331
this.commit('Add World')
332
this.merge_from_branch(other.branch)
333
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
336
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
338
self.build_tree_contents([('this/hello', '<<<<<<<')])
340
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
342
self.build_tree_contents([('this/hello', '=======')])
344
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
346
self.build_tree_contents([('this/hello', '\n>>>>>>>')])
347
remaining, resolved = this.auto_resolve()
348
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
350
self.assertEqual([], resolved)
351
self.build_tree_contents([('this/hello', 'hELLO wORLD')])
352
remaining, resolved = this.auto_resolve()
353
self.assertEqual([], this.conflicts())
354
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
356
self.failIfExists('this/hello.BASE')
358
def test_auto_resolve_dir(self):
359
tree = self.make_branch_and_tree('tree')
360
self.build_tree(['tree/hello/'])
361
tree.add('hello', 'hello-id')
362
file_conflict = conflicts.TextConflict('file', None, 'hello-id')
363
tree.set_conflicts(conflicts.ConflictList([file_conflict]))
367
class TestFindTrees(TestCaseWithTransport):
369
def test_find_trees(self):
370
self.make_branch_and_tree('foo')
371
self.make_branch_and_tree('foo/bar')
372
# Sticking a tree inside a control dir is heinous, so let's skip it
373
self.make_branch_and_tree('foo/.bzr/baz')
374
self.make_branch('qux')
375
trees = workingtree.WorkingTree.find_trees('.')
376
self.assertEqual(2, len(list(trees)))
130
b.working_tree().commit('create initial hello.txt')
132
self.check_file_contents('hello.txt', 'initial hello')
133
file('hello.txt', 'w').write('new hello')
134
self.check_file_contents('hello.txt', 'new hello')
136
wt = b.working_tree()
138
# revert file modified since last revision
139
wt.revert(['hello.txt'])
140
self.check_file_contents('hello.txt', 'initial hello')
141
self.check_file_contents('hello.txt~', 'new hello')
143
# reverting again does not clobber the backup
144
wt.revert(['hello.txt'])
145
self.check_file_contents('hello.txt', 'initial hello')
146
self.check_file_contents('hello.txt~', 'new hello')
added
removed
bzrlib/tests/test_workingtree.py
