← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-29 15:57:16 UTC
  • mfrom: (3427.5.9 dep_warnings)
  • Revision ID: pqm@pqm.ubuntu.com-20080529155716-0w3kic8lioa63231
(jam) Enable Deprecation Warnings when running -Werror and when
        running selftest

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.tests import TestCase, TestCaseWithTransport, TestSkipped
32
32
from bzrlib.transport import get_transport
33
 
import bzrlib.workingtree as workingtree
34
 
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
35
 
                                WorkingTree)
 
33
from bzrlib.workingtree import (
 
34
    TreeEntry,
 
35
    TreeDirectory,
 
36
    TreeFile,
 
37
    TreeLink,
 
38
    )
 
39
 
36
40
 
37
41
class TestTreeDirectory(TestCaseWithTransport):
38
42
 
89
93
        """See WorkingTreeFormat.get_format_string()."""
90
94
        return "Sample tree format."
91
95
 
92
 
    def initialize(self, a_bzrdir, revision_id=None):
 
96
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
 
97
                   accelerator_tree=None, hardlink=False):
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._transport.delete("pending-merges")
 
220
        self.assertEqual([], tree.get_parent_ids())
 
221
 
 
222
 
 
223
class TestFormat2WorkingTree(TestCaseWithTransport):
 
224
    """Tests that are specific to format 2 trees."""
 
225
 
208
226
    def create_format2_tree(self, url):
209
 
        return BzrDir.create_standalone_workingtree(url)
 
227
        return self.make_branch_and_tree(
 
228
            url, format=bzrdir.BzrDirFormat6())
210
229
 
211
 
    def test_conflicts_format2(self):
 
230
    def test_conflicts(self):
212
231
        # test backwards compatability
213
232
        tree = self.create_format2_tree('.')
214
233
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
215
234
                          None)
216
235
        file('lala.BASE', 'wb').write('labase')
217
 
        expected = ContentsConflict('lala')
 
236
        expected = conflicts.ContentsConflict('lala')
218
237
        self.assertEqual(list(tree.conflicts()), [expected])
219
238
        file('lala', 'wb').write('la')
220
239
        tree.add('lala', 'lala-id')
221
 
        expected = ContentsConflict('lala', file_id='lala-id')
 
240
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
222
241
        self.assertEqual(list(tree.conflicts()), [expected])
223
242
        file('lala.THIS', 'wb').write('lathis')
224
243
        file('lala.OTHER', 'wb').write('laother')
225
244
        # When "text conflict"s happen, stem, THIS and OTHER are text
226
 
        expected = TextConflict('lala', file_id='lala-id')
 
245
        expected = conflicts.TextConflict('lala', file_id='lala-id')
227
246
        self.assertEqual(list(tree.conflicts()), [expected])
228
247
        os.unlink('lala.OTHER')
229
248
        os.mkdir('lala.OTHER')
230
 
        expected = ContentsConflict('lala', file_id='lala-id')
 
249
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
231
250
        self.assertEqual(list(tree.conflicts()), [expected])
 
251
 
 
252
 
 
253
class InstrumentedTree(object):
 
254
    """A instrumented tree to check the needs_tree_write_lock decorator."""
 
255
 
 
256
    def __init__(self):
 
257
        self._locks = []
 
258
 
 
259
    def lock_tree_write(self):
 
260
        self._locks.append('t')
 
261
 
 
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."""
 
265
        return args, kwargs
 
266
 
 
267
    @needs_tree_write_lock
 
268
    def method_that_raises(self):
 
269
        """This method causes an exception when called with parameters.
 
270
        
 
271
        This allows the decorator code to be checked - it should still call
 
272
        unlock.
 
273
        """
 
274
 
 
275
    def unlock(self):
 
276
        self._locks.append('u')
 
277
 
 
278
 
 
279
class TestInstrumentedTree(TestCase):
 
280
 
 
281
    def test_needs_tree_write_lock(self):
 
282
        """@needs_tree_write_lock should be semantically transparent."""
 
283
        tree = InstrumentedTree()
 
284
        self.assertEqual(
 
285
            'method_with_tree_write_lock',
 
286
            tree.method_with_tree_write_lock.__name__)
 
287
        self.assertEqual(
 
288
            "A lock_tree_write decorated method that returns its arguments.",
 
289
            tree.method_with_tree_write_lock.__doc__)
 
290
        args = (1, 2, 3)
 
291
        kwargs = {'a':'b'}
 
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)
 
297
 
 
298
 
 
299
class TestRevert(TestCaseWithTransport):
 
300
 
 
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()))
 
316
 
 
317
 
 
318
class TestAutoResolve(TestCaseWithTransport):
 
319
 
 
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')
 
324
        base.commit('Hello')
 
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')],
 
334
                         this.conflicts())
 
335
        this.auto_resolve()
 
336
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
337
                         this.conflicts())
 
338
        self.build_tree_contents([('this/hello', '<<<<<<<')])
 
339
        this.auto_resolve()
 
340
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
341
                         this.conflicts())
 
342
        self.build_tree_contents([('this/hello', '=======')])
 
343
        this.auto_resolve()
 
344
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
345
                         this.conflicts())
 
346
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
 
347
        remaining, resolved = this.auto_resolve()
 
348
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
349
                         this.conflicts())
 
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')],
 
355
                         resolved)
 
356
        self.failIfExists('this/hello.BASE')
 
357
 
 
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]))
 
364
        tree.auto_resolve()
 
365
 
 
366
 
 
367
class TestFindTrees(TestCaseWithTransport):
 
368
 
 
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)))