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

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
25
25
from bzrlib.decorators import needs_read_lock
26
26
 
27
27
from bzrlib.plugins.git.foreign import ForeignBranch
 
28
from bzrlib.plugins.git.mapping import default_mapping
28
29
 
29
30
class GitTagDict(tag.BasicTags):
30
31
 
34
35
 
35
36
    def get_tag_dict(self):
36
37
        ret = {}
37
 
        for k,v in self.repository._git.tags.iteritems():
38
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
38
        for tag in self.repository._git.tags:
 
39
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
39
40
        return ret
40
41
 
41
42
    def set_tag(self, name, revid):
42
 
        self.repository._git.tags[name] = revid
 
43
        raise NotImplementedError(self.set_tag)
43
44
 
44
45
 
45
46
class GitBranchConfig(config.BranchConfig):
69
70
 
70
71
    def __init__(self, bzrdir, repository, name, head, lockfiles):
71
72
        self.repository = repository
72
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
73
        super(GitBranch, self).__init__(default_mapping)
73
74
        self.control_files = lockfiles
74
75
        self.bzrdir = bzrdir
75
76
        self.name = name
88
89
        """See Branch.get_parent()."""
89
90
        return None
90
91
 
91
 
    def set_parent(self, url):
92
 
        pass
93
 
 
94
92
    def lock_read(self):
95
93
        self.control_files.lock_read()
96
94