79
87
return default_mapping
81
89
def make_working_trees(self):
90
return not self._git.bare
92
def revision_graph_can_have_wrong_parents(self):
95
def dfetch(self, source, stop_revision):
96
interrepo = repository.InterRepository.get(source, self)
97
return interrepo.dfetch(stop_revision)
99
def add_signature_text(self, revid, signature):
100
raise errors.UnsupportedOperation(self.add_signature_text, self)
85
103
class LocalGitRepository(GitRepository):
104
"""Git repository on the file system."""
87
106
def __init__(self, gitdir, lockfiles):
88
# FIXME: This also caches negatives. Need to be more careful
89
# about this once we start writing to git
90
self._parents_provider = graph.CachingParentsProvider(self)
91
107
GitRepository.__init__(self, gitdir, lockfiles)
92
108
self.base = gitdir.root_transport.base
93
109
self._git = gitdir._git
95
self.signatures = versionedfiles.VirtualSignatureTexts(self)
96
self.revisions = versionedfiles.VirtualRevisionTexts(self)
97
self.tags = GitTags(self._git.get_tags())
110
self.signatures = None
111
self.revisions = GitRevisions(self, self._git.object_store)
112
self.inventories = None
113
self.texts = GitTexts(self)
115
def _iter_revision_ids(self):
116
mapping = self.get_mapping()
117
for sha in self._git.object_store:
118
o = self._git.object_store[sha]
119
if not isinstance(o, Commit):
121
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
122
mapping.revision_id_foreign_to_bzr)
123
yield o.id, rev.revision_id, roundtrip_revid
99
125
def all_revision_ids(self):
100
ret = set([revision.NULL_REVISION])
101
if self._git.heads() == []:
103
bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
105
graph = self.get_graph()
106
for rev, parents in graph.iter_ancestry(bzr_heads):
127
for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
130
ret.add(roundtrip_revid)
110
#def get_revision_delta(self, revision_id):
111
# parent_revid = self.get_revision(revision_id).parent_ids[0]
112
# diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
113
# ids.convert_revision_id_bzr_to_git(revision_id))
115
def _make_parents_provider(self):
116
"""See Repository._make_parents_provider()."""
117
return self._parents_provider
119
133
def get_parent_map(self, revids):
121
mutter("get_parent_map(%r)", revids)
122
135
for revision_id in revids:
123
136
assert isinstance(revision_id, str)
124
137
if revision_id == revision.NULL_REVISION:
125
138
parent_map[revision_id] = ()
127
hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
128
commit = self._git.commit(hexsha)
140
hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
142
commit = self._git[hexsha]
132
parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
146
self.lookup_foreign_revision_id(p, mapping)
147
for p in commit.parents]
149
parents = [revision.NULL_REVISION]
150
parent_map[revision_id] = tuple(parents)
133
151
return parent_map
135
153
def get_ancestry(self, revision_id, topo_sorted=True):
136
154
"""See Repository.get_ancestry().
138
156
if revision_id is None:
139
return self._all_revision_ids()
157
return [None, revision.NULL_REVISION] + self._all_revision_ids()
140
158
assert isinstance(revision_id, str)
142
160
graph = self.get_graph()
143
161
for rev, parents in graph.iter_ancestry([revision_id]):
144
if rev == revision.NULL_REVISION:
146
162
ancestry.append(rev)
163
if revision.NULL_REVISION in ancestry:
164
ancestry.remove(revision.NULL_REVISION)
147
165
ancestry.reverse()
166
return [None] + ancestry
150
168
def get_signature_text(self, revision_id):
151
169
raise errors.NoSuchRevision(self, revision_id)
153
def lookup_revision_id(self, revid):
171
def pack(self, hint=None, clean_obsolete_packs=False):
172
self._git.object_store.pack_loose_objects()
174
def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
154
175
"""Lookup a revision id.
156
:param revid: Bazaar revision id.
157
:return: Tuple with git revisionid and mapping.
159
# Yes, this doesn't really work, but good enough as a stub
160
return osutils.sha(rev_id).hexdigest(), self.get_mapping()
178
assert type(foreign_revid) is str
180
mapping = self.get_mapping()
181
if foreign_revid == ZERO_SHA:
182
return revision.NULL_REVISION
183
commit = self._git[foreign_revid]
184
while isinstance(commit, Tag):
185
commit = self._git[commit.object[1]]
186
rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
187
mapping.revision_id_foreign_to_bzr)
188
# FIXME: check testament before doing this?
190
return roundtrip_revid
192
return rev.revision_id
162
194
def has_signature_for_revision_id(self, revision_id):
165
def lookup_git_revid(self, bzr_revid, mapping):
197
def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
167
return mapping.revision_id_bzr_to_foreign(bzr_revid)
199
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
168
200
except errors.InvalidRevisionId:
169
raise errors.NoSuchRevision(self, bzr_revid)
202
mapping = self.get_mapping()
204
return (self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping)
206
# Update refs from Git commit objects
207
# FIXME: Hitting this a lot will be very inefficient...
208
for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
209
if not roundtrip_revid:
211
refname = mapping.revid_as_refname(roundtrip_revid)
212
self._git.refs[refname] = git_sha
213
if roundtrip_revid == bzr_revid:
214
return git_sha, mapping
215
raise errors.NoSuchRevision(self, bzr_revid)
171
217
def get_revision(self, revision_id):
172
git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
218
if not isinstance(revision_id, str):
219
raise errors.InvalidRevisionId(revision_id, self)
220
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
174
commit = self._git.commit(git_commit_id)
222
commit = self._git[git_commit_id]
176
224
raise errors.NoSuchRevision(self, revision_id)
177
# print "fetched revision:", git_commit_id
178
revision = self.get_mapping().import_commit(commit)
225
revision, roundtrip_revid, verifiers = mapping.import_commit(
226
commit, self.lookup_foreign_revision_id)
179
227
assert revision is not None
228
# FIXME: check verifiers ?
230
revision.revision_id = roundtrip_revid
182
233
def has_revision(self, revision_id):
234
"""See Repository.has_revision."""
235
if revision_id == revision.NULL_REVISION:
184
self.get_revision(revision_id)
238
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
185
239
except errors.NoSuchRevision:
241
return (git_commit_id in self._git)
243
def has_revisions(self, revision_ids):
244
"""See Repository.has_revisions."""
245
return set(filter(self.has_revision, revision_ids))
190
247
def get_revisions(self, revids):
248
"""See Repository.get_revisions."""
191
249
return [self.get_revision(r) for r in revids]
193
251
def revision_trees(self, revids):
252
"""See Repository.revision_trees."""
194
253
for revid in revids:
195
254
yield self.revision_tree(revid)
197
256
def revision_tree(self, revision_id):
257
"""See Repository.revision_tree."""
198
258
revision_id = revision.ensure_null(revision_id)
200
259
if revision_id == revision.NULL_REVISION:
201
260
inv = inventory.Inventory(root_id=None)
202
261
inv.revision_id = revision_id
203
return revisiontree.RevisionTree(self, inv, revision_id)
205
return GitRevisionTree(self, self.get_mapping(), revision_id)
262
return InventoryRevisionTree(self, inv, revision_id)
263
return GitRevisionTree(self, revision_id)
207
265
def get_inventory(self, revision_id):
208
assert revision_id != None
209
return self.revision_tree(revision_id).inventory
266
raise NotImplementedError(self.get_inventory)
211
268
def set_make_working_trees(self, trees):
269
raise NotImplementedError(self.set_make_working_trees)
214
def fetch_objects(self, determine_wants, graph_walker, progress=None):
271
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
215
273
return self._git.fetch_objects(determine_wants, graph_walker, progress)
218
class GitRevisionTree(revisiontree.RevisionTree):
220
def __init__(self, repository, mapping, revision_id):
221
self._repository = repository
222
self.revision_id = revision_id
223
assert isinstance(revision_id, str)
224
self.mapping = mapping
225
git_id = repository.lookup_git_revid(revision_id, self.mapping)
227
commit = repository._git.commit(git_id)
229
raise errors.NoSuchRevision(repository, revision_id)
230
self.tree = commit.tree
231
self._inventory = inventory.Inventory(revision_id=revision_id)
232
self._inventory.root.revision = revision_id
233
self._build_inventory(self.tree, self._inventory.root, "")
235
def get_revision_id(self):
236
return self.revision_id
238
def get_file_text(self, file_id):
239
entry = self._inventory[file_id]
240
if entry.kind == 'directory': return ""
241
return self._repository._git.get_blob(entry.text_id).data
243
def _build_inventory(self, tree_id, ie, path):
244
assert isinstance(path, str)
245
tree = self._repository._git.tree(tree_id)
246
for mode, name, hexsha in tree.entries():
247
basename = name.decode("utf-8")
251
child_path = urlutils.join(path, name)
252
file_id = self.mapping.generate_file_id(child_path)
253
entry_kind = (mode & 0700000) / 0100000
255
child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
256
elif entry_kind == 1:
257
file_kind = (mode & 070000) / 010000
258
b = self._repository._git.get_blob(hexsha)
260
child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
261
child_ie.text_sha1 = osutils.sha_string(b.data)
263
child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
264
child_ie.text_sha1 = osutils.sha_string("")
266
raise AssertionError(
267
"Unknown file kind, perms=%o." % (mode,))
268
child_ie.text_id = b.id
269
child_ie.text_size = len(b.data)
271
raise AssertionError(
272
"Unknown blob kind, perms=%r." % (mode,))
273
fs_mode = mode & 0777
274
child_ie.executable = bool(fs_mode & 0111)
275
child_ie.revision = self.revision_id
276
self._inventory.add(child_ie)
278
self._build_inventory(hexsha, child_ie, child_path)
281
class GitFormat(object):
275
def _get_versioned_file_checker(self, text_key_references=None, ancestors=None):
276
return GitVersionedFileChecker(self,
277
text_key_references=text_key_references, ancestors=ancestors)
280
class GitVersionedFileChecker(repository._VersionedFileChecker):
284
def _check_file_version_parents(self, texts, progress_bar):
288
class GitRepositoryFormat(repository.RepositoryFormat):
289
"""Git repository format."""
283
291
supports_tree_reference = False
284
292
rich_root_data = True
293
supports_leaving_lock = False
295
supports_funky_characters = True
296
supports_external_lookups = False
297
supports_full_versioned_files = False
298
supports_revision_signatures = False
299
revision_graph_can_have_wrong_parents = False
302
def _matchingbzrdir(self):
303
from bzrlib.plugins.git.dir import LocalGitControlDirFormat
304
return LocalGitControlDirFormat()
286
306
def get_format_description(self):
287
307
return "Git Repository"
289
def initialize(self, url, shared=False, _internal=False):
290
raise bzr_errors.UninitializableFormat(self)
309
def initialize(self, controldir, shared=False, _internal=False):
310
from bzrlib.plugins.git.dir import GitDir
311
if not isinstance(controldir, GitDir):
312
raise errors.UninitializableFormat(self)
313
return controldir.open_repository()
292
315
def check_conversion_target(self, target_repo_format):
293
316
return target_repo_format.rich_root_data
318
def get_foreign_tests_repository_factory(self):
319
from bzrlib.plugins.git.tests.test_repository import (
320
ForeignTestsRepositoryFactory,
322
return ForeignTestsRepositoryFactory()
324
def network_name(self):
added
removed
repository.py
