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.94
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.94
- Committer: Jelmer Vernooij
- Date: 2008-08-23 13:12:10 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: jelmer@samba.org-20080823131210-lyc9ph2kyhxq5j8o
Eliminate (duplicate) git_ prefix.
- files added:
- tests/test_versionedfiles.py
- files removed:
- HACKING
- foreign
- notes
- files renamed:
- mapping.py => ids.py
- 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
20
23
import bzrlib
21
24
from bzrlib import (
25
deprecated_graph,
22
26
errors,
23
graph,
24
27
inventory,
25
28
osutils,
26
29
repository,
27
30
revision,
28
31
revisiontree,
29
ui,
30
32
urlutils,
31
)
32
from bzrlib.foreign import (
33
ForeignRepository,
34
)
35
from bzrlib.trace import (
36
mutter,
37
)
38
from bzrlib.transport import (
39
get_transport,
40
)
41
42
from bzrlib.plugins.git.foreign import (
43
versionedfiles,
44
)
45
from bzrlib.plugins.git.mapping import (
46
default_mapping,
47
inventory_to_tree_and_blobs,
48
mapping_registry,
49
revision_to_commit,
50
)
51
from bzrlib.plugins.git.versionedfiles import (
52
GitTexts,
53
)
54
55
import dulwich as git
56
import os
57
import time
58
59
60
class GitTags(object):
61
62
def __init__(self, tags):
63
self._tags = tags
64
65
def __iter__(self):
66
return iter(self._tags)
67
68
69
class GitRepository(ForeignRepository):
33
versionedfile,
34
)
35
from bzrlib.transport import get_transport
36
37
from bzrlib.plugins.git import (
38
ids,
39
versionedfiles
40
)
41
42
43
class GitRepository(repository.Repository):
70
44
"""An adapter to git repositories for bzr."""
71
45
72
46
_serializer = None
73
47
74
48
def __init__(self, gitdir, lockfiles):
75
ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
76
lockfiles)
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)
83
84
def is_shared(self):
85
return True
86
87
def supports_rich_root(self):
88
return True
89
90
def _warn_if_deprecated(self):
91
# This class isn't deprecated
92
pass
93
94
def get_mapping(self):
95
return default_mapping
96
97
def make_working_trees(self):
98
return True
99
100
101
class LocalGitRepository(GitRepository):
102
"""Git repository on the file system."""
103
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)
109
49
self.base = gitdir.root_transport.base
50
self.bzrdir = gitdir
51
self.control_files = lockfiles
110
52
self._git = gitdir._git
111
53
self.texts = None
112
54
self.signatures = versionedfiles.VirtualSignatureTexts(self)
113
55
self.revisions = versionedfiles.VirtualRevisionTexts(self)
114
self.inventories = versionedfiles.VirtualInventoryTexts(self)
115
self.texts = GitTexts(self)
116
self.tags = GitTags(self._git.get_tags())
56
self._format = GitFormat()
57
self._fallback_repositories = []
117
58
118
def all_revision_ids(self):
119
ret = set([revision.NULL_REVISION])
120
heads = self._git.heads()
121
if heads == {}:
122
return ret
123
bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
124
ret = set(bzr_heads)
125
graph = self.get_graph()
126
for rev, parents in graph.iter_ancestry(bzr_heads):
127
ret.add(rev)
59
def _all_revision_ids(self):
60
if self._git.heads == []:
61
return set()
62
ret = set()
63
skip = 0
64
max_count = 1000
65
cms = None
66
while cms != []:
67
cms = self._git.commits("--all", max_count=max_count, skip=skip)
68
skip += max_count
69
ret.update([ids.convert_revision_id_git_to_bzr(cm.id) for cm in cms])
128
70
return ret
129
71
72
def is_shared(self):
73
return True
74
75
def supports_rich_root(self):
76
return False
77
130
78
#def get_revision_delta(self, revision_id):
131
79
# parent_revid = self.get_revision(revision_id).parent_ids[0]
132
80
# diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
133
81
# ids.convert_revision_id_bzr_to_git(revision_id))
134
82
135
def _make_parents_provider(self):
136
"""See Repository._make_parents_provider()."""
137
return self._parents_provider
138
139
def get_parent_map(self, revids):
140
parent_map = {}
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] = ()
146
continue
147
hexsha, mapping = self.lookup_git_revid(revision_id)
148
commit = self._git.commit(hexsha)
149
if commit is None:
150
continue
151
else:
152
parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
153
return parent_map
154
155
def get_ancestry(self, revision_id, topo_sorted=True):
156
"""See Repository.get_ancestry().
157
"""
158
if revision_id is None:
159
return [None, revision.NULL_REVISION] + self._all_revision_ids()
160
assert isinstance(revision_id, str)
161
ancestry = []
162
graph = self.get_graph()
163
for rev, parents in graph.iter_ancestry([revision_id]):
164
ancestry.append(rev)
165
ancestry.reverse()
166
return [None] + ancestry
167
168
def import_revision_gist(self, source, revid, parent_lookup):
169
"""Import the gist of a revision into this Git repository.
170
171
"""
172
objects = []
173
rev = source.get_revision(revid)
174
for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
175
if path == "":
176
tree_sha = sha
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()
182
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
187
revidmap = {}
188
gitidmap = {}
189
def parent_lookup(revid):
190
try:
191
return gitidmap[revid]
192
except KeyError:
193
return self.lookup_git_revid(revid)[0]
194
todo = []
195
source.lock_write()
196
try:
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):
201
todo.append(revid)
202
pb = ui.ui_factory.nested_progress_bar()
203
try:
204
for i, revid in enumerate(todo):
205
pb.update("pushing revisions", i, len(todo))
206
git_commit = self.import_revision_gist(source, revid,
207
parent_lookup)
208
gitidmap[revid] = git_commit
209
git_revid = self.get_mapping().revision_id_foreign_to_bzr(
210
git_commit)
211
revidmap[revid] = git_revid
212
finally:
213
pb.finished()
214
source.fetch(self, revision_id=revidmap[stop_revision])
215
finally:
216
source.unlock()
217
return revidmap
83
def get_ancestry(self, revision_id):
84
revision_id = revision.ensure_null(revision_id)
85
ret = []
86
if revision_id != revision.NULL_REVISION:
87
skip = 0
88
max_count = 1000
89
cms = None
90
while cms != []:
91
cms = self._git.commits(ids.convert_revision_id_bzr_to_git(revision_id), max_count=max_count, skip=skip)
92
skip += max_count
93
ret += [ids.convert_revision_id_git_to_bzr(cm.id) for cm in cms]
94
return [None] + ret
218
95
219
96
def get_signature_text(self, revision_id):
220
97
raise errors.NoSuchRevision(self, revision_id)
221
98
222
def lookup_revision_id(self, revid):
223
"""Lookup a revision id.
224
225
:param revid: Bazaar revision id.
226
:return: Tuple with git revisionid and mapping.
227
"""
228
# Yes, this doesn't really work, but good enough as a stub
229
return osutils.sha(rev_id).hexdigest(), self.get_mapping()
230
231
99
def has_signature_for_revision_id(self, revision_id):
232
100
return False
233
101
234
def lookup_git_revid(self, bzr_revid):
235
try:
236
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
237
except errors.InvalidRevisionId:
238
raise errors.NoSuchRevision(self, bzr_revid)
102
def get_parent_map(self, revision_ids):
103
ret = {}
104
for revid in revision_ids:
105
if revid == revision.NULL_REVISION:
106
ret[revid] = ()
107
else:
108
commit = self._git.commit(ids.convert_revision_id_bzr_to_git(revid))
109
ret[revid] = tuple([ids.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
110
return ret
239
111
240
112
def get_revision(self, revision_id):
241
git_commit_id, mapping = self.lookup_git_revid(revision_id)
242
try:
243
commit = self._git.commit(git_commit_id)
244
except KeyError:
245
raise errors.NoSuchRevision(self, revision_id)
113
git_commit_id = ids.convert_revision_id_bzr_to_git(revision_id)
114
commit = self._git.commit(git_commit_id)
246
115
# print "fetched revision:", git_commit_id
247
revision = mapping.import_commit(commit)
248
assert revision is not None
116
revision = self._parse_rev(commit)
249
117
return revision
250
118
251
119
def has_revision(self, revision_id):
252
120
try:
253
121
self.get_revision(revision_id)
254
except errors.NoSuchRevision:
122
except NoSuchRevision:
255
123
return False
256
124
else:
257
125
return True
258
126
259
def get_revisions(self, revids):
260
return [self.get_revision(r) for r in revids]
127
def get_revisions(self, revisions):
128
return [self.get_revision(r) for r in revisions]
129
130
@classmethod
131
def _parse_rev(klass, commit):
132
"""Convert a git commit to a bzr revision.
133
134
:return: a `bzrlib.revision.Revision` object.
135
"""
136
rev = revision.Revision(ids.convert_revision_id_git_to_bzr(commit.id))
137
rev.parent_ids = tuple([ids.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
138
rev.inventory_sha1 = ""
139
rev.message = commit.message.decode("utf-8", "replace")
140
rev.committer = str(commit.committer)
141
rev.properties['author'] = str(commit.author)
142
rev.timestamp = time.mktime(commit.committed_date)
143
rev.timezone = 0
144
return rev
261
145
262
146
def revision_trees(self, revids):
263
147
for revid in revids:
265
149
266
150
def revision_tree(self, revision_id):
267
151
revision_id = revision.ensure_null(revision_id)
152
268
153
if revision_id == revision.NULL_REVISION:
269
154
inv = inventory.Inventory(root_id=None)
270
155
inv.revision_id = revision_id
271
156
return revisiontree.RevisionTree(self, inv, revision_id)
157
272
158
return GitRevisionTree(self, revision_id)
273
159
274
160
def get_inventory(self, revision_id):
275
161
assert revision_id != None
276
162
return self.revision_tree(revision_id).inventory
277
163
278
def set_make_working_trees(self, trees):
279
pass
280
281
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
282
progress=None):
283
return self._git.fetch_objects(determine_wants, graph_walker, progress)
164
165
def escape_file_id(file_id):
166
return file_id.replace('_', '__').replace(' ', '_s')
167
168
169
def unescape_file_id(file_id):
170
return file_id.replace("_s", " ").replace("__", "_")
284
171
285
172
286
173
class GitRevisionTree(revisiontree.RevisionTree):
287
174
288
175
def __init__(self, repository, revision_id):
289
176
self._repository = repository
290
self._revision_id = revision_id
291
assert isinstance(revision_id, str)
292
git_id, self.mapping = repository.lookup_git_revid(revision_id)
293
try:
294
commit = repository._git.commit(git_id)
295
except KeyError, r:
296
raise errors.NoSuchRevision(repository, revision_id)
297
self.tree = commit.tree
177
self.revision_id = revision_id
178
git_id = ids.convert_revision_id_bzr_to_git(revision_id)
179
self.tree = repository._git.commit(git_id).tree
298
180
self._inventory = inventory.Inventory(revision_id=revision_id)
299
181
self._inventory.root.revision = revision_id
300
182
self._build_inventory(self.tree, self._inventory.root, "")
301
183
302
184
def get_revision_id(self):
303
return self._revision_id
185
return self.revision_id
304
186
305
187
def get_file_text(self, file_id):
306
188
entry = self._inventory[file_id]
307
189
if entry.kind == 'directory': return ""
308
return self._repository._git.get_blob(entry.text_id).data
190
return self._repository._git.blob(entry.text_id).data
309
191
310
def _build_inventory(self, tree_id, ie, path):
192
def _build_inventory(self, tree, ie, path):
311
193
assert isinstance(path, str)
312
tree = self._repository._git.tree(tree_id)
313
for mode, name, hexsha in tree.entries():
314
basename = name.decode("utf-8")
194
for b in tree.contents:
195
basename = b.name.decode("utf-8")
315
196
if path == "":
316
child_path = name
197
child_path = b.name
317
198
else:
318
child_path = urlutils.join(path, name)
319
file_id = self.mapping.generate_file_id(child_path)
320
entry_kind = (mode & 0700000) / 0100000
321
if entry_kind == 0:
199
child_path = urlutils.join(path, b.name)
200
file_id = escape_file_id(child_path.encode('utf-8'))
201
if b.mode[0] == '0':
322
202
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)
326
if file_kind == 0:
203
elif b.mode[0] == '1':
204
if b.mode[1] == '0':
327
205
child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
328
206
child_ie.text_sha1 = osutils.sha_string(b.data)
329
elif file_kind == 2:
207
elif b.mode[1] == '2':
330
208
child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
331
child_ie.symlink_target = b.data
332
209
child_ie.text_sha1 = osutils.sha_string("")
333
210
else:
334
211
raise AssertionError(
335
"Unknown file kind, perms=%o." % (mode,))
212
"Unknown file kind, perms=%r." % (b.mode,))
336
213
child_ie.text_id = b.id
337
child_ie.text_size = len(b.data)
214
child_ie.text_size = b.size
338
215
else:
339
216
raise AssertionError(
340
"Unknown blob kind, perms=%r." % (mode,))
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
217
"Unknown blob kind, perms=%r." % (b.mode,))
218
child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
219
child_ie.revision = self.revision_id
346
220
self._inventory.add(child_ie)
347
if entry_kind == 0:
348
self._build_inventory(hexsha, child_ie, child_path)
349
350
351
class GitRepositoryFormat(repository.RepositoryFormat):
221
if b.mode[0] == '0':
222
self._build_inventory(b, child_ie, child_path)
223
224
225
class GitFormat(object):
352
226
353
227
supports_tree_reference = False
354
rich_root_data = True
355
228
356
229
def get_format_description(self):
357
230
return "Git Repository"
358
359
def initialize(self, url, shared=False, _internal=False):
360
raise bzr_errors.UninitializableFormat(self)
361
362
def check_conversion_target(self, target_repo_format):
363
return target_repo_format.rich_root_data
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0