/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

Return mapping in revision_id_bzr_to_foreign() as required by the interface.

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
26
27
 
27
28
from bzrlib.plugins.git.foreign import ForeignBranch
28
 
from bzrlib.plugins.git.mapping import default_mapping
 
29
 
 
30
from dulwich.objects import (
 
31
        Commit,
 
32
        Tag,
 
33
        )
29
34
 
30
35
class GitTagDict(tag.BasicTags):
31
36
 
35
40
 
36
41
    def get_tag_dict(self):
37
42
        ret = {}
38
 
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
43
        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
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
40
52
        return ret
41
53
 
42
54
    def set_tag(self, name, revid):
43
 
        raise NotImplementedError(self.set_tag)
 
55
        self.repository._git.tags[name] = revid
44
56
 
45
57
 
46
58
class GitBranchConfig(config.BranchConfig):
68
80
class GitBranch(ForeignBranch):
69
81
    """An adapter to git repositories for bzr Branch objects."""
70
82
 
71
 
    def __init__(self, bzrdir, repository, head, base, lockfiles):
 
83
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
84
        self.repository = repository
73
 
        super(GitBranch, self).__init__(default_mapping)
 
85
        super(GitBranch, self).__init__(repository.get_mapping())
74
86
        self.control_files = lockfiles
75
87
        self.bzrdir = bzrdir
 
88
        self.name = name
76
89
        self.head = head
77
 
        self.base = base
 
90
        self.base = bzrdir.transport.base
78
91
        self._format = GitBranchFormat()
79
92
 
80
93
    def lock_write(self):
81
94
        self.control_files.lock_write()
82
95
 
 
96
    def get_stacked_on_url(self):
 
97
        # Git doesn't do stacking (yet...)
 
98
        return None
 
99
 
 
100
    def get_parent(self):
 
101
        """See Branch.get_parent()."""
 
102
        return None
 
103
 
 
104
    def set_parent(self, url):
 
105
        pass
 
106
 
 
107
    def lock_read(self):
 
108
        self.control_files.lock_read()
 
109
 
 
110
    def unlock(self):
 
111
        self.control_files.unlock()
 
112
 
 
113
    def get_physical_lock_status(self):
 
114
        return False
 
115
 
 
116
 
 
117
class LocalGitBranch(GitBranch):
 
118
 
83
119
    @needs_read_lock
84
120
    def last_revision(self):
85
121
        # perhaps should escape this ?
90
126
    def _make_tags(self):
91
127
        return GitTagDict(self)
92
128
 
93
 
    def get_parent(self):
94
 
        """See Branch.get_parent()."""
95
 
        return None
96
 
 
97
 
    def get_stacked_on_url(self):
98
 
        return None
99
 
 
100
129
    def _gen_revision_history(self):
101
130
        if self.head is None:
102
131
            return []
103
 
        skip = 0
104
 
        cms = None
105
 
        ret = []
106
 
        max_count = 1000
107
 
        nextid = self.head
108
 
        while cms != []:
109
 
            cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
110
 
            skip += max_count
111
 
            for cm in cms:
112
 
                if cm.id == nextid:
113
 
                    ret.append(self.mapping.revision_id_foreign_to_bzr(cm.id))
114
 
                    if cm.parents == []:
115
 
                        nextid = None
116
 
                    else:
117
 
                        nextid = cm.parents[0].id
 
132
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
118
133
        ret.reverse()
119
134
        return ret
120
135
 
121
136
    def get_config(self):
122
137
        return GitBranchConfig(self)
123
138
 
124
 
    def lock_read(self):
125
 
        self.control_files.lock_read()
126
 
 
127
 
    def unlock(self):
128
 
        self.control_files.unlock()
129
 
 
130
 
    def get_physical_lock_status(self):
131
 
        return False
132
 
 
133
139
    def get_push_location(self):
134
140
        """See Branch.get_push_location."""
135
141
        push_loc = self.get_config().get_user_option('push_location')