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
gitdirectory = gitdir.transport.local_abspath('.')
44
self._git = model.GitModel(gitdirectory)
45
self._revision_cache = {}
47
def _ancestor_revisions(self, revision_ids):
48
if revision_ids is not None:
49
git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
52
for lines in self._git.ancestor_lines(git_revisions):
53
yield self._parse_rev(lines)
58
def supports_rich_root(self):
61
def get_revision_graph(self, revision_id=None):
63
if revision_id is not None:
64
param = [ids.convert_revision_id_bzr_to_git(revision_id)]
67
git_graph = self._git.get_revision_graph(param)
68
for node, parents in git_graph.iteritems():
69
bzr_node = ids.convert_revision_id_git_to_bzr(node)
70
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
72
result[bzr_node] = bzr_parents
75
def get_revision_graph_with_ghosts(self, revision_ids=None):
76
graph = deprecated_graph.Graph()
77
if revision_ids is not None:
78
revision_ids = [ids.convert_revision_id_bzr_to_git(r)
79
for r in revision_ids]
80
git_graph = self._git.get_revision_graph(revision_ids)
81
for node, parents in git_graph.iteritems():
82
bzr_node = ids.convert_revision_id_git_to_bzr(node)
83
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
86
graph.add_node(bzr_node, bzr_parents)
89
def get_revision(self, revision_id):
90
if revision_id in self._revision_cache:
91
return self._revision_cache[revision_id]
92
raw = self._git.rev_list(
93
[ids.convert_revision_id_bzr_to_git(revision_id)],
94
max_count=1, header=True)
95
return self._parse_rev(raw)
97
def has_revision(self, revision_id):
99
self.get_revision(revision_id)
100
except NoSuchRevision:
105
def get_revisions(self, revisions):
106
return [self.get_revision(r) for r in revisions]
109
def _parse_rev(klass, raw):
110
"""Parse a single git revision.
112
* The first line is the git commit id.
113
* Following lines conform to the 'name value' structure, until the
115
* All lines after the first blank line and until the NULL line have 4
116
leading spaces and constitute the commit message.
118
:param raw: sequence of newline-terminated strings, its last item is a
119
single NULL character.
120
:return: a `bzrlib.revision.Revision` object.
125
committer_was_set = False
126
revision_id = ids.convert_revision_id_git_to_bzr(raw[0][:-1])
127
rev = revision.Revision(revision_id)
128
rev.inventory_sha1 = ""
129
assert raw[-1] == '\x00', (
130
"Last item of raw was not a single NULL character.")
131
for line in raw[1:-1]:
133
assert line[:4] == ' ', (
134
"Unexpected line format in commit message: %r" % line)
135
message_lines.append(line[4:])
140
name, value = line[:-1].split(' ', 1)
142
rev.parent_ids.append(
143
ids.convert_revision_id_git_to_bzr(value))
146
author, timestamp, timezone = value.rsplit(' ', 2)
147
rev.properties['author'] = author
148
rev.properties['git-author-timestamp'] = timestamp
149
rev.properties['git-author-timezone'] = timezone
150
if not committer_was_set:
151
rev.committer = author
152
rev.timestamp = float(timestamp)
153
rev.timezone = klass._parse_tz(timezone)
155
if name == 'committer':
156
committer_was_set = True
157
committer, timestamp, timezone = value.rsplit(' ', 2)
158
rev.committer = committer
159
rev.timestamp = float(timestamp)
160
rev.timezone = klass._parse_tz(timezone)
163
rev.properties['git-tree-id'] = value
166
rev.message = ''.join(message_lines)
170
def _parse_tz(klass, tz):
171
"""Parse a timezone specification in the [+|-]HHMM format.
173
:return: the timezone offset in seconds.
176
sign = {'+': +1, '-': -1}[tz[0]]
178
minutes = int(tz[3:])
179
return float(sign * 60 * (60 * hours + minutes))
181
def revision_trees(self, revids):
183
yield self.revision_tree(revid)
185
def revision_tree(self, revision_id):
186
return GitRevisionTree(self, revision_id)
188
def get_inventory(self, revision_id):
189
if revision_id is None:
190
revision_id = revision.NULL_REVISION
191
if revision_id == revision.NULL_REVISION:
192
return inventory.Inventory(
193
revision_id=revision_id, root_id=None)
194
git_commit = ids.convert_revision_id_bzr_to_git(revision_id)
195
git_inventory = self._git.get_inventory(git_commit)
196
return self._parse_inventory(revision_id, git_inventory)
199
def _parse_inventory(klass, revid, git_inv):
200
# For now, git inventory do not have root ids. It is not clear that we
201
# can reliably support root ids. -- David Allouche 2007-12-28
202
inv = inventory.Inventory(revision_id=revid)
203
for perms, git_kind, git_id, path in git_inv:
206
if git_kind == 'blob':
210
executable = bool(int(perms[-3:], 8) & 0111)
211
elif perms[1] == '2':
214
raise AssertionError(
215
"Unknown blob kind, perms=%r." % (perms,))
216
elif git_kind == 'tree':
219
raise AssertionError(
220
"Unknown git entry kind: %r" % (git_kind,))
221
# XXX: Maybe the file id should be prefixed by file kind, so when
222
# the kind of path changes, the id changes too.
223
# -- David Allouche 2007-12-28.
224
entry = inv.add_path(path, kind, file_id=path.encode('utf-8'))
225
entry.text_sha1 = text_sha1
226
entry.executable = executable
230
class GitRevisionTree(revisiontree.RevisionTree):
232
def __init__(self, repository, revision_id):
233
if revision_id is None:
234
revision_id = revision.NULL_REVISION
235
self._inventory = repository.get_inventory(revision_id)
236
self._repository = repository
237
self._revision_id = revision_id
239
def get_file_lines(self, file_id):
240
obj_id = self._inventory[file_id].text_sha1
241
return self._repository._git.cat_file('blob', obj_id)
added
removed
git_repository.py
