← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
18
18
from cStringIO import StringIO
19
19
import os
20
20
 
21
 
import bzrlib
 
21
from bzrlib import (
 
22
    bzrdir,
 
23
    conflicts,
 
24
    errors,
 
25
    workingtree,
 
26
    )
22
27
from bzrlib.branch import Branch
23
 
import bzrlib.bzrdir as bzrdir
24
28
from bzrlib.bzrdir import BzrDir
25
 
from bzrlib.conflicts import *
26
 
import bzrlib.errors as errors
27
 
from bzrlib.errors import NotBranchError, NotVersionedError
28
29
from bzrlib.lockdir import LockDir
29
 
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
30
 
from bzrlib.tests import TestCaseWithTransport, TestSkipped
31
 
from bzrlib.trace import mutter
 
30
from bzrlib.mutabletree import needs_tree_write_lock
 
31
from bzrlib.symbol_versioning import zero_thirteen
 
32
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
32
33
from bzrlib.transport import get_transport
33
 
import bzrlib.workingtree as workingtree
34
 
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
35
 
                                WorkingTree)
 
34
from bzrlib.workingtree import (
 
35
    TreeEntry,
 
36
    TreeDirectory,
 
37
    TreeFile,
 
38
    TreeLink,
 
39
    )
 
40
 
36
41
 
37
42
class TestTreeDirectory(TestCaseWithTransport):
38
43
 
92
97
    def initialize(self, a_bzrdir, revision_id=None):
93
98
        """Sample branches cannot be created."""
94
99
        t = a_bzrdir.get_workingtree_transport(self)
95
 
        t.put('format', StringIO(self.get_format_string()))
 
100
        t.put_bytes('format', self.get_format_string())
96
101
        return 'A tree'
97
102
 
98
103
    def is_supported(self):
169
174
        t = control.get_workingtree_transport(None)
170
175
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
171
176
                             t.get('format').read())
172
 
        self.assertEqualDiff('<inventory format="5">\n'
173
 
                             '</inventory>\n',
174
 
                             t.get('inventory').read())
 
177
        self.assertEqualDiff(t.get('inventory').read(), 
 
178
                              '<inventory format="5">\n'
 
179
                              '</inventory>\n',
 
180
                             )
175
181
        self.assertEqualDiff('### bzr hashcache v5\n',
176
182
                             t.get('stat-cache').read())
177
183
        self.assertFalse(t.has('inventory.basis'))
205
211
        tree.unlock()
206
212
        self.assertEquals(our_lock.peek(), None)
207
213
 
 
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._control_files._transport.delete("pending-merges")
 
220
        self.assertEqual([], tree.get_parent_ids())
 
221
 
208
222
 
209
223
class TestFormat2WorkingTree(TestCaseWithTransport):
210
224
    """Tests that are specific to format 2 trees."""
211
225
 
212
226
    def create_format2_tree(self, url):
213
227
        return self.make_branch_and_tree(
214
 
            url, format=bzrlib.bzrdir.BzrDirFormat6())
 
228
            url, format=bzrdir.BzrDirFormat6())
215
229
 
216
230
    def test_conflicts(self):
217
231
        # test backwards compatability
219
233
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
220
234
                          None)
221
235
        file('lala.BASE', 'wb').write('labase')
222
 
        expected = ContentsConflict('lala')
 
236
        expected = conflicts.ContentsConflict('lala')
223
237
        self.assertEqual(list(tree.conflicts()), [expected])
224
238
        file('lala', 'wb').write('la')
225
239
        tree.add('lala', 'lala-id')
226
 
        expected = ContentsConflict('lala', file_id='lala-id')
 
240
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
227
241
        self.assertEqual(list(tree.conflicts()), [expected])
228
242
        file('lala.THIS', 'wb').write('lathis')
229
243
        file('lala.OTHER', 'wb').write('laother')
230
244
        # When "text conflict"s happen, stem, THIS and OTHER are text
231
 
        expected = TextConflict('lala', file_id='lala-id')
 
