/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 dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
23
23
    tag,
24
24
    )
25
25
from bzrlib.decorators import needs_read_lock
26
 
from bzrlib.trace import mutter
27
26
 
28
27
from bzrlib.plugins.git.foreign import ForeignBranch
29
 
 
30
 
from dulwich.objects import (
31
 
        Commit,
32
 
        Tag,
33
 
        )
 
28
from bzrlib.plugins.git.mapping import default_mapping
34
29
 
35
30
class GitTagDict(tag.BasicTags):
36
31
 
41
36
    def get_tag_dict(self):
42
37
        ret = {}
43
38
        for k,v in self.repository._git.tags.iteritems():
44
 
            obj = self.repository._git.get_object(v)
45
 
            while isinstance(obj, Tag):
46
 
                v = obj.object[1]
47
 
                obj = self.repository._git.get_object(v)
48
 
            if not isinstance(obj, Commit):
49
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
50
 
                continue
51
39
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
52
40
        return ret
53
41
 
82
70
 
83
71
    def __init__(self, bzrdir, repository, name, head, lockfiles):
84
72
        self.repository = repository
85
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
73
        super(GitBranch, self).__init__(default_mapping)
86
74
        self.control_files = lockfiles
87
75
        self.bzrdir = bzrdir
88
76
        self.name = name