17
17
"""An adapter between a Git Repository and a Bazaar Branch"""
23
19
from bzrlib import (
35
from bzrlib.foreign import (
38
from bzrlib.trace import mutter
39
from bzrlib.transport import get_transport
41
from bzrlib.plugins.git.foreign import (
44
from bzrlib.plugins.git.mapping import default_mapping
46
from bzrlib.plugins.git import git
49
class GitTags(object):
51
def __init__(self, tags):
55
return iter(self._tags)
58
class GitRepository(ForeignRepository):
28
from bzrlib.plugins.git import (
34
class GitRepository(repository.Repository):
59
35
"""An adapter to git repositories for bzr."""
63
37
def __init__(self, gitdir, lockfiles):
64
ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
65
from bzrlib.plugins.git import fetch
66
repository.InterRepository.register_optimiser(fetch.InterGitRepository)
67
repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
39
self.control_files = lockfiles
40
gitdirectory = gitdir.transport.local_abspath('.')
41
self._git = model.GitModel(gitdirectory)
42
self._revision_cache = {}
44
def _ancestor_revisions(self, revision_ids):
45
if revision_ids is not None:
46
git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
49
for lines in self._git.ancestor_lines(git_revisions):
50
yield self._parse_rev(lines)
69
52
def is_shared(self):
72
55
def supports_rich_root(self):
75
def _warn_if_deprecated(self):
76
# This class isn't deprecated
79
def get_mapping(self):
80
return default_mapping
82
def make_working_trees(self):
86
class LocalGitRepository(GitRepository):
88
def __init__(self, gitdir, lockfiles):
89
# FIXME: This also caches negatives. Need to be more careful
90
# about this once we start writing to git
91
self._parents_provider = graph.CachingParentsProvider(self)
92
GitRepository.__init__(self, gitdir, lockfiles)
93
self.base = gitdir.root_transport.base
94
self._git = gitdir._git
96
self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
self.tags = GitTags(self._git.get_tags())
100
def all_revision_ids(self):
101
ret = set([revision.NULL_REVISION])
102
if self._git.heads() == []:
104
bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
106
graph = self.get_graph()
107
for rev, parents in graph.iter_ancestry(bzr_heads):
111
#def get_revision_delta(self, revision_id):
112
# parent_revid = self.get_revision(revision_id).parent_ids[0]
113
# diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
114
# ids.convert_revision_id_bzr_to_git(revision_id))
116
def _make_parents_provider(self):
117
"""See Repository._make_parents_provider()."""
118
return self._parents_provider
120
def get_parent_map(self, revids):
122
mutter("get_parent_map(%r)", revids)
123
for revision_id in revids:
124
assert isinstance(revision_id, str)
125
if revision_id == revision.NULL_REVISION:
126
parent_map[revision_id] = ()
128
hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
129
commit = self._git.commit(hexsha)
133
parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
136
def get_ancestry(self, revision_id, topo_sorted=True):
137
"""See Repository.get_ancestry().
139
if revision_id is None:
140
return self._all_revision_ids()
141
assert isinstance(revision_id, str)
143
graph = self.get_graph()
144
for rev, parents in graph.iter_ancestry([revision_id]):
145
if rev == revision.NULL_REVISION:
151
def get_signature_text(self, revision_id):
152
raise errors.NoSuchRevision(self, revision_id)
154
def lookup_revision_id(self, revid):
155
"""Lookup a revision id.
157
:param revid: Bazaar revision id.
158
:return: Tuple with git revisionid and mapping.
160
# Yes, this doesn't really work, but good enough as a stub
161
return osutils.sha(rev_id).hexdigest(), self.get_mapping()
163
def has_signature_for_revision_id(self, revision_id):
166
def lookup_git_revid(self, bzr_revid, mapping):
168
return mapping.revision_id_bzr_to_foreign(bzr_revid)
169
except errors.InvalidRevisionId:
170
raise errors.NoSuchRevision(self, bzr_revid)
58
def get_revision_graph(self, revision_id=None):
60
if revision_id is not None:
61
param = [ids.convert_revision_id_bzr_to_git(revision_id)]
64
for node, parents in self._git.ancestry(param).iteritems():
65
bzr_node = ids.convert_revision_id_git_to_bzr(node)
66
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
68
result[bzr_node] = bzr_parents
71
def get_revision_graph_with_ghosts(self, revision_ids=None):
72
graph = deprecated_graph.Graph()
73
if revision_ids is not None:
74
revision_ids = [ids.convert_revision_id_bzr_to_git(r)
75
for r in revision_ids]
76
for node, parents in self._git.ancestry(revision_ids).iteritems():
77
bzr_node = ids.convert_revision_id_git_to_bzr(node)
78
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
81
graph.add_node(bzr_node, bzr_parents)
172
84
def get_revision(self, revision_id):
173
git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
175
commit = self._git.commit(git_commit_id)
177
raise errors.NoSuchRevision(self, revision_id)
178
# print "fetched revision:", git_commit_id
179
revision = self.get_mapping().import_commit(commit)
180
assert revision is not None
85
if revision_id in self._revision_cache:
86
return self._revision_cache[revision_id]
87
raw = self._git.rev_list(
88
[ids.convert_revision_id_bzr_to_git(revision_id)],
89
max_count=1, header=True)
90
return self._parse_rev(raw)
183
92
def has_revision(self, revision_id):
185
94
self.get_revision(revision_id)
186
except errors.NoSuchRevision:
95
except NoSuchRevision:
191
def get_revisions(self, revids):
192
return [self.get_revision(r) for r in revids]
100
def get_revisions(self, revisions):
101
return [self.get_revision(r) for r in revisions]
104
def _parse_rev(klass, raw):
105
"""Parse a single git revision.
107
* The first line is the git commit id.
108
* Following lines conform to the 'name value' structure, until the
110
* All lines after the first blank line and until the NULL line have 4
111
leading spaces and constitute the commit message.
113
:param raw: sequence of newline-terminated strings, its last item is a
114
single NULL character.
115
:return: a `bzrlib.revision.Revision` object.
120
committer_was_set = False
121
revision_id = ids.convert_revision_id_git_to_bzr(raw[0][:-1])
122
rev = revision.Revision(revision_id)
123
rev.inventory_sha1 = ""
124
assert raw[-1] == '\x00', (
125
"Last item of raw was not a single NULL character.")
126
for line in raw[1:-1]:
128
assert line[:4] == ' ', (
129
"Unexpected line format in commit message: %r" % line)
130
message_lines.append(line[4:])
135
name, value = line[:-1].split(' ', 1)
137
rev.parent_ids.append(
138
ids.convert_revision_id_git_to_bzr(value))
141
author, timestamp, timezone = value.rsplit(' ', 2)
142
rev.properties['author'] = author
143
rev.properties['git-author-timestamp'] = timestamp
144
rev.properties['git-author-timezone'] = timezone
145
if not committer_was_set:
146
rev.committer = author
147
rev.timestamp = float(timestamp)
148
rev.timezone = klass._parse_tz(timezone)
150
if name == 'committer':
151
committer_was_set = True
152
committer, timestamp, timezone = value.rsplit(' ', 2)
153
rev.committer = committer
154
rev.timestamp = float(timestamp)
155
rev.timezone = klass._parse_tz(timezone)
158
rev.properties['git-tree-id'] = value
161
rev.message = ''.join(message_lines)
165
def _parse_tz(klass, tz):
166
"""Parse a timezone specification in the [+|-]HHMM format.
168
:return: the timezone offset in seconds.
171
sign = {'+': +1, '-': -1}[tz[0]]
173
minutes = int(tz[3:])
174
return float(sign * 60 * (60 * hours + minutes))
194
176
def revision_trees(self, revids):
195
177
for revid in revids:
196
178
yield self.revision_tree(revid)
198
180
def revision_tree(self, revision_id):
199
revision_id = revision.ensure_null(revision_id)
181
return GitRevisionTree(self, revision_id)
183
def get_inventory(self, revision_id):
184
if revision_id is None:
185
revision_id = revision.NULL_REVISION
201
186
if revision_id == revision.NULL_REVISION:
202
inv = inventory.Inventory(root_id=None)
203
inv.revision_id = revision_id
204
return revisiontree.RevisionTree(self, inv, revision_id)
206
return GitRevisionTree(self, self.get_mapping(), revision_id)
208
def get_inventory(self, revision_id):
209
assert revision_id != None
210
return self.revision_tree(revision_id).inventory
212
def set_make_working_trees(self, trees):
215
def fetch_objects(self, determine_wants, graph_walker, progress=None):
216
return self._git.fetch_objects(determine_wants, graph_walker, progress)
219
class GitRevisionTree(revisiontree.RevisionTree):
221
def __init__(self, repository, mapping, revision_id):
222
self._repository = repository
223
self.revision_id = revision_id
224
assert isinstance(revision_id, str)
225
self.mapping = mapping
226
git_id = repository.lookup_git_revid(revision_id, self.mapping)
228
commit = repository._git.commit(git_id)
230
raise errors.NoSuchRevision(repository, revision_id)
231
self.tree = commit.tree
232
self._inventory = inventory.Inventory(revision_id=revision_id)
233
self._inventory.root.revision = revision_id
234
self._build_inventory(self.tree, self._inventory.root, "")
236
def get_revision_id(self):
237
return self.revision_id
239
def get_file_text(self, file_id):
240
entry = self._inventory[file_id]
241
if entry.kind == 'directory': return ""
242
return self._repository._git.get_blob(entry.text_id).data
244
def _build_inventory(self, tree_id, ie, path):
245
assert isinstance(path, str)
246
tree = self._repository._git.tree(tree_id)
247
for mode, name, hexsha in tree.entries():
248
basename = name.decode("utf-8")
252
child_path = urlutils.join(path, name)
253
file_id = self.mapping.generate_file_id(child_path)
254
entry_kind = (mode & 0700000) / 0100000
256
child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
257
elif entry_kind == 1:
258
file_kind = (mode & 070000) / 010000
259
b = self._repository._git.get_blob(hexsha)
261
child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
262
child_ie.text_sha1 = osutils.sha_string(b.data)
264
child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
265
child_ie.text_sha1 = osutils.sha_string("")
187
return inventory.Inventory(
188
revision_id=revision_id, root_id=None)
189
git_commit = ids.convert_revision_id_bzr_to_git(revision_id)
190
git_inventory = self._git.get_inventory(git_commit)
191
return self._parse_inventory(revision_id, git_inventory)
194
def _parse_inventory(klass, revid, git_inv):
195
# For now, git inventory do not have root ids. It is not clear that we
196
# can reliably support root ids. -- David Allouche 2007-12-28
197
inv = inventory.Inventory(revision_id=revid)
198
for perms, git_kind, git_id, path in git_inv:
201
if git_kind == 'blob':
205
executable = bool(int(perms[-3:], 8) & 0111)
206
elif perms[1] == '2':
267
209
raise AssertionError(
268
"Unknown file kind, perms=%o." % (mode,))
269
child_ie.text_id = b.id
270
child_ie.text_size = len(b.data)
210
"Unknown blob kind, perms=%r." % (perms,))
211
elif git_kind == 'tree':
272
214
raise AssertionError(
273
"Unknown blob kind, perms=%r." % (mode,))
274
fs_mode = mode & 0777
275
child_ie.executable = bool(fs_mode & 0111)
276
child_ie.revision = self.revision_id
277
self._inventory.add(child_ie)
279
self._build_inventory(hexsha, child_ie, child_path)
282
class GitFormat(object):
284
supports_tree_reference = False
285
rich_root_data = True
287
def get_format_description(self):
288
return "Git Repository"
290
def initialize(self, url, shared=False, _internal=False):
291
raise bzr_errors.UninitializableFormat(self)
293
def check_conversion_target(self, target_repo_format):
294
return target_repo_format.rich_root_data
215
"Unknown git entry kind: %r" % (git_kind,))
216
# XXX: Maybe the file id should be prefixed by file kind, so when
217
# the kind of path changes, the id changes too.
218
# -- David Allouche 2007-12-28.
219
entry = inv.add_path(path, kind, file_id=path.encode('utf-8'))
220
entry.text_sha1 = text_sha1
221
entry.executable = executable
225
class GitRevisionTree(revisiontree.RevisionTree):
227
def __init__(self, repository, revision_id):
228
if revision_id is None:
229
revision_id = revision.NULL_REVISION
230
self._inventory = repository.get_inventory(revision_id)
231
self._repository = repository
232
self._revision_id = revision_id
234
def get_file_lines(self, file_id):
235
obj_id = self._inventory[file_id].text_sha1
236
return self._repository._git.cat_file('blob', obj_id)
added
removed
git_repository.py