245
        expected = conflicts.TextConflict('lala', file_id='lala-id')
232
246
        self.assertEqual(list(tree.conflicts()), [expected])
233
247
        os.unlink('lala.OTHER')
234
248
        os.mkdir('lala.OTHER')
235
 
        expected = ContentsConflict('lala', file_id='lala-id')
 
249
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
236
250
        self.assertEqual(list(tree.conflicts()), [expected])
237
251
 
238
252
 
239
253
class TestNonFormatSpecificCode(TestCaseWithTransport):
240
254
    """This class contains tests of workingtree that are not format specific."""
241
255
 
242
 
    
243
256
    def test_gen_file_id(self):
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-')
248
 
 
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())
264
 
 
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 ./
271
 
        self.assertEqual(
272
 
            "(rootdirrule$)", 
273
 
            tree._translate_ignore_rule("./rootdirrule"))
274
 
        # full path - regex is the rule itself
275
 
        self.assertEqual(
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
280
 
        self.assertEqual(
281
 
            "((?:.*/)?(?!.*/)basenamerule$)",
282
 
            tree._translate_ignore_rule("basenamerule"))
283
 
 
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)
298
 
        self.assertEqual(
299
 
            {0:"rule1",1:"rule/two",2:"./three"},
300
 
            compiled_rules[1])
301
 
 
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
305
 
        rules = []
306
 
        for index in range(198):
307
 
            rules.append('foo')
308
 
        self.assertEqual(2, len(tree._combine_ignore_rules(rules)))
309
 
 
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])
 
257
        file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_file_id,
 
258
                                      'filename')
 
259
        self.assertStartsWith(file_id, 'filename-')
 
260
 
 
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-')
 
264
        
 
265
 
 
266
class InstrumentedTree(object):
 
267
    """A instrumented tree to check the needs_tree_write_lock decorator."""
 
268
 
 
269
    def __init__(self):
 
270
        self._locks = []
 
271
 
 
272
    def lock_tree_write(self):
 
273
        self._locks.append('t')
 
274
 
 
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."""
 
278
        return args, kwargs
 
279
 
 
280
    @needs_tree_write_lock
 
281
    def method_that_raises(self):
 
282
        """This method causes an exception when called with parameters.
 
283
        
 
284
        This allows the decorator code to be checked - it should still call
 
285
        unlock.
 
286
        """
 
287
 
 
288
    def unlock(self):
 
289
        self._locks.append('u')
 
290
 
 
291
 
 
292
class TestInstrumentedTree(TestCase):
 
293
 
 
294
    def test_needs_tree_write_lock(self):
 
295
        """@needs_tree_write_lock should be semantically transparent."""
 
296
        tree = InstrumentedTree()
 
297
        self.assertEqual(
 
298
            'method_with_tree_write_lock',
 
299
            tree.method_with_tree_write_lock.__name__)
 
300
        self.assertEqual(
 
301
            "A lock_tree_write decorated method that returns its arguments.",
 
302
            tree.method_with_tree_write_lock.__doc__)
 
303
        args = (1, 2, 3)
 
304
        kwargs = {'a':'b'}
 
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)
 
310
 
 
311
 
 
312
class TestAutoResolve(TestCaseWithTransport):
 
313
 
 
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')
 
318
        base.commit('Hello')
 
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')],
 
328
                         this.conflicts())
 
329
        this.auto_resolve()
 
330
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
331
                         this.conflicts())
 
332
        self.build_tree_contents([('this/hello', '<<<<<<<')])
 
333
        this.auto_resolve()
 
334
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
335
                         this.conflicts())
 
336
        self.build_tree_contents([('this/hello', '=======')])
 
337
        this.auto_resolve()
 
338
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
339
                         this.conflicts())
 
340
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
 
341
        remaining, resolved = this.auto_resolve()
 
342
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
343
                         this.conflicts())
 
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')],
 
349
                         resolved)
 
350
        self.failIfExists('this/hello.BASE')
 
351
 
 
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]))
 
358
        tree.auto_resolve()