1
# Copyright (C) 2007 Canonical Ltd
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.
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.
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
17
"""An adapter between a Git Repository and a Bazaar Branch"""
28
from bzrlib.plugins.git import (
34
class GitRepository(repository.Repository):
35
"""An adapter to git repositories for bzr."""
37
# To make bzrlib happy
40
def __init__(self, gitdir, lockfiles):
42
self.control_files = lockfiles
43
self._git = self._make_model(gitdir.transport)
44
self._revision_cache = {}
47
def _make_model(klass, transport):
48
gitdirectory = transport.local_abspath('.')
49
return model.GitModel(gitdirectory)
52
def _ancestor_revisions(self, revision_ids):
53
if revision_ids is not None:
54
git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
57
for lines in self._git.ancestor_lines(git_revisions):
58
yield self._parse_rev(lines)
63
def supports_rich_root(self):
66
def get_revision_graph(self, revision_id=None):
68
if revision_id is not None:
69
param = [ids.convert_revision_id_bzr_to_git(revision_id)]
72
git_graph = self._git.get_revision_graph(param)
73
for node, parents in git_graph.iteritems():
74
bzr_node = ids.convert_revision_id_git_to_bzr(node)
75
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
77
result[bzr_node] = bzr_parents
80
def get_revision_graph_with_ghosts(self, revision_ids=None):
81
graph = deprecated_graph.Graph()
82
if revision_ids is not None:
83
revision_ids = [ids.convert_revision_id_bzr_to_git(r)
84
for r in revision_ids]
85
git_graph = self._git.get_revision_graph(revision_ids)
86
for node, parents in git_graph.iteritems():
87
bzr_node = ids.convert_revision_id_git_to_bzr(node)
88
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
91
graph.add_node(bzr_node, bzr_parents)
94
def get_revision(self, revision_id):
95
if revision_id in self._revision_cache:
96
return self._revision_cache[revision_id]
97
raw = self._git.rev_list(
98
[ids.convert_revision_id_bzr_to_git(revision_id)],
99
max_count=1, header=True)
100
return self._parse_rev(raw)
102
def has_revision(self, revision_id):
104
self.get_revision(revision_id)
105
except NoSuchRevision:
110
def get_revisions(self, revisions):
111
return [self.get_revision(r) for r in revisions]
114
def _parse_rev(klass, raw):
115
"""Parse a single git revision.
117
* The first line is the git commit id.
118
* Following lines conform to the 'name value' structure, until the
120
* All lines after the first blank line and until the NULL line have 4
121
leading spaces and constitute the commit message.
123
:param raw: sequence of newline-terminated strings, its last item is a
124
single NULL character.
125
:return: a `bzrlib.revision.Revision` object.
130
committer_was_set = False
131
revision_id = ids.convert_revision_id_git_to_bzr(raw[0][:-1])
132
rev = revision.Revision(revision_id)
133
rev.inventory_sha1 = ""
134
assert raw[-1] == '\x00', (
135
"Last item of raw was not a single NULL character.")
136
for line in raw[1:-1]:
138
assert line[:4] == ' ', (
139
"Unexpected line format in commit message: %r" % line)
140
message_lines.append(line[4:])
145
name, value = line[:-1].split(' ', 1)
147
rev.parent_ids.append(
148
ids.convert_revision_id_git_to_bzr(value))
151
author, timestamp, timezone = value.rsplit(' ', 2)
152
rev.properties['author'] = author
153
rev.properties['git-author-timestamp'] = timestamp
154
rev.properties['git-author-timezone'] = timezone
155
if not committer_was_set:
156
rev.committer = author
157
rev.timestamp = float(timestamp)
158
rev.timezone = klass._parse_tz(timezone)
160
if name == 'committer':
161
committer_was_set = True
162
committer, timestamp, timezone = value.rsplit(' ', 2)
163
rev.committer = committer
164
rev.timestamp = float(timestamp)
165
rev.timezone = klass._parse_tz(timezone)
168
rev.properties['git-tree-id'] = value
171
rev.message = ''.join(message_lines)
175
def _parse_tz(klass, tz):
176
"""Parse a timezone specification in the [+|-]HHMM format.
178
:return: the timezone offset in seconds.
181
sign = {'+': +1, '-': -1}[tz[0]]
183
minutes = int(tz[3:])
184
return sign * 60 * (60 * hours + minutes)
186
def revision_trees(self, revids):
188
yield self.revision_tree(revid)
190
def revision_tree(self, revision_id):
191
return GitRevisionTree(self, revision_id)
193
def get_inventory(self, revision_id):
194
if revision_id is None:
195
revision_id = revision.NULL_REVISION
196
if revision_id == revision.NULL_REVISION:
197
return inventory.Inventory(
198
revision_id=revision_id, root_id=None)
199
git_commit = ids.convert_revision_id_bzr_to_git(revision_id)
200
git_inventory = self._git.get_inventory(git_commit)
201
return self._parse_inventory(revision_id, git_inventory)
204
def _parse_inventory(klass, revid, git_inv):
205
# For now, git inventory do not have root ids. It is not clear that we
206
# can reliably support root ids. -- David Allouche 2007-12-28
207
inv = inventory.Inventory(revision_id=revid)
208
for perms, git_kind, git_id, path in git_inv:
211
if git_kind == 'blob':
215
executable = bool(int(perms[-3:], 8) & 0111)
216
elif perms[1] == '2':
219
raise AssertionError(
220
"Unknown blob kind, perms=%r." % (perms,))
221
elif git_kind == 'tree':
224
raise AssertionError(
225
"Unknown git entry kind: %r" % (git_kind,))
226
# XXX: Maybe the file id should be prefixed by file kind, so when
227
# the kind of path changes, the id changes too.
228
# -- David Allouche 2007-12-28.
229
entry = inv.add_path(path, kind, file_id=path.encode('utf-8'))
230
entry.text_sha1 = text_sha1
231
entry.executable = executable
235
class GitRevisionTree(revisiontree.RevisionTree):
237
def __init__(self, repository, revision_id):
238
if revision_id is None:
239
revision_id = revision.NULL_REVISION
240
self._inventory = repository.get_inventory(revision_id)
241
self._repository = repository
242
self._revision_id = revision_id
244
def get_file_lines(self, file_id):
245
obj_id = self._inventory[file_id].text_sha1
246
return self._repository._git.cat_file('blob', obj_id)
added
removed
git_repository.py
