← 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: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
28
28
from bzrlib.bzrdir import BzrDir
29
29
from bzrlib.lockdir import LockDir
30
30
from bzrlib.mutabletree import needs_tree_write_lock
31
 
from bzrlib.symbol_versioning import zero_thirteen
32
31
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
33
32
from bzrlib.transport import get_transport
34
33
from bzrlib.workingtree import (
94
93
        """See WorkingTreeFormat.get_format_string()."""
95
94
        return "Sample tree format."
96
95
 
97
 
    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):
98
98
        """Sample branches cannot be created."""
99
99
        t = a_bzrdir.get_workingtree_transport(self)
100
100
        t.put_bytes('format', self.get_format_string())
216
216
        control.create_repository()
217
217
        control.create_branch()
218
218
        tree = workingtree.WorkingTreeFormat3().initialize(control)
219
 
        tree._control_files._transport.delete("pending-merges")
 
219
        tree._transport.delete("pending-merges")
220
220
        self.assertEqual([], tree.get_parent_ids())
221
221
 
222
222
 
250
250
        self.assertEqual(list(tree.conflicts()), [expected])
251
251
 
252
252
 
253
 
class TestNonFormatSpecificCode(TestCaseWithTransport):
254
 
    """This class contains tests of workingtree that are not format specific."""
255
 
 
256
 
    def test_gen_file_id(self):
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
253
class InstrumentedTree(object):
267
254
    """A instrumented tree to check the needs_tree_write_lock decorator."""
268
255
 
309
296
        self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
310
297
 
311
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
 
312
318
class TestAutoResolve(TestCaseWithTransport):
313
319
 
314
320
    def test_auto_resolve(self):
356
362
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
357
363
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
358
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)))