62
74
def __init__(self, gitdir, lockfiles):
75
ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
77
from bzrlib.plugins.git import fetch, push
78
for optimiser in [fetch.InterRemoteGitNonGitRepository,
79
fetch.InterLocalGitNonGitRepository,
80
fetch.InterGitRepository,
81
push.InterToGitRepository]:
82
repository.InterRepository.register_optimiser(optimiser)
87
def supports_rich_root(self):
90
def _warn_if_deprecated(self):
91
# This class isn't deprecated
94
def get_mapping(self):
95
return default_mapping
97
def make_working_trees(self):
101
class LocalGitRepository(GitRepository):
102
"""Git repository on the file system."""
104
def __init__(self, gitdir, lockfiles):
105
# FIXME: This also caches negatives. Need to be more careful
106
# about this once we start writing to git
107
self._parents_provider = graph.CachingParentsProvider(self)
108
GitRepository.__init__(self, gitdir, lockfiles)
63
109
self.base = gitdir.root_transport.base
65
self.control_files = lockfiles
66
110
self._git = gitdir._git
68
112
self.signatures = versionedfiles.VirtualSignatureTexts(self)
69
113
self.revisions = versionedfiles.VirtualRevisionTexts(self)
70
self._format = GitFormat()
71
self._fallback_repositories = []
114
self.inventories = versionedfiles.VirtualInventoryTexts(self)
115
self.texts = GitTexts(self)
72
116
self.tags = GitTags(self._git.get_tags())
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])
118
def all_revision_ids(self):
119
ret = set([revision.NULL_REVISION])
120
heads = self._git.heads()
123
bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
125
graph = self.get_graph()
126
for rev, parents in graph.iter_ancestry(bzr_heads):
90
def supports_rich_root(self):
93
130
#def get_revision_delta(self, revision_id):
94
131
# parent_revid = self.get_revision(revision_id).parent_ids[0]
95
132
# diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
96
133
# 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]
135
def _make_parents_provider(self):
136
"""See Repository._make_parents_provider()."""
137
return self._parents_provider
139
def get_parent_map(self, revids):
141
mutter("get_parent_map(%r)", revids)
142
for revision_id in revids:
143
assert isinstance(revision_id, str)
144
if revision_id == revision.NULL_REVISION:
145
parent_map[revision_id] = ()
147
hexsha, mapping = self.lookup_git_revid(revision_id)
148
commit = self._git.commit(hexsha)
152
parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
155
def get_ancestry(self, revision_id, topo_sorted=True):
156
"""See Repository.get_ancestry().
158
if revision_id is None:
159
return [None, revision.NULL_REVISION] + self._all_revision_ids()
160
assert isinstance(revision_id, str)
162
graph = self.get_graph()
163
for rev, parents in graph.iter_ancestry([revision_id]):
166
return [None] + ancestry
168
def import_revision_gist(self, source, revid, parent_lookup):
169
"""Import the gist of a revision into this Git repository.
173
rev = source.get_revision(revid)
174
for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
177
objects.append((object, path))
178
commit = revision_to_commit(rev, tree_sha, parent_lookup)
179
objects.append((commit, None))
180
self._git.object_store.add_objects(objects)
181
return commit.sha().hexdigest()
183
def dfetch(self, source, stop_revision):
184
"""Import the gist of the ancestry of a particular revision."""
185
if stop_revision is None:
186
raise NotImplementedError
189
def parent_lookup(revid):
191
return gitidmap[revid]
193
return self.lookup_git_revid(revid)[0]
197
graph = source.get_graph()
198
ancestry = [x for x in source.get_ancestry(stop_revision) if x is not None]
199
for revid in graph.iter_topo_order(ancestry):
200
if not self.has_revision(revid):
202
pb = ui.ui_factory.nested_progress_bar()
204
for i, revid in enumerate(todo):
205
pb.update("pushing revisions", i, len(todo))
206
git_commit = self.import_revision_gist(source, revid,
208
gitidmap[revid] = git_commit
209
git_revid = self.get_mapping().revision_id_foreign_to_bzr(
211
revidmap[revid] = git_revid
214
source.fetch(self, revision_id=revidmap[stop_revision])
111
219
def get_signature_text(self, revision_id):
112
220
raise errors.NoSuchRevision(self, revision_id)
123
231
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):
234
def lookup_git_revid(self, bzr_revid):
142
return mapping.revision_id_bzr_to_foreign(bzr_revid)
236
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
143
237
except errors.InvalidRevisionId:
144
raise errors.NoSuchRevision(bzr_revid, self)
238
raise errors.NoSuchRevision(self, bzr_revid)
146
240
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)
241
git_commit_id, mapping = self.lookup_git_revid(revision_id)
243
commit = self._git.commit(git_commit_id)
245
raise errors.NoSuchRevision(self, revision_id)
149
246
# print "fetched revision:", git_commit_id
150
revision = self._parse_rev(commit, self.get_mapping())
247
revision = mapping.import_commit(commit)
248
assert revision is not None
153
251
def has_revision(self, revision_id):
155
253
self.get_revision(revision_id)
156
except NoSuchRevision:
254
except errors.NoSuchRevision:
161
def get_revisions(self, revisions):
162
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.
168
: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)
259
def get_revisions(self, revids):
260
return [self.get_revision(r) for r in revids]
181
262
def revision_trees(self, revids):
182
263
for revid in revids:
199
278
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("__", "_")
281
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
283
return self._git.fetch_objects(determine_wants, graph_walker, progress)
211
286
class GitRevisionTree(revisiontree.RevisionTree):
213
288
def __init__(self, repository, revision_id):
214
289
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
290
self._revision_id = revision_id
291
assert isinstance(revision_id, str)
292
git_id, self.mapping = repository.lookup_git_revid(revision_id)
294
commit = repository._git.commit(git_id)
296
raise errors.NoSuchRevision(repository, revision_id)
297
self.tree = commit.tree
218
298
self._inventory = inventory.Inventory(revision_id=revision_id)
219
299
self._inventory.root.revision = revision_id
220
300
self._build_inventory(self.tree, self._inventory.root, "")
222
302
def get_revision_id(self):
223
return self.revision_id
303
return self._revision_id
225
305
def get_file_text(self, file_id):
226
306
entry = self._inventory[file_id]
227
307
if entry.kind == 'directory': return ""
228
return self._repository._git.blob(entry.text_id).data
308
return self._repository._git.get_blob(entry.text_id).data
230
def _build_inventory(self, tree, ie, path):
310
def _build_inventory(self, tree_id, ie, path):
231
311
assert isinstance(path, str)
232
for name, mode, hexsha in tree.entries():
312
tree = self._repository._git.tree(tree_id)
313
for mode, name, hexsha in tree.entries():
233
314
basename = name.decode("utf-8")
235
316
child_path = name
237
318
child_path = urlutils.join(path, name)
238
file_id = escape_file_id(child_path.encode('utf-8'))
319
file_id = self.mapping.generate_file_id(child_path)
320
entry_kind = (mode & 0700000) / 0100000
240
322
child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
323
elif entry_kind == 1:
324
file_kind = (mode & 070000) / 010000
325
b = self._repository._git.get_blob(hexsha)
243
327
child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
244
328
child_ie.text_sha1 = osutils.sha_string(b.data)
246
330
child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
331
child_ie.symlink_target = b.data
247
332
child_ie.text_sha1 = osutils.sha_string("")
249
334
raise AssertionError(
250
"Unknown file kind, perms=%r." % (mode,))
335
"Unknown file kind, perms=%o." % (mode,))
251
336
child_ie.text_id = b.id
252
child_ie.text_size = b.size
337
child_ie.text_size = len(b.data)
254
339
raise AssertionError(
255
340
"Unknown blob kind, perms=%r." % (mode,))
256
child_ie.executable = bool(int(mode[3:], 8) & 0111)
257
child_ie.revision = self.revision_id
341
fs_mode = mode & 0777
342
child_ie.executable = bool(fs_mode & 0111)
343
# TODO: This should be set to the revision id in which
344
# child_ie was last changed instead.
345
child_ie.revision = self._revision_id
258
346
self._inventory.add(child_ie)
260
self._build_inventory(b, child_ie, child_path)
263
class GitFormat(object):
348
self._build_inventory(hexsha, child_ie, child_path)
351
class GitRepositoryFormat(repository.RepositoryFormat):
265
353
supports_tree_reference = False
354
rich_root_data = True
267
356
def get_format_description(self):
268
357
return "Git Repository"
359
def initialize(self, url, shared=False, _internal=False):
360
raise bzr_errors.UninitializableFormat(self)
362
def check_conversion_target(self, target_repo_format):
363
return target_repo_format.rich_root_data
added
removed
repository.py
