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

Support bzr init --git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
24
24
    )
25
25
from bzrlib.decorators import needs_read_lock
26
26
 
27
 
from bzrlib.plugins.git import ids
 
27
from bzrlib.plugins.git.mapping import default_mapping
28
28
 
29
29
class GitTagDict(tag.BasicTags):
30
30
 
35
35
    def get_tag_dict(self):
36
36
        ret = {}
37
37
        for tag in self.repository._git.tags:
38
 
            ret[tag.name] = ids.convert_revision_id_git_to_bzr(tag.commit.id)
 
38
            ret[tag.name] = default_mapping.revision_id_foreign_to_bzr(tag.commit.id)
39
39
        return ret
40
40
 
41
41
    def set_tag(self, name, revid):
84
84
        # perhaps should escape this ?
85
85
        if self.head is None:
86
86
            return revision.NULL_REVISION
87
 
        return ids.convert_revision_id_git_to_bzr(self.head)
 
87
        return default_mapping.revision_id_foreign_to_bzr(self.head)
88
88
 
89
89
    def _make_tags(self):
90
90
        return GitTagDict(self)
109
109
            skip += max_count
110
110
            for cm in cms:
111
111
                if cm.id == nextid:
112
 
                    ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
 
112
                    ret.append(default_mapping.revision_id_foreign_to_bzr(cm.id))
113
113
                    if cm.parents == []:
114
114
                        nextid = None
115
115
                    else:
141
141
 
142
142
    def supports_tags(self):
143
143
        return True
 
144
 
 
145
    def sprout(self, to_bzrdir, revision_id=None):
 
146
        """See Branch.sprout()."""
 
147
        result = to_bzrdir.create_branch()
 
148
        self.copy_content_into(result, revision_id=revision_id)
 
149
        result.set_parent(self.bzrdir.root_transport.base)
 
150
        return result
 
151