17
17
"""An adapter between a Git Repository and a Bazaar Branch"""
23
19
from bzrlib import (
34
from bzrlib.foreign import (
37
from bzrlib.transport import get_transport
39
from bzrlib.plugins.git.foreign import (
43
from bzrlib.plugins.git.mapping import default_mapping
45
from bzrlib.plugins.git import git
48
class GitTags(object):
50
def __init__(self, tags):
54
return iter(self._tags)
57
class GitRepository(ForeignRepository):
28
from bzrlib.plugins.git import (
34
class GitRepository(repository.Repository):
58
35
"""An adapter to git repositories for bzr."""
37
# To make bzrlib happy
62
40
def __init__(self, gitdir, lockfiles):
63
self.base = gitdir.root_transport.base
64
41
self.bzrdir = gitdir
65
42
self.control_files = lockfiles
66
self._git = gitdir._git
68
self.signatures = versionedfiles.VirtualSignatureTexts(self)
69
self.revisions = versionedfiles.VirtualRevisionTexts(self)
70
self._format = GitFormat()
71
self._fallback_repositories = []
72
self.tags = GitTags(self._git.get_tags())
43
gitdirectory = gitdir.transport.local_abspath('.')
44
self._git = model.GitModel(gitdirectory)
45
self._revision_cache = {}
74
def _all_revision_ids(self):
75
if self._git.heads == []:
82
cms = self._git.commits("--all", max_count=max_count, skip=skip)
84
ret.update([self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms])
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)
87
55
def is_shared(self):
90
58
def supports_rich_root(self):
93
#def get_revision_delta(self, revision_id):
94
# parent_revid = self.get_revision(revision_id).parent_ids[0]
95
# diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
96
# ids.convert_revision_id_bzr_to_git(revision_id))
98
def get_ancestry(self, revision_id):
99
revision_id = revision.ensure_null(revision_id)
101
if revision_id != revision.NULL_REVISION:
106
cms = self._git.commits(self.lookup_git_revid(revision_id, self.get_mapping()), max_count=max_count, skip=skip)
108
ret += [self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms]
111
def get_signature_text(self, revision_id):
112
raise errors.NoSuchRevision(self, revision_id)
114
def lookup_revision_id(self, revid):
115
"""Lookup a revision id.
117
:param revid: Bazaar revision id.
118
:return: Tuple with git revisionid and mapping.
120
# Yes, this doesn't really work, but good enough as a stub
121
return osutils.sha(rev_id).hexdigest(), self.get_mapping()
123
def has_signature_for_revision_id(self, revision_id):
126
def get_mapping(self):
127
return default_mapping
129
def get_parent_map(self, revision_ids):
131
for revid in revision_ids:
132
if revid == revision.NULL_REVISION:
135
git_commit_id = self.lookup_git_revid(revid, self.get_mapping())
136
commit = self._git.commit(git_commit_id)
137
ret[revid] = tuple([self.get_mapping().revision_id_foreign_to_bzr(p.id) for p in commit.parents])
140
def lookup_git_revid(self, bzr_revid, mapping):
142
return mapping.revision_id_bzr_to_foreign(bzr_revid)
143
except errors.InvalidRevisionId:
144
raise errors.NoSuchRevision(bzr_revid, 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)
146
89
def get_revision(self, revision_id):
147
git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
148
commit = self._git.commit(git_commit_id)
149
# print "fetched revision:", git_commit_id
150
revision = self._parse_rev(commit, self.get_mapping())
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)
153
97
def has_revision(self, revision_id):
162
106
return [self.get_revision(r) for r in revisions]
165
def _parse_rev(klass, commit, mapping):
166
"""Convert a git commit to a bzr revision.
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.
168
120
:return: a `bzrlib.revision.Revision` object.
171
raise AssertionError("Commit object can't be None")
172
rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
173
rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
174
rev.message = commit.message.decode("utf-8", "replace")
175
rev.committer = str(commit.committer).decode("utf-8", "replace")
176
rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
177
rev.timestamp = time.mktime(commit.committed_date)
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
181
def revision_trees(self, revids):
182
182
for revid in revids:
183
183
yield self.revision_tree(revid)
185
185
def revision_tree(self, revision_id):
186
revision_id = revision.ensure_null(revision_id)
188
if revision_id == revision.NULL_REVISION:
189
inv = inventory.Inventory(root_id=None)
190
inv.revision_id = revision_id
191
return revisiontree.RevisionTree(self, inv, revision_id)
193
186
return GitRevisionTree(self, revision_id)
195
188
def get_inventory(self, revision_id):
196
assert revision_id != None
197
return self.revision_tree(revision_id).inventory
199
def set_make_working_trees(self, trees):
203
def escape_file_id(file_id):
204
return file_id.replace('_', '__').replace(' ', '_s')
207
def unescape_file_id(file_id):
208
return file_id.replace("_s", " ").replace("__", "_")
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
211
230
class GitRevisionTree(revisiontree.RevisionTree):
213
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)
214
236
self._repository = repository
215
self.revision_id = revision_id
216
git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
217
self.tree = repository._git.commit(git_id).tree
218
self._inventory = inventory.Inventory(revision_id=revision_id)
219
self._inventory.root.revision = revision_id
220
self._build_inventory(self.tree, self._inventory.root, "")
222
def get_revision_id(self):
223
return self.revision_id
225
def get_file_text(self, file_id):
226
entry = self._inventory[file_id]
227
if entry.kind == 'directory': return ""
228
return self._repository._git.blob(entry.text_id).data
230
def _build_inventory(self, tree, ie, path):
231
assert isinstance(path, str)
232
for name, mode, hexsha in tree.entries():
233
basename = name.decode("utf-8")
237
child_path = urlutils.join(path, name)
238
file_id = escape_file_id(child_path.encode('utf-8'))
240
child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
243
child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
244
child_ie.text_sha1 = osutils.sha_string(b.data)
246
child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
247
child_ie.text_sha1 = osutils.sha_string("")
249
raise AssertionError(
250
"Unknown file kind, perms=%r." % (mode,))
251
child_ie.text_id = b.id
252
child_ie.text_size = b.size
254
raise AssertionError(
255
"Unknown blob kind, perms=%r." % (mode,))
256
child_ie.executable = bool(int(mode[3:], 8) & 0111)
257
child_ie.revision = self.revision_id
258
self._inventory.add(child_ie)
260
self._build_inventory(b, child_ie, child_path)
263
class GitFormat(object):
265
supports_tree_reference = False
267
def get_format_description(self):
268
return "Git 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
