253
244
class TestNonFormatSpecificCode(TestCaseWithTransport):
254
245
"""This class contains tests of workingtree that are not format specific."""
256
248
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]))
249
self.assertStartsWith(bzrlib.workingtree.gen_file_id('bar'), 'bar-')
250
self.assertStartsWith(bzrlib.workingtree.gen_file_id('Mwoo oof\t m'), 'Mwoooofm-')
251
self.assertStartsWith(bzrlib.workingtree.gen_file_id('..gam.py'), 'gam.py-')
252
self.assertStartsWith(bzrlib.workingtree.gen_file_id('..Mwoo oof\t m'), 'Mwoooofm-')
254
def test_next_id_suffix(self):
255
bzrlib.workingtree._gen_id_suffix = None
256
bzrlib.workingtree._next_id_suffix()
257
self.assertNotEqual(None, bzrlib.workingtree._gen_id_suffix)
258
bzrlib.workingtree._gen_id_suffix = "foo-"
259
bzrlib.workingtree._gen_id_serial = 1
260
self.assertEqual("foo-2", bzrlib.workingtree._next_id_suffix())
261
self.assertEqual("foo-3", bzrlib.workingtree._next_id_suffix())
262
self.assertEqual("foo-4", bzrlib.workingtree._next_id_suffix())
263
self.assertEqual("foo-5", bzrlib.workingtree._next_id_suffix())
264
self.assertEqual("foo-6", bzrlib.workingtree._next_id_suffix())
265
self.assertEqual("foo-7", bzrlib.workingtree._next_id_suffix())
266
self.assertEqual("foo-8", bzrlib.workingtree._next_id_suffix())
267
self.assertEqual("foo-9", bzrlib.workingtree._next_id_suffix())
268
self.assertEqual("foo-10", bzrlib.workingtree._next_id_suffix())
270
def test__translate_ignore_rule(self):
271
tree = self.make_branch_and_tree('.')
272
# translation should return the regex, the number of groups in it,
273
# and the original rule in a tuple.
274
# there are three sorts of ignore rules:
275
# root only - regex is the rule itself without the leading ./
278
tree._translate_ignore_rule("./rootdirrule"))
279
# full path - regex is the rule itself
281
"(path\\/to\\/file$)",
282
tree._translate_ignore_rule("path/to/file"))
283
# basename only rule - regex is a rule that ignores everything up
284
# to the last / in the filename
286
"((?:.*/)?(?!.*/)basenamerule$)",
287
tree._translate_ignore_rule("basenamerule"))
289
def test__combine_ignore_rules(self):
290
tree = self.make_branch_and_tree('.')
291
# the combined ignore regexs need the outer group indices
292
# placed in a dictionary with the rules that were combined.
293
# an empty set of rules
294
# this is returned as a list of combined regex,rule sets, because
295
# python has a limit of 100 combined regexes.
296
compiled_rules = tree._combine_ignore_rules([])
297
self.assertEqual([], compiled_rules)
298
# one of each type of rule.
299
compiled_rules = tree._combine_ignore_rules(
300
["rule1", "rule/two", "./three"])[0]
301
# what type *is* the compiled regex to do an isinstance of ?
302
self.assertEqual(3, compiled_rules[0].groups)
304
{0:"rule1",1:"rule/two",2:"./three"},
307
def test__combine_ignore_rules_grouping(self):
308
tree = self.make_branch_and_tree('.')
309
# when there are too many rules, the output is split into groups of 100
311
for index in range(198):
313
self.assertEqual(2, len(tree._combine_ignore_rules(rules)))
315
def test__get_ignore_rules_as_regex(self):
316
tree = self.make_branch_and_tree('.')
317
self.build_tree_contents([('.bzrignore', 'CVS\n.hg\n')])
318
reference_output = tree._combine_ignore_rules(['CVS', '.hg'])[0]
319
regex_rules = tree._get_ignore_rules_as_regex()[0]
320
self.assertEqual(len(reference_output[1]), regex_rules[0].groups)
321
self.assertEqual(reference_output[1], regex_rules[1])
added
removed
bzrlib/tests/test_workingtree.py
