← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Fixed handling of unversioned files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
17
17
import os
18
18
from bzrlib.branch import Branch
19
19
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
20
 
                           ReusingTransform, CantMoveRoot)
 
20
                           ReusingTransform, CantMoveRoot, NotVersionedError)
21
21
from bzrlib.osutils import file_kind, has_symlinks
22
22
from bzrlib.tests import TestCaseInTempDir, TestSkipped
23
23
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths, 
24
 
                              resolve_conflicts, Merge3Merger)
 
24
                              resolve_conflicts, Merge3Merger, 
 
25
                              find_interesting)
25
26
 
26
27
class TestTreeTransform(TestCaseInTempDir):
27
28
    def setUp(self):
357
358
        rename.set_executability(True, myfile)
358
359
        rename.apply()
359
360
 
 
361
    def test_find_interesting(self):
 
362
        create, root = self.get_transform()
 
363
        wt = create._tree
 
364
        create.new_file('vfile', root, 'myfile-text', 'myfile-id')
 
365
        create.new_file('uvfile', root, 'othertext')
 
366
        create.apply()
 
367
        self.assertEqual(find_interesting(wt, wt, ['vfile']),
 
368
                         set(['myfile-id']))
 
369
        self.assertRaises(NotVersionedError, find_interesting, wt, wt,
 
370
                          ['uvfile'])
 
371
 
360
372
 
361
373
class TransformGroup(object):
362
374
    def __init__(self, dirname):