/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

Fix the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
36
36
    def get_tag_dict(self):
37
37
        ret = {}
38
38
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = default_mapping.revision_id_foreign_to_bzr(tag.commit.id)
 
39
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.commit.id)
40
40
        return ret
41
41
 
42
42
    def set_tag(self, name, revid):
70
70
 
71
71
    def __init__(self, bzrdir, repository, head, base, lockfiles):
72
72
        self.repository = repository
73
 
        super(GitBranch, self).__init__()
 
73
        super(GitBranch, self).__init__(default_mapping)
74
74
        self.control_files = lockfiles
75
75
        self.bzrdir = bzrdir
76
76
        self.head = head
85
85
        # perhaps should escape this ?
86
86
        if self.head is None:
87
87
            return revision.NULL_REVISION
88
 
        return default_mapping.revision_id_foreign_to_bzr(self.head)
 
88
        return self.mapping.revision_id_foreign_to_bzr(self.head)
89
89
 
90
90
    def _make_tags(self):
91
91
        return GitTagDict(self)
110
110
            skip += max_count
111
111
            for cm in cms:
112
112
                if cm.id == nextid:
113
 
                    ret.append(default_mapping.revision_id_foreign_to_bzr(cm.id))
 
113
                    ret.append(self.mapping.revision_id_foreign_to_bzr(cm.id))
114
114
                    if cm.parents == []:
115
115
                        nextid = None
116
116
                    else: