18
17
"""An adapter between a Git Repository and a Bazaar Branch"""
20
23
from bzrlib import (
27
34
from bzrlib.foreign import (
37
from bzrlib.transport import get_transport
39
from bzrlib.plugins.git.foreign import (
31
from bzrlib.plugins.git.commit import (
34
from bzrlib.plugins.git.mapping import (
39
from bzrlib.plugins.git.tree import (
42
from bzrlib.plugins.git.versionedfiles import (
48
from dulwich.objects 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)
53
57
class GitRepository(ForeignRepository):
54
58
"""An adapter to git repositories for bzr."""
57
_commit_builder_class = GitCommitBuilder
60
62
def __init__(self, gitdir, lockfiles):
61
ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
63
from bzrlib.plugins.git import fetch, push
64
for optimiser in [fetch.InterRemoteGitNonGitRepository,
65
fetch.InterLocalGitNonGitRepository,
66
fetch.InterGitGitRepository,
67
push.InterToLocalGitRepository,
68
push.InterToRemoteGitRepository]:
69
repository.InterRepository.register_optimiser(optimiser)
63
self.base = gitdir.root_transport.base
65
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())
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])
71
87
def is_shared(self):
74
90
def supports_rich_root(self):
77
def _warn_if_deprecated(self, branch=None):
78
# This class isn't deprecated
81
def get_mapping(self):
82
return default_mapping
84
def make_working_trees(self):
85
return not self._git.bare
87
def revision_graph_can_have_wrong_parents(self):
90
def dfetch(self, source, stop_revision):
91
interrepo = repository.InterRepository.get(source, self)
92
return interrepo.dfetch(stop_revision)
95
class LocalGitRepository(GitRepository):
96
"""Git repository on the file system."""
98
def __init__(self, gitdir, lockfiles):
99
GitRepository.__init__(self, gitdir, lockfiles)
100
self.base = gitdir.root_transport.base
101
self._git = gitdir._git
102
self.signatures = None
103
self.revisions = GitRevisions(self, self._git.object_store)
104
self.inventories = None
105
self.texts = GitTexts(self)
107
def _iter_revision_ids(self):
108
mapping = self.get_mapping()
109
for sha in self._git.object_store:
110
o = self._git.object_store[sha]
111
if not isinstance(o, Commit):
113
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
114
self.lookup_foreign_revision_id)
115
yield o.id, rev.revision_id, roundtrip_revid
117
def all_revision_ids(self):
119
for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
122
ret.add(roundtrip_revid)
125
def get_parent_map(self, revids):
127
for revision_id in revids:
128
assert isinstance(revision_id, str)
129
if revision_id == revision.NULL_REVISION:
130
parent_map[revision_id] = ()
132
hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
134
commit = self._git[hexsha]
137
parent_map[revision_id] = [
138
self.lookup_foreign_revision_id(p, mapping)
139
for p in commit.parents]
142
def get_ancestry(self, revision_id, topo_sorted=True):
143
"""See Repository.get_ancestry().
145
if revision_id is None:
146
return [None, revision.NULL_REVISION] + self._all_revision_ids()
147
assert isinstance(revision_id, str)
149
graph = self.get_graph()
150
for rev, parents in graph.iter_ancestry([revision_id]):
153
return [None] + ancestry
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]
155
111
def get_signature_text(self, revision_id):
156
112
raise errors.NoSuchRevision(self, revision_id)
158
def pack(self, hint=None, clean_obsolete_packs=False):
159
self._git.object_store.pack_loose_objects()
161
def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
114
def lookup_revision_id(self, revid):
162
115
"""Lookup a revision id.
117
:param revid: Bazaar revision id.
118
:return: Tuple with git revisionid and mapping.
165
assert type(foreign_revid) is str
167
mapping = self.get_mapping()
168
from dulwich.protocol import (
171
if foreign_revid == ZERO_SHA:
172
return revision.NULL_REVISION
173
commit = self._git[foreign_revid]
174
rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
176
# FIXME: check testament before doing this?
178
return roundtrip_revid
180
return rev.revision_id
120
# Yes, this doesn't really work, but good enough as a stub
121
return osutils.sha(rev_id).hexdigest(), self.get_mapping()
182
123
def has_signature_for_revision_id(self, revision_id):
185
def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
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):
187
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
142
return mapping.revision_id_bzr_to_foreign(bzr_revid)
188
143
except errors.InvalidRevisionId:
190
mapping = self.get_mapping()
192
return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
195
# Update refs from Git commit objects
196
# FIXME: Hitting this a lot will be very inefficient...
197
for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
198
if not roundtrip_revid:
200
refname = mapping.revid_as_refname(roundtrip_revid)
201
self._git.refs[refname] = git_sha
202
if roundtrip_revid == bzr_revid:
203
return git_sha, mapping
204
raise errors.NoSuchRevision(self, bzr_revid)
144
raise errors.NoSuchRevision(bzr_revid, self)
206
146
def get_revision(self, revision_id):
207
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
209
commit = self._git[git_commit_id]
211
raise errors.NoSuchRevision(self, revision_id)
212
revision, roundtrip_revid, verifiers = mapping.import_commit(
213
commit, self.lookup_foreign_revision_id)
214
assert revision is not None
215
# FIXME: check verifiers ?
217
revision.revision_id = roundtrip_revid
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())
220
153
def has_revision(self, revision_id):
222
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
223
except errors.NoSuchRevision:
155
self.get_revision(revision_id)
156
except NoSuchRevision:
225
return (git_commit_id in self._git)
227
def has_revisions(self, revision_ids):
228
return set(filter(self.has_revision, revision_ids))
230
def get_revisions(self, revids):
231
return [self.get_revision(r) for r in revids]
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)
233
181
def revision_trees(self, revids):
234
182
for revid in revids:
249
199
def set_make_working_trees(self, trees):
252
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
254
return self._git.fetch_objects(determine_wants, graph_walker, progress)
256
def _get_versioned_file_checker(self, text_key_references=None,
258
return GitVersionedFileChecker(self,
259
text_key_references=text_key_references, ancestors=ancestors)
262
class GitVersionedFileChecker(repository._VersionedFileChecker):
266
def _check_file_version_parents(self, texts, progress_bar):
270
class GitRepositoryFormat(repository.RepositoryFormat):
271
"""Git repository format."""
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("__", "_")
211
class GitRevisionTree(revisiontree.RevisionTree):
213
def __init__(self, repository, revision_id):
214
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):
273
265
supports_tree_reference = False
274
rich_root_data = True
276
267
def get_format_description(self):
277
268
return "Git Repository"
279
def initialize(self, url, shared=False, _internal=False):
280
raise errors.UninitializableFormat(self)
282
def check_conversion_target(self, target_repo_format):
283
return target_repo_format.rich_root_data
285
def get_foreign_tests_repository_factory(self):
286
from bzrlib.plugins.git.tests.test_repository import (
287
ForeignTestsRepositoryFactory,
289
return ForeignTestsRepositoryFactory()
291
def network_name(self):
added
removed
repository.py
