/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

Merge upstream.

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
29
28
 
30
29
class GitTagDict(tag.BasicTags):
31
30
 
35
34
 
36
35
    def get_tag_dict(self):
37
36
        ret = {}
38
 
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
37
        for k,v in self.repository._git.tags.iteritems():
 
38
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
40
39
        return ret
41
40
 
42
41
    def set_tag(self, name, revid):
43
 
        raise NotImplementedError(self.set_tag)
 
42
        self.repository._git.tags[name] = revid
44
43
 
45
44
 
46
45
class GitBranchConfig(config.BranchConfig):
70
69
 
71
70
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
71
        self.repository = repository
73
 
        super(GitBranch, self).__init__(default_mapping)
 
72
        super(GitBranch, self).__init__(repository.get_mapping())
74
73
        self.control_files = lockfiles
75
74
        self.bzrdir = bzrdir
76
75
        self.name = name
89
88
        """See Branch.get_parent()."""
90
89
        return None
91
90
 
 
91
    def set_parent(self, url):
 
92
        pass
 
93
 
92
94
    def lock_read(self):
93
95
        self.control_files.lock_read()
94
96