/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

Use new tag_name_to_ref function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
53
53
from bzrlib.plugins.git.refs import (
54
54
    ref_to_branch_name,
55
55
    extract_tags,
 
56
    tag_name_to_ref,
56
57
    )
57
58
 
58
59
from bzrlib.foreign import ForeignBranch
102
103
    def _set_tag_dict(self, to_dict):
103
104
        extra = set(self.repository._git.get_refs().keys())
104
105
        for k, revid in to_dict.iteritems():
105
 
            name = "refs/tags/%s" % k
 
106
            name = tag_name_to_ref(k)
106
107
            if name in extra:
107
108
                extra.remove(name)
108
109
            self.set_tag(k, revid)
111
112
                del self.repository._git[name]
112
113
        
113
114
    def set_tag(self, name, revid):
114
 
        self.repository._git.refs["refs/tags/%s" % name], _ = \
 
115
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
115
116
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
116
117
 
117
118
 
506
507
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
507
508
            result.new_revid = stop_revision
508
509
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
509
 
                refs["refs/tags/%s" % name] = sha
 
510
                refs[tag_name_to_ref(name)] = sha
510
511
            return refs
511
512
        self.target.repository.send_pack(get_changed_refs,
512
513
            self.source.repository._git.object_store.generate_pack_contents)
593
594
        refs = { self.target.ref: stop_revision }
594
595
        for name, revid in self.source.tags.get_tag_dict().iteritems():
595
596
            if self.source.repository.has_revision(revid):
596
 
                refs["refs/tags/%s" % name] = revid
 
597
                refs[tag_name_to_ref(name)] = revid
597
598
        revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
598
599
            self.source.repository, refs)
599
600
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(