/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tests/test_fetch.py

Fix compatibility with newer versions of breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_fetch.py
29
29
import time
30
30
 
31
31
from .... import (
 
32
    osutils,
 
33
    )
 
34
from ....bzr import (
32
35
    knit,
33
 
    osutils,
34
36
    versionedfile,
35
37
    )
36
38
from ....branch import (
37
39
    Branch,
38
40
    )
39
 
from ....bzrdir import (
40
 
    BzrDir,
 
41
from ....controldir import (
 
42
    ControlDir,
41
43
    )
42
 
from ....inventory import (
 
44
from ....bzr.inventory import (
43
45
    Inventory,
44
46
    )
45
47
from ....repository import (
71
73
 
72
74
    def clone_git_repo(self, from_url, to_url, revision_id=None):
73
75
        oldrepos = self.open_git_repo(from_url)
74
 
        dir = BzrDir.create(to_url)
 
76
        dir = ControlDir.create(to_url)
75
77
        newrepos = dir.create_repository()
76
78
        oldrepos.copy_content_into(newrepos, revision_id=revision_id)
77
79
        return newrepos
250
252
        oldrepo = Repository.open("d")
251
253
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
252
254
        self.assertEquals([revid1], stacked_on.all_revision_ids())
253
 
        b = stacked_on.bzrdir.create_branch()
 
255
        b = stacked_on.controldir.create_branch()
254
256
        b.generate_revision_history(revid1)
255
257
        self.assertEquals(b.last_revision(), revid1)
256
258
        tree = self.make_branch_and_tree("stacked")