/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 repository.py

Fix reporting of git commits in 'bzr log'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""An adapter between a Git Repository and a Bazaar Branch"""
 
18
 
 
19
import git
 
20
import os
 
21
import time
 
22
 
 
23
import bzrlib
 
24
from bzrlib import (
 
25
    deprecated_graph,
 
26
    errors,
 
27
    foreign,
 
28
    inventory,
 
29
    osutils,
 
30
    repository,
 
31
    revision,
 
32
    revisiontree,
 
33
    urlutils,
 
34
    versionedfile,
 
35
    )
 
36
from bzrlib.transport import get_transport
 
37
 
 
38
from bzrlib.plugins.git.foreign import (
 
39
    versionedfiles,
 
40
    )
 
41
from bzrlib.plugins.git.mapping import default_mapping
 
42
 
 
43
 
 
44
class GitRepository(repository.Repository):
 
45
    """An adapter to git repositories for bzr."""
 
46
 
 
47
    _serializer = None
 
48
 
 
49
    def __init__(self, gitdir, lockfiles):
 
50
        self.base = gitdir.root_transport.base
 
51
        self.bzrdir = gitdir
 
52
        self.control_files = lockfiles
 
53
        self._git = gitdir._git
 
54
        self.texts = None
 
55
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
 
56
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
57
        self._format = GitFormat()
 
58
        self._fallback_repositories = []
 
59
 
 
60
    def _all_revision_ids(self):
 
61
        if self._git.heads == []:
 
62
            return set()
 
63
        ret = set()
 
64
        skip = 0
 
65
        max_count = 1000
 
66
        cms = None
 
67
        while cms != []:
 
68
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
 
69
            skip += max_count
 
70
            ret.update([default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms])
 
71
        return ret
 
72
 
 
73
    def is_shared(self):
 
74
        return True
 
75
 
 
76
    def supports_rich_root(self):
 
77
        return False
 
78
 
 
79
    #def get_revision_delta(self, revision_id):
 
80
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
 
81
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
 
82
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
 
83
 
 
84
    def get_ancestry(self, revision_id):
 
85
        revision_id = revision.ensure_null(revision_id)
 
86
        ret = []
 
87
        if revision_id != revision.NULL_REVISION:
 
88
            skip = 0
 
89
            max_count = 1000
 
90
            cms = None
 
91
            while cms != []:
 
92
                cms = self._git.commits(self.lookup_git_revid(revision_id, default_mapping), max_count=max_count, skip=skip)
 
93
                skip += max_count
 
94
                ret += [default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms]
 
95
        return [None] + ret
 
96
 
 
97
    def get_signature_text(self, revision_id):
 
98
        raise errors.NoSuchRevision(self, revision_id)
 
99
 
 
100
    def has_signature_for_revision_id(self, revision_id):
 
101
        return False
 
102
 
 
103
    def get_parent_map(self, revision_ids):
 
104
        ret = {}
 
105
        for revid in revision_ids:
 
106
            if revid == revision.NULL_REVISION:
 
107
                ret[revid] = ()
 
108
            else:
 
109
                commit = self._git.commit(self.lookup_git_revid(revid, default_mapping))
 
110
                ret[revid] = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
111
        return ret
 
112
 
 
113
    def lookup_git_revid(self, bzr_revid, mapping):
 
114
        try:
 
115
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
116
        except errors.InvalidRevisionId:
 
117
            raise errors.NoSuchRevision(bzr_revid, self)
 
118
 
 
119
    def get_revision(self, revision_id):
 
120
        git_commit_id = self.lookup_git_revid(revision_id, default_mapping)
 
121
        commit = self._git.commit(git_commit_id)
 
122
        # print "fetched revision:", git_commit_id
 
123
        revision = self._parse_rev(commit)
 
124
        return revision
 
125
 
 
126
    def has_revision(self, revision_id):
 
127
        try:
 
128
            self.get_revision(revision_id)
 
129
        except NoSuchRevision:
 
130
            return False
 
131
        else:
 
132
            return True
 
133
 
 
134
    def get_revisions(self, revisions):
 
135
        return [self.get_revision(r) for r in revisions]
 
136
 
 
137
    @classmethod
 
138
    def _parse_rev(klass, commit):
 
139
        """Convert a git commit to a bzr revision.
 
140
 
 
141
        :return: a `bzrlib.revision.Revision` object.
 
142
        """
 
143
        rev = foreign.ForeignRevision(commit.id, default_mapping, default_mapping.revision_id_foreign_to_bzr(commit.id))
 
144
        rev.parent_ids = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
145
        rev.inventory_sha1 = ""
 
146
        rev.message = commit.message.decode("utf-8", "replace")
 
147
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
148
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
149
        rev.timestamp = time.mktime(commit.committed_date)
 
150
        rev.timezone = 0
 
151
        return rev
 
152
 
 
153
    def revision_trees(self, revids):
 
154
        for revid in revids:
 
155
            yield self.revision_tree(revid)
 
156
 
 
157
    def revision_tree(self, revision_id):
 
158
        revision_id = revision.ensure_null(revision_id)
 
159
 
 
160
        if revision_id == revision.NULL_REVISION:
 
161
            inv = inventory.Inventory(root_id=None)
 
162
            inv.revision_id = revision_id
 
163
            return revisiontree.RevisionTree(self, inv, revision_id)
 
164
 
 
165
        return GitRevisionTree(self, revision_id)
 
166
 
 
167
    def get_inventory(self, revision_id):
 
168
        assert revision_id != None
 
169
        return self.revision_tree(revision_id).inventory
 
170
 
 
171
    def set_make_working_trees(self, trees):
 
172
        pass
 
173
 
 
174
 
 
175
def escape_file_id(file_id):
 
176
    return file_id.replace('_', '__').replace(' ', '_s')
 
177
 
 
178
 
 
179
def unescape_file_id(file_id):
 
180
    return file_id.replace("_s", " ").replace("__", "_")
 
181
 
 
182
 
 
183
class GitRevisionTree(revisiontree.RevisionTree):
 
184
 
 
185
    def __init__(self, repository, revision_id):
 
186
        self._repository = repository
 
187
        self.revision_id = revision_id
 
188
        git_id = repository.lookup_git_revid(revision_id, default_mapping)
 
189
        self.tree = repository._git.commit(git_id).tree
 
190
        self._inventory = inventory.Inventory(revision_id=revision_id)
 
191
        self._inventory.root.revision = revision_id
 
192
        self._build_inventory(self.tree, self._inventory.root, "")
 
193
 
 
194
    def get_revision_id(self):
 
195
        return self.revision_id
 
196
 
 
197
    def get_file_text(self, file_id):
 
198
        entry = self._inventory[file_id]
 
199
        if entry.kind == 'directory': return ""
 
200
        return self._repository._git.blob(entry.text_id).data
 
201
 
 
202
    def _build_inventory(self, tree, ie, path):
 
203
        assert isinstance(path, str)
 
204
        for key in tree:
 
205
            b = tree.get(key)
 
206
            basename = b.name.decode("utf-8")
 
207
            if path == "":
 
208
                child_path = b.name
 
209
            else:
 
210
                child_path = urlutils.join(path, b.name)
 
211
            file_id = escape_file_id(child_path.encode('utf-8'))
 
212
            if b.mode[0] == '0':
 
213
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
 
214
            elif b.mode[0] == '1':
 
215
                if b.mode[1] == '0':
 
216
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
 
217
                    child_ie.text_sha1 = osutils.sha_string(b.data)
 
218
                elif b.mode[1] == '2':
 
219
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
 
220
                    child_ie.text_sha1 = osutils.sha_string("")
 
221
                else:
 
222
                    raise AssertionError(
 
223
                        "Unknown file kind, perms=%r." % (b.mode,))
 
224
                child_ie.text_id = b.id
 
225
                child_ie.text_size = b.size
 
226
            else:
 
227
                raise AssertionError(
 
228
                    "Unknown blob kind, perms=%r." % (b.mode,))
 
229
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
 
230
            child_ie.revision = self.revision_id
 
231
            self._inventory.add(child_ie)
 
232
            if b.mode[0] == '0':
 
233
                self._build_inventory(b, child_ie, child_path)
 
234
 
 
235
 
 
236
class GitFormat(object):
 
237
 
 
238
    supports_tree_reference = False
 
239
 
 
240
    def get_format_description(self):
 
241
        return "Git Repository"