233
219
self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
235
221
file('lala.BASE', 'wb').write('labase')
236
expected = conflicts.ContentsConflict('lala')
222
expected = ContentsConflict('lala')
237
223
self.assertEqual(list(tree.conflicts()), [expected])
238
224
file('lala', 'wb').write('la')
239
225
tree.add('lala', 'lala-id')
240
expected = conflicts.ContentsConflict('lala', file_id='lala-id')
226
expected = ContentsConflict('lala', file_id='lala-id')
241
227
self.assertEqual(list(tree.conflicts()), [expected])
242
228
file('lala.THIS', 'wb').write('lathis')
243
229
file('lala.OTHER', 'wb').write('laother')
244
230
# When "text conflict"s happen, stem, THIS and OTHER are text
245
expected = conflicts.TextConflict('lala', file_id='lala-id')
231
expected = TextConflict('lala', file_id='lala-id')
246
232
self.assertEqual(list(tree.conflicts()), [expected])
247
233
os.unlink('lala.OTHER')
248
234
os.mkdir('lala.OTHER')
249
expected = conflicts.ContentsConflict('lala', file_id='lala-id')
235
expected = ContentsConflict('lala', file_id='lala-id')
250
236
self.assertEqual(list(tree.conflicts()), [expected])
253
239
class TestNonFormatSpecificCode(TestCaseWithTransport):
254
240
"""This class contains tests of workingtree that are not format specific."""
256
243
def test_gen_file_id(self):
257
file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_file_id,
259
self.assertStartsWith(file_id, 'filename-')
261
def test_gen_root_id(self):
262
file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_root_id)
263
self.assertStartsWith(file_id, 'tree_root-')
266
class InstrumentedTree(object):
267
"""A instrumented tree to check the needs_tree_write_lock decorator."""
272
def lock_tree_write(self):
273
self._locks.append('t')
275
@needs_tree_write_lock
276
def method_with_tree_write_lock(self, *args, **kwargs):
277
"""A lock_tree_write decorated method that returns its arguments."""
280
@needs_tree_write_lock
281
def method_that_raises(self):
282
"""This method causes an exception when called with parameters.
284
This allows the decorator code to be checked - it should still call
289
self._locks.append('u')
292
class TestInstrumentedTree(TestCase):
294
def test_needs_tree_write_lock(self):
295
"""@needs_tree_write_lock should be semantically transparent."""
296
tree = InstrumentedTree()
298
'method_with_tree_write_lock',
299
tree.method_with_tree_write_lock.__name__)
301
"A lock_tree_write decorated method that returns its arguments.",
302
tree.method_with_tree_write_lock.__doc__)
305
result = tree.method_with_tree_write_lock(1,2,3, a='b')
306
self.assertEqual((args, kwargs), result)
307
self.assertEqual(['t', 'u'], tree._locks)
308
self.assertRaises(TypeError, tree.method_that_raises, 'foo')
309
self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
312
class TestAutoResolve(TestCaseWithTransport):
314
def test_auto_resolve(self):
315
base = self.make_branch_and_tree('base')
316
self.build_tree_contents([('base/hello', 'Hello')])
317
base.add('hello', 'hello_id')
319
other = base.bzrdir.sprout('other').open_workingtree()
320
self.build_tree_contents([('other/hello', 'hELLO')])
321
other.commit('Case switch')
322
this = base.bzrdir.sprout('this').open_workingtree()
323
self.failUnlessExists('this/hello')
324
self.build_tree_contents([('this/hello', 'Hello World')])
325
this.commit('Add World')
326
this.merge_from_branch(other.branch)
327
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
330
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
332
self.build_tree_contents([('this/hello', '<<<<<<<')])
334
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
336
self.build_tree_contents([('this/hello', '=======')])
338
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
340
self.build_tree_contents([('this/hello', '\n>>>>>>>')])
341
remaining, resolved = this.auto_resolve()
342
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
344
self.assertEqual([], resolved)
345
self.build_tree_contents([('this/hello', 'hELLO wORLD')])
346
remaining, resolved = this.auto_resolve()
347
self.assertEqual([], this.conflicts())
348
self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
350
self.failIfExists('this/hello.BASE')
352
def test_auto_resolve_dir(self):
353
tree = self.make_branch_and_tree('tree')
354
self.build_tree(['tree/hello/'])
355
tree.add('hello', 'hello-id')
356
file_conflict = conflicts.TextConflict('file', None, 'hello-id')
357
tree.set_conflicts(conflicts.ConflictList([file_conflict]))
244
self.assertStartsWith(bzrlib.workingtree.gen_file_id('bar'), 'bar-')
245
self.assertStartsWith(bzrlib.workingtree.gen_file_id('Mwoo oof\t m'), 'Mwoooofm-')
246
self.assertStartsWith(bzrlib.workingtree.gen_file_id('..gam.py'), 'gam.py-')
247
self.assertStartsWith(bzrlib.workingtree.gen_file_id('..Mwoo oof\t m'), 'Mwoooofm-')
249
def test_next_id_suffix(self):
250
bzrlib.workingtree._gen_id_suffix = None
251
bzrlib.workingtree._next_id_suffix()
252
self.assertNotEqual(None, bzrlib.workingtree._gen_id_suffix)
253
bzrlib.workingtree._gen_id_suffix = "foo-"
254
bzrlib.workingtree._gen_id_serial = 1
255
self.assertEqual("foo-2", bzrlib.workingtree._next_id_suffix())
256
self.assertEqual("foo-3", bzrlib.workingtree._next_id_suffix())
257
self.assertEqual("foo-4", bzrlib.workingtree._next_id_suffix())
258
self.assertEqual("foo-5", bzrlib.workingtree._next_id_suffix())
259
self.assertEqual("foo-6", bzrlib.workingtree._next_id_suffix())
260
self.assertEqual("foo-7", bzrlib.workingtree._next_id_suffix())
261
self.assertEqual("foo-8", bzrlib.workingtree._next_id_suffix())
262
self.assertEqual("foo-9", bzrlib.workingtree._next_id_suffix())
263
self.assertEqual("foo-10", bzrlib.workingtree._next_id_suffix())
265
def test__translate_ignore_rule(self):
266
tree = self.make_branch_and_tree('.')
267
# translation should return the regex, the number of groups in it,
268
# and the original rule in a tuple.
269
# there are three sorts of ignore rules:
270
# root only - regex is the rule itself without the leading ./
273
tree._translate_ignore_rule("./rootdirrule"))
274
# full path - regex is the rule itself
276
"(path\\/to\\/file$)",
277
tree._translate_ignore_rule("path/to/file"))
278
# basename only rule - regex is a rule that ignores everything up
279
# to the last / in the filename
281
"((?:.*/)?(?!.*/)basenamerule$)",
282
tree._translate_ignore_rule("basenamerule"))
284
def test__combine_ignore_rules(self):
285
tree = self.make_branch_and_tree('.')
286
# the combined ignore regexs need the outer group indices
287
# placed in a dictionary with the rules that were combined.
288
# an empty set of rules
289
# this is returned as a list of combined regex,rule sets, because
290
# python has a limit of 100 combined regexes.
291
compiled_rules = tree._combine_ignore_rules([])
292
self.assertEqual([], compiled_rules)
293
# one of each type of rule.
294
compiled_rules = tree._combine_ignore_rules(
295
["rule1", "rule/two", "./three"])[0]
296
# what type *is* the compiled regex to do an isinstance of ?
297
self.assertEqual(3, compiled_rules[0].groups)
299
{0:"rule1",1:"rule/two",2:"./three"},
302
def test__combine_ignore_rules_grouping(self):
303
tree = self.make_branch_and_tree('.')
304
# when there are too many rules, the output is split into groups of 100
306
for index in range(198):
308
self.assertEqual(2, len(tree._combine_ignore_rules(rules)))
310
def test__get_ignore_rules_as_regex(self):
311
tree = self.make_branch_and_tree('.')
312
# test against the default rules.
313
reference_output = tree._combine_ignore_rules(bzrlib.DEFAULT_IGNORE)[0]
314
regex_rules = tree._get_ignore_rules_as_regex()[0]
315
self.assertEqual(len(reference_output[1]), regex_rules[0].groups)
316
self.assertEqual(reference_output[1], regex_rules[1])
added
removed
bzrlib/tests/test_workingtree.py
