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 git_repository.py
- browse files at revision 0.200.27
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.27
- Committer: David Allouche
- Date: 2007-12-26 20:13:49 UTC
- mto: (0.312.1 master) (6883.23.1 bundle-git)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: ddaa@canonical.com-20071226201349-qfqrmksu8pw2kpo1
Flat is better than nested, remove the gitlib hierarchy.
- files added:
- INSTALL
- files removed:
- HACKING
- notes
- files renamed:
- branch.py => git_branch.py
- dir.py => git_dir.py
- repository.py => git_repository.py
- mapping.py => ids.py
- tests/test_branch.py => tests/test_git_branch.py
- tests/test_dir.py => tests/test_git_dir.py
- tests/test_repository.py => tests/test_git_repository.py
- tests/test_mapping.py => tests/test_ids.py
- files modified:
- .bzrignore
added
removed
git_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
18
17
"""An adapter between a Git Repository and a Bazaar Branch"""
19
18
20
19
from bzrlib import (
21
errors,
22
inventory,
20
deprecated_graph,
23
21
repository,
24
revision,
25
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):
22
urlutils,
23
)
24
25
from bzrlib.plugins.git import (
26
ids,
27
model,
28
)
29
30
31
class GitRepository(repository.Repository):
54
32
"""An adapter to git repositories for bzr."""
55
33
56
_serializer = None
57
_commit_builder_class = GitCommitBuilder
58
vcs = foreign_git
59
60
34
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)
35
self.bzrdir = gitdir
36
self.control_files = lockfiles
37
gitdirectory = gitdir.transport.local_abspath('.')
38
self._git = model.GitModel(gitdirectory)
39
self._revision_cache = {}
40
41
def _ancestor_revisions(self, revision_ids):
42
if revision_ids is not None:
43
git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
44
else:
45
git_revisions = None
46
for lines in self._git.ancestor_lines(git_revisions):
47
yield self.parse_rev(lines)
70
48
71
49
def is_shared(self):
72
return False
73
74
def supports_rich_root(self):
75
50
return True
76
51
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
return False
89
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
154
155
def get_signature_text(self, revision_id):
156
raise errors.NoSuchRevision(self, revision_id)
157
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
52
def get_revision_graph(self, revision_id=None):
53
result = {}
54
if revision_id is not None:
55
param = [ids.convert_revision_id_bzr_to_git(revision_id)]
179
56
else:
180
return rev.revision_id
181
182
def has_signature_for_revision_id(self, revision_id):
183
return False
184
185
def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
186
try:
187
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
188
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)
57
param = None
58
for node, parents in self._git.ancestry(param).iteritems():
59
bzr_node = ids.convert_revision_id_git_to_bzr(node)
60
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
61
for n in parents]
62
result[bzr_node] = bzr_parents
63
return result
64
65
def get_revision_graph_with_ghosts(self, revision_ids=None):
66
graph = deprecated_graph.Graph()
67
if revision_ids is not None:
68
revision_ids = [ids.convert_revision_id_bzr_to_git(r)
69
for r in revision_ids]
70
for node, parents in self._git.ancestry(revision_ids).iteritems():
71
bzr_node = ids.convert_revision_id_git_to_bzr(node)
72
bzr_parents = [ids.convert_revision_id_git_to_bzr(n)
73
for n in parents]
74
75
graph.add_node(bzr_node, bzr_parents)
76
return graph
205
77
206
78
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
218
return revision
79
if revision_id in self._revision_cache:
80
return self._revision_cache[revision_id]
81
raw = self._git.rev_list([gitrevid_from_bzr(revision_id)], max_count=1,
82
header=True)
83
return self.parse_rev(raw)
219
84
220
85
def has_revision(self, revision_id):
221
86
try:
222
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
223
except errors.NoSuchRevision:
87
self.get_revision(revision_id)
88
except NoSuchRevision:
224
89
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]
90
else:
91
return True
92
93
def get_revisions(self, revisions):
94
return [self.get_revision(r) for r in revisions]
95
96
def parse_rev(self, raw):
97
# first field is the rev itself.
98
# then its 'field value'
99
# until the EOF??
100
parents = []
101
log = []
102
in_log = False
103
committer = None
104
revision_id = bzrrevid_from_git(raw[0][:-1])
105
for field in raw[1:]:
106
#if field.startswith('author '):
107
# committer = field[7:]
108
if field.startswith('parent '):
109
parents.append(bzrrevid_from_git(field.split()[1]))
110
elif field.startswith('committer '):
111
commit_fields = field.split()
112
if committer is None:
113
committer = ' '.join(commit_fields[1:-3])
114
timestamp = commit_fields[-2]
115
timezone = commit_fields[-1]
116
elif field.startswith('tree '):
117
tree_id = field.split()[1]
118
elif in_log:
119
log.append(field[4:])
120
elif field == '\n':
121
in_log = True
122
123
log = ''.join(log)
124
result = Revision(revision_id)
125
result.parent_ids = parents
126
result.message = log
127
result.inventory_sha1 = ""
128
result.timezone = timezone and int(timezone)
129
result.timestamp = float(timestamp)
130
result.committer = committer
131
result.properties['git-tree-id'] = tree_id
132
return result
232
133
233
134
def revision_trees(self, revids):
234
135
for revid in revids:
235
136
yield self.revision_tree(revid)
236
137
237
138
def revision_tree(self, revision_id):
238
revision_id = revision.ensure_null(revision_id)
239
if revision_id == revision.NULL_REVISION:
240
inv = inventory.Inventory(root_id=None)
241
inv.revision_id = revision_id
242
return revisiontree.RevisionTree(self, inv, revision_id)
243
139
return GitRevisionTree(self, revision_id)
244
140
245
141
def get_inventory(self, revision_id):
246
assert revision_id != None
247
return self.revision_tree(revision_id).inventory
248
249
def set_make_working_trees(self, trees):
250
pass
251
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."""
272
273
supports_tree_reference = False
274
rich_root_data = True
275
276
def get_format_description(self):
277
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"
142
revision = self.get_revision(revision_id)
143
inventory = GitInventory(revision_id)
144
tree_id = revision.properties['git-tree-id']
145
type_map = {'blob': 'file', 'tree': 'directory' }
146
def get_inventory(tree_id, prefix):
147
for perms, type, obj_id, name in self._git.get_inventory(tree_id):
148
full_path = prefix + name
149
if type == 'blob':
150
text_sha1 = obj_id
151
else:
152
text_sha1 = None
153
executable = (perms[-3] in ('1', '3', '5', '7'))
154
entry = GitEntry(full_path, type_map[type], revision_id,
155
text_sha1, executable)
156
inventory.entries[full_path] = entry
157
if type == 'tree':
158
get_inventory(obj_id, full_path+'/')
159
get_inventory(tree_id, '')
160
return inventory
161
162
163
class GitRevisionTree(object):
164
165
def __init__(self, repository, revision_id):
166
self.repository = repository
167
self.revision_id = revision_id
168
self.inventory = repository.get_inventory(revision_id)
169
170
def get_file(self, file_id):
171
return iterablefile.IterableFile(self.get_file_lines(file_id))
172
173
def get_file_lines(self, file_id):
174
obj_id = self.inventory[file_id].text_sha1
175
return self.repository._git.cat_file('blob', obj_id)
176
177
def is_executable(self, file_id):
178
return self.inventory[file_id].executable
179
180
181
class GitInventory(object):
182
183
def __init__(self, revision_id):
184
self.entries = {}
185
self.root = GitEntry('', 'directory', revision_id)
186
self.entries[''] = self.root
187
188
def __getitem__(self, key):
189
return self.entries[key]
190
191
def iter_entries(self):
192
return iter(sorted(self.entries.items()))
193
194
def iter_entries_by_dir(self):
195
return self.iter_entries()
196
197
def __len__(self):
198
return len(self.entries)
199
200
201
class GitEntry(object):
202
203
def __init__(self, path, kind, revision, text_sha1=None, executable=False,
204
text_size=None):
205
self.path = path
206
self.file_id = path
207
self.kind = kind
208
self.executable = executable
209
self.name = osutils.basename(path)
210
if path == '':
211
self.parent_id = None
212
else:
213
self.parent_id = osutils.dirname(path)
214
self.revision = revision
215
self.symlink_target = None
216
self.text_sha1 = text_sha1
217
self.text_size = None
218
219
def __repr__(self):
220
return "GitEntry(%r, %r, %r, %r)" % (self.path, self.kind,
221
self.revision, self.parent_id)
222
223
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0