To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to repository.py
- browse files at revision 0.200.114
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.114
- Committer: Jelmer Vernooij
- Date: 2008-11-25 03:35:52 UTC
- mfrom: (0.208.8 trunk)
- mto: (0.312.1 master) (6883.23.1 bundle-git)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: jelmer@samba.org-20081125033552-pcdinr6qqxcuhd1c
Fix reporting of git commits in 'bzr log'.
- files added:
- foreign
- files removed:
- HACKING
- notes
- files renamed:
- tests/test_mapping.py => tests/test_ids.py
- files modified:
- .bzrignore
added
removed
repository.py
1
1
# Copyright (C) 2007 Canonical Ltd
2
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
17
16
18
17
"""An adapter between a Git Repository and a Bazaar Branch"""
19
18
19
import git
20
import os
21
import time
22
23
import bzrlib
20
24
from bzrlib import (
25
deprecated_graph,
21
26
errors,
27
foreign,
22
28
inventory,
29
osutils,
23
30
repository,
24
31
revision,
25
32
revisiontree,
26
)
27
from bzrlib.foreign import (
28
ForeignRepository,
29
)
30
31
from bzrlib.plugins.git.commit import (
32
GitCommitBuilder,
33
)
34
from bzrlib.plugins.git.mapping import (
35
default_mapping,
36
foreign_git,
37
mapping_registry,
38
)
39
from bzrlib.plugins.git.tree import (
40
GitRevisionTree,
41
)
42
from bzrlib.plugins.git.versionedfiles import (
43
GitRevisions,
44
GitTexts,
45
)
46
47
48
from dulwich.objects import (
49
Commit,
50
)
51
52
53
class GitRepository(ForeignRepository):
33
urlutils,
34
versionedfile,
35
)
36
from bzrlib.transport import get_transport
37
38
from bzrlib.plugins.git.foreign import (
39
versionedfiles,
40
)
41
from bzrlib.plugins.git.mapping import default_mapping
42
43
44
class GitRepository(repository.Repository):
54
45
"""An adapter to git repositories for bzr."""
55
46
56
47
_serializer = None
57
_commit_builder_class = GitCommitBuilder
58
vcs = foreign_git
59
48
60
49
def __init__(self, gitdir, lockfiles):
61
ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
62
lockfiles)
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)
50
self.base = gitdir.root_transport.base
51
self.bzrdir = gitdir
52
self.control_files = lockfiles
53
self._git = gitdir._git
54
self.texts = None
55
self.signatures = versionedfiles.VirtualSignatureTexts(self)
56
self.revisions = versionedfiles.VirtualRevisionTexts(self)
57
self._format = GitFormat()
58
self._fallback_repositories = []
59
60
def _all_revision_ids(self):
61
if self._git.heads == []:
62
return set()
63
ret = set()
64
skip = 0
65
max_count = 1000
66
cms = None
67
while cms != []:
68
cms = self._git.commits("--all", max_count=max_count, skip=skip)
69
skip += max_count
70
ret.update([default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms])
71
return ret
70
72
71
73
def is_shared(self):
72
return False
74
return True
73
75
74
76
def supports_rich_root(self):
75
return True
76
77
def _warn_if_deprecated(self, branch=None):
78
# This class isn't deprecated
79
pass
80
81
def get_mapping(self):
82
return default_mapping
83
84
def make_working_trees(self):
85
return not self._git.bare
86
87
def revision_graph_can_have_wrong_parents(self):
88
77
return False
89
78
90
def dfetch(self, source, stop_revision):
91
interrepo = repository.InterRepository.get(source, self)
92
return interrepo.dfetch(stop_revision)
93
94
95
class LocalGitRepository(GitRepository):
96
"""Git repository on the file system."""
97
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)
106
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):
112
continue
113
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
114
self.lookup_foreign_revision_id)
115
yield o.id, rev.revision_id, roundtrip_revid
116
117
def all_revision_ids(self):
118
ret = set([])
119
for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
120
ret.add(revid)
121
if roundtrip_revid:
122
ret.add(roundtrip_revid)
123
return ret
124
125
def get_parent_map(self, revids):
126
parent_map = {}
127
for revision_id in revids:
128
assert isinstance(revision_id, str)
129
if revision_id == revision.NULL_REVISION:
130
parent_map[revision_id] = ()
131
continue
132
hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
133
try:
134
commit = self._git[hexsha]
135
except KeyError:
136
continue
137
parent_map[revision_id] = [
138
self.lookup_foreign_revision_id(p, mapping)
139
for p in commit.parents]
140
return parent_map
141
142
def get_ancestry(self, revision_id, topo_sorted=True):
143
"""See Repository.get_ancestry().
144
"""
145
if revision_id is None:
146
return [None, revision.NULL_REVISION] + self._all_revision_ids()
147
assert isinstance(revision_id, str)
148
ancestry = []
149
graph = self.get_graph()
150
for rev, parents in graph.iter_ancestry([revision_id]):
151
ancestry.append(rev)
152
ancestry.reverse()
153
return [None] + ancestry
79
#def get_revision_delta(self, revision_id):
80
# parent_revid = self.get_revision(revision_id).parent_ids[0]
81
# diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
82
# ids.convert_revision_id_bzr_to_git(revision_id))
83
84
def get_ancestry(self, revision_id):
85
revision_id = revision.ensure_null(revision_id)
86
ret = []
87
if revision_id != revision.NULL_REVISION:
88
skip = 0
89
max_count = 1000
90
cms = None
91
while cms != []:
92
cms = self._git.commits(self.lookup_git_revid(revision_id, default_mapping), max_count=max_count, skip=skip)
93
skip += max_count
94
ret += [default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms]
95
return [None] + ret
154
96
155
97
def get_signature_text(self, revision_id):
156
98
raise errors.NoSuchRevision(self, revision_id)
157
99
158
def pack(self, hint=None, clean_obsolete_packs=False):
159
self._git.object_store.pack_loose_objects()
160
161
def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
162
"""Lookup a revision id.
163
164
"""
165
assert type(foreign_revid) is str
166
if mapping is None:
167
mapping = self.get_mapping()
168
from dulwich.protocol import (
169
ZERO_SHA,
170
)
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,
175
lambda x: None)
176
# FIXME: check testament before doing this?
177
if roundtrip_revid:
178
return roundtrip_revid
179
else:
180
return rev.revision_id
181
182
100
def has_signature_for_revision_id(self, revision_id):
183
101
return False
184
102
185
def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
103
def get_parent_map(self, revision_ids):
104
ret = {}
105
for revid in revision_ids:
106
if revid == revision.NULL_REVISION:
107
ret[revid] = ()
108
else:
109
commit = self._git.commit(self.lookup_git_revid(revid, default_mapping))
110
ret[revid] = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
111
return ret
112
113
def lookup_git_revid(self, bzr_revid, mapping):
186
114
try:
187
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
115
return mapping.revision_id_bzr_to_foreign(bzr_revid)
188
116
except errors.InvalidRevisionId:
189
if mapping is None:
190
mapping = self.get_mapping()
191
try:
192
return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
193
mapping)
194
except KeyError:
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:
199
continue
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)
117
raise errors.NoSuchRevision(bzr_revid, self)
205
118
206
119
def get_revision(self, revision_id):
207
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
208
try:
209
commit = self._git[git_commit_id]
210
except KeyError:
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 ?
216
if roundtrip_revid:
217
revision.revision_id = roundtrip_revid
120
git_commit_id = self.lookup_git_revid(revision_id, default_mapping)
121
commit = self._git.commit(git_commit_id)
122
# print "fetched revision:", git_commit_id
123
revision = self._parse_rev(commit)
218
124
return revision
219
125
220
126
def has_revision(self, revision_id):
221
127
try:
222
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
223
except errors.NoSuchRevision:
128
self.get_revision(revision_id)
129
except NoSuchRevision:
224
130
return False
225
return (git_commit_id in self._git)
226
227
def has_revisions(self, revision_ids):
228
return set(filter(self.has_revision, revision_ids))
229
230
def get_revisions(self, revids):
231
return [self.get_revision(r) for r in revids]
131
else:
132
return True
133
134
def get_revisions(self, revisions):
135
return [self.get_revision(r) for r in revisions]
136
137
@classmethod
138
def _parse_rev(klass, commit):
139
"""Convert a git commit to a bzr revision.
140
141
:return: a `bzrlib.revision.Revision` object.
142
"""
143
rev = foreign.ForeignRevision(commit.id, default_mapping, default_mapping.revision_id_foreign_to_bzr(commit.id))
144
rev.parent_ids = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
145
rev.inventory_sha1 = ""
146
rev.message = commit.message.decode("utf-8", "replace")
147
rev.committer = str(commit.committer).decode("utf-8", "replace")
148
rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
149
rev.timestamp = time.mktime(commit.committed_date)
150
rev.timezone = 0
151
return rev
232
152
233
153
def revision_trees(self, revids):
234
154
for revid in revids:
236
156
237
157
def revision_tree(self, revision_id):
238
158
revision_id = revision.ensure_null(revision_id)
159
239
160
if revision_id == revision.NULL_REVISION:
240
161
inv = inventory.Inventory(root_id=None)
241
162
inv.revision_id = revision_id
242
163
return revisiontree.RevisionTree(self, inv, revision_id)
164
243
165
return GitRevisionTree(self, revision_id)
244
166
245
167
def get_inventory(self, revision_id):
249
171
def set_make_working_trees(self, trees):
250
172
pass
251
173
252
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
253
progress=None):
254
return self._git.fetch_objects(determine_wants, graph_walker, progress)
255
256
def _get_versioned_file_checker(self, text_key_references=None,
257
ancestors=None):
258
return GitVersionedFileChecker(self,
259
text_key_references=text_key_references, ancestors=ancestors)
260
261
262
class GitVersionedFileChecker(repository._VersionedFileChecker):
263
264
file_ids = []
265
266
def _check_file_version_parents(self, texts, progress_bar):
267
return {}, []
268
269
270
class GitRepositoryFormat(repository.RepositoryFormat):
271
"""Git repository format."""
174
175
def escape_file_id(file_id):
176
return file_id.replace('_', '__').replace(' ', '_s')
177
178
179
def unescape_file_id(file_id):
180
return file_id.replace("_s", " ").replace("__", "_")
181
182
183
class GitRevisionTree(revisiontree.RevisionTree):
184
185
def __init__(self, repository, revision_id):
186
self._repository = repository
187
self.revision_id = revision_id
188
git_id = repository.lookup_git_revid(revision_id, default_mapping)
189
self.tree = repository._git.commit(git_id).tree
190
self._inventory = inventory.Inventory(revision_id=revision_id)
191
self._inventory.root.revision = revision_id
192
self._build_inventory(self.tree, self._inventory.root, "")
193
194
def get_revision_id(self):
195
return self.revision_id
196
197
def get_file_text(self, file_id):
198
entry = self._inventory[file_id]
199
if entry.kind == 'directory': return ""
200
return self._repository._git.blob(entry.text_id).data
201
202
def _build_inventory(self, tree, ie, path):
203
assert isinstance(path, str)
204
for key in tree:
205
b = tree.get(key)
206
basename = b.name.decode("utf-8")
207
if path == "":
208
child_path = b.name
209
else:
210
child_path = urlutils.join(path, b.name)
211
file_id = escape_file_id(child_path.encode('utf-8'))
212
if b.mode[0] == '0':
213
child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
214
elif b.mode[0] == '1':
215
if b.mode[1] == '0':
216
child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
217
child_ie.text_sha1 = osutils.sha_string(b.data)
218
elif b.mode[1] == '2':
219
child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
220
child_ie.text_sha1 = osutils.sha_string("")
221
else:
222
raise AssertionError(
223
"Unknown file kind, perms=%r." % (b.mode,))
224
child_ie.text_id = b.id
225
child_ie.text_size = b.size
226
else:
227
raise AssertionError(
228
"Unknown blob kind, perms=%r." % (b.mode,))
229
child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
230
child_ie.revision = self.revision_id
231
self._inventory.add(child_ie)
232
if b.mode[0] == '0':
233
self._build_inventory(b, child_ie, child_path)
234
235
236
class GitFormat(object):
272
237
273
238
supports_tree_reference = False
274
rich_root_data = True
275
239
276
240
def get_format_description(self):
277
241
return "Git Repository"
278
279
def initialize(self, url, shared=False, _internal=False):
280
raise errors.UninitializableFormat(self)
281
282
def check_conversion_target(self, target_repo_format):
283
return target_repo_format.rich_root_data
284
285
def get_foreign_tests_repository_factory(self):
286
from bzrlib.plugins.git.tests.test_repository import (
287
ForeignTestsRepositoryFactory,
288
)
289
return ForeignTestsRepositoryFactory()
290
291
def network_name(self):
292
return "git"
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0