/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 commands.py

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
28
28
    Option,
29
29
    )
30
30
 
31
 
from bzrlib.plugins.git import (
32
 
    get_rich_root_format,
33
 
    )
34
31
 
35
32
class cmd_git_import(Command):
36
33
    """Import all branches from a git repository.
69
66
        source_repo = Repository.open(src_location)
70
67
        if not isinstance(source_repo, GitRepository):
71
68
            raise BzrCommandError("%r is not a git repository" % src_location)
72
 
        format = get_rich_root_format()
73
69
        try:
74
70
            target_bzrdir = BzrDir.open(dest_location)
75
71
        except NotBranchError:
76
 
            target_bzrdir = BzrDir.create(dest_location, format=format)
 
72
            target_bzrdir = BzrDir.create(dest_location)
77
73
        try:
78
74
            target_repo = target_bzrdir.find_repository()
79
75
        except NoRepositoryPresent:
84
80
 
85
81
        interrepo = InterRepository.get(source_repo, target_repo)
86
82
        mapping = source_repo.get_mapping()
87
 
        refs = interrepo.fetch_refs()
 
83
        refs = interrepo.fetch()
88
84
        tags = {}
89
85
        for k, v in extract_tags(refs).iteritems():
90
86
            tags[k] = mapping.revision_id_foreign_to_bzr(v)
101
97
                    parent_path = urlutils.dirname(head_loc)
102
98
                    if not os.path.isdir(parent_path):
103
99
                        os.makedirs(parent_path)
104
 
                    head_bzrdir = BzrDir.create(head_loc, format=format)
 
100
                    head_bzrdir = BzrDir.create(head_loc)
105
101
                try:
106
102
                    head_branch = head_bzrdir.open_branch()
107
103
                except NotBranchError: