← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: John Arbash Meinel
  • Date: 2006-05-02 20:46:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060502204611-02caa5c20fb84ef8
Moved url functions into bzrlib.urlutils

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
22
22
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
23
23
                           ReusingTransform, CantMoveRoot, NotVersionedError,
24
24
                           ExistingLimbo, ImmortalLimbo, LockError)
25
 
from bzrlib.osutils import file_kind, has_symlinks, pathjoin, local_path_from_url
 
25
from bzrlib.osutils import file_kind, has_symlinks, pathjoin
26
26
from bzrlib.merge import Merge3Merger
27
27
from bzrlib.tests import TestCaseInTempDir, TestSkipped, TestCase
28
28
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths, 
29
29
                              resolve_conflicts, cook_conflicts, 
30
30
                              find_interesting, build_tree, get_backup_name)
 
31
import bzrlib.urlutils as urlutils
31
32
 
32
33
class TestTreeTransform(TestCaseInTempDir):
33
34
    def setUp(self):
41
42
        return transform, transform.trans_id_tree_file_id(self.wt.get_root_id())
42
43
 
43
44
    def test_existing_limbo(self):
44
 
        limbo_name = local_path_from_url(
 
45
        limbo_name = urlutils.local_path_from_url(
45
46
            self.wt._control_files.controlfilename('limbo'))
46
47
        transform, root = self.get_transform()
47
48
        os.mkdir(pathjoin(limbo_name, 'hehe'))