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