1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
|
# Copyright (C) 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""An adapter between a Git Repository and a Bazaar Branch"""
from bzrlib import (
deprecated_graph,
inventory,
repository,
revision,
revisiontree,
urlutils,
)
from bzrlib.plugins.git import (
ids,
model,
)
class GitRepository(repository.Repository):
"""An adapter to git repositories for bzr."""
def __init__(self, gitdir, lockfiles):
self.bzrdir = gitdir
self.control_files = lockfiles
gitdirectory = gitdir.transport.local_abspath('.')
self._git = model.GitModel(gitdirectory)
self._revision_cache = {}
def _ancestor_revisions(self, revision_ids):
if revision_ids is not None:
git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
else:
git_revisions = None
for lines in self._git.ancestor_lines(git_revisions):
yield self._parse_rev(lines)
def is_shared(self):
return True
def supports_rich_root(self):
return False
def get_revision_graph(self, revision_id=None):
result = {}
if revision_id is not None:
param = [ids.convert_revision_id_bzr_to_git(revision_id)]
else:
param = None
for node, parents in self._git.ancestry(param).iteritems():
bzr_node = ids.convert_revision_id_git_to_bzr(node)
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
for n in parents]
result[bzr_node] = bzr_parents
return result
def get_revision_graph_with_ghosts(self, revision_ids=None):
graph = deprecated_graph.Graph()
if revision_ids is not None:
revision_ids = [ids.convert_revision_id_bzr_to_git(r)
for r in revision_ids]
for node, parents in self._git.ancestry(revision_ids).iteritems():
bzr_node = ids.convert_revision_id_git_to_bzr(node)
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
for n in parents]
graph.add_node(bzr_node, bzr_parents)
return graph
def get_revision(self, revision_id):
if revision_id in self._revision_cache:
return self._revision_cache[revision_id]
raw = self._git.rev_list(
[ids.convert_revision_id_bzr_to_git(revision_id)],
max_count=1, header=True)
return self._parse_rev(raw)
def has_revision(self, revision_id):
try:
self.get_revision(revision_id)
except NoSuchRevision:
return False
else:
return True
def get_revisions(self, revisions):
return [self.get_revision(r) for r in revisions]
@classmethod
def _parse_rev(klass, raw):
"""Parse a single git revision.
* The first line is the git commit id.
* Following lines conform to the 'name value' structure, until the
first blank line.
* All lines after the first blank line and until the NULL line have 4
leading spaces and constitute the commit message.
:param raw: sequence of newline-terminated strings, its last item is a
single NULL character.
:return: a `bzrlib.revision.Revision` object.
"""
parents = []
message_lines = []
in_message = False
committer_was_set = False
revision_id = ids.convert_revision_id_git_to_bzr(raw[0][:-1])
rev = revision.Revision(revision_id)
rev.inventory_sha1 = ""
assert raw[-1] == '\x00', (
"Last item of raw was not a single NULL character.")
for line in raw[1:-1]:
if in_message:
assert line[:4] == ' ', (
"Unexpected line format in commit message: %r" % line)
message_lines.append(line[4:])
continue
if line == '\n':
in_message = True
continue
name, value = line[:-1].split(' ', 1)
if name == 'parent':
rev.parent_ids.append(
ids.convert_revision_id_git_to_bzr(value))
continue
if name == 'author':
author, timestamp, timezone = value.rsplit(' ', 2)
rev.properties['author'] = author
rev.properties['git-author-timestamp'] = timestamp
rev.properties['git-author-timezone'] = timezone
if not committer_was_set:
rev.committer = author
rev.timestamp = float(timestamp)
rev.timezone = klass._parse_tz(timezone)
continue
if name == 'committer':
committer_was_set = True
committer, timestamp, timezone = value.rsplit(' ', 2)
rev.committer = committer
rev.timestamp = float(timestamp)
rev.timezone = klass._parse_tz(timezone)
continue
if name == 'tree':
rev.properties['git-tree-id'] = value
continue
rev.message = ''.join(message_lines)
return rev
@classmethod
def _parse_tz(klass, tz):
"""Parse a timezone specification in the [+|-]HHMM format.
:return: the timezone offset in seconds.
"""
assert len(tz) == 5
sign = {'+': +1, '-': -1}[tz[0]]
hours = int(tz[1:3])
minutes = int(tz[3:])
return float(sign * 60 * (60 * hours + minutes))
def revision_trees(self, revids):
for revid in revids:
yield self.revision_tree(revid)
def revision_tree(self, revision_id):
return GitRevisionTree(self, revision_id)
def get_inventory(self, revision_id):
if revision_id is None:
revision_id = revision.NULL_REVISION
if revision_id == revision.NULL_REVISION:
return inventory.Inventory(
revision_id=revision_id, root_id=None)
git_commit = ids.convert_revision_id_bzr_to_git(revision_id)
git_inventory = self._git.get_inventory(git_commit)
return self._parse_inventory(revision_id, git_inventory)
@classmethod
def _parse_inventory(klass, revid, git_inv):
# For now, git inventory do not have root ids. It is not clear that we
# can reliably support root ids. -- David Allouche 2007-12-28
inv = inventory.Inventory(revision_id=revid)
for perms, git_kind, git_id, path in git_inv:
text_sha1 = None
executable = False
if git_kind == 'blob':
text_sha1 = git_id
if perms[1] == '0':
kind = 'file'
executable = bool(int(perms[-3:], 8) & 0111)
elif perms[1] == '2':
kind = 'symlink'
else:
raise AssertionError(
"Unknown blob kind, perms=%r." % (perms,))
elif git_kind == 'tree':
kind = 'directory'
else:
raise AssertionError(
"Unknown git entry kind: %r" % (git_kind,))
# XXX: Maybe the file id should be prefixed by file kind, so when
# the kind of path changes, the id changes too.
# -- David Allouche 2007-12-28.
entry = inv.add_path(path, kind, file_id=path.encode('utf-8'))
entry.text_sha1 = text_sha1
entry.executable = executable
return inv
class GitRevisionTree(revisiontree.RevisionTree):
def __init__(self, repository, revision_id):
if revision_id is None:
revision_id = revision.NULL_REVISION
self._inventory = repository.get_inventory(revision_id)
self._repository = repository
self._revision_id = revision_id
def get_file_lines(self, file_id):
obj_id = self._inventory[file_id].text_sha1
return self._repository._git.cat_file('blob', obj_id)
|