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.98
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.98
- Committer: Jelmer Vernooij
- Date: 2008-08-23 17:46:07 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-20080823174607-ykdz37b3ike35cvk
Remove unused import.
- files added:
- tests/test_versionedfiles.py
- 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
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.commit import (
43
GitCommitBuilder,
44
)
45
from bzrlib.plugins.git.inventory import (
46
GitInventory,
47
)
48
from bzrlib.plugins.git.mapping import (
49
default_mapping,
50
foreign_git,
51
mapping_registry,
52
)
53
from bzrlib.plugins.git.versionedfiles import (
54
GitRevisions,
55
GitTexts,
56
)
57
58
59
class GitRepository(ForeignRepository):
33
versionedfile,
34
)
35
from bzrlib.transport import get_transport
36
37
from bzrlib.plugins.git import (
38
versionedfiles
39
)
40
from bzrlib.plugins.git.mapping import default_mapping
41
42
43
class GitRepository(repository.Repository):
60
44
"""An adapter to git repositories for bzr."""
61
45
62
46
_serializer = None
63
_commit_builder_class = GitCommitBuilder
64
vcs = foreign_git
65
66
def __init__(self, gitdir, lockfiles):
67
ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
68
lockfiles)
69
from bzrlib.plugins.git import fetch, push
70
for optimiser in [fetch.InterRemoteGitNonGitRepository,
71
fetch.InterLocalGitNonGitRepository,
72
fetch.InterGitGitRepository,
73
push.InterToLocalGitRepository,
74
push.InterToRemoteGitRepository]:
75
repository.InterRepository.register_optimiser(optimiser)
76
77
def is_shared(self):
78
return True
79
80
def supports_rich_root(self):
81
return True
82
83
def _warn_if_deprecated(self):
84
# This class isn't deprecated
85
pass
86
87
def get_mapping(self):
88
return default_mapping
89
90
def make_working_trees(self):
91
return True
92
93
def revision_graph_can_have_wrong_parents(self):
94
return False
95
96
def dfetch(self, source, stop_revision):
97
interrepo = repository.InterRepository.get(source, self)
98
return interrepo.dfetch(stop_revision)
99
100
def dfetch_refs(self, source, stop_revision):
101
interrepo = repository.InterRepository.get(source, self)
102
return interrepo.dfetch_refs(stop_revision)
103
104
105
class LocalGitRepository(GitRepository):
106
"""Git repository on the file system."""
107
108
def __init__(self, gitdir, lockfiles):
109
# FIXME: This also caches negatives. Need to be more careful
110
# about this once we start writing to git
111
self._parents_provider = graph.CachingParentsProvider(self)
112
GitRepository.__init__(self, gitdir, lockfiles)
47
48
def __init__(self, gitdir, lockfiles):
113
49
self.base = gitdir.root_transport.base
50
self.bzrdir = gitdir
51
self.control_files = lockfiles
114
52
self._git = gitdir._git
115
53
self.texts = None
116
self.signatures = None
117
self.revisions = GitRevisions(self._git.object_store)
118
self.inventories = None
119
self.texts = GitTexts(self)
54
self.signatures = versionedfiles.VirtualSignatureTexts(self)
55
self.revisions = versionedfiles.VirtualRevisionTexts(self)
56
self._format = GitFormat()
57
self._fallback_repositories = []
120
58
121
def all_revision_ids(self):
122
ret = set([revision.NULL_REVISION])
123
heads = self._git.refs.as_dict('refs/heads')
124
if heads == {}:
125
return ret
126
bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
127
ret = set(bzr_heads)
128
graph = self.get_graph()
129
for rev, parents in graph.iter_ancestry(bzr_heads):
130
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([default_mapping.convert_revision_id_git_to_bzr(cm.id) for cm in cms])
131
70
return ret
132
71
133
def _make_parents_provider(self):
134
"""See Repository._make_parents_provider()."""
135
return self._parents_provider
136
137
def get_parent_map(self, revids):
138
parent_map = {}
139
for revision_id in revids:
140
assert isinstance(revision_id, str)
141
if revision_id == revision.NULL_REVISION:
142
parent_map[revision_id] = ()
143
continue
144
hexsha, mapping = self.lookup_git_revid(revision_id)
145
commit = self._git.commit(hexsha)
146
if commit is None:
147
continue
148
else:
149
parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
150
return parent_map
151
152
def get_ancestry(self, revision_id, topo_sorted=True):
153
"""See Repository.get_ancestry().
154
"""
155
if revision_id is None:
156
return [None, revision.NULL_REVISION] + self._all_revision_ids()
157
assert isinstance(revision_id, str)
158
ancestry = []
159
graph = self.get_graph()
160
for rev, parents in graph.iter_ancestry([revision_id]):
161
ancestry.append(rev)
162
ancestry.reverse()
163
return [None] + ancestry
72
def is_shared(self):
73
return True
74
75
def supports_rich_root(self):
76
return False
77
78
#def get_revision_delta(self, revision_id):
79
# parent_revid = self.get_revision(revision_id).parent_ids[0]
80
# diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
81
# ids.convert_revision_id_bzr_to_git(revision_id))
82
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(default_mapping.convert_revision_id_bzr_to_git(revision_id), max_count=max_count, skip=skip)
92
skip += max_count
93
ret += [default_mapping.convert_revision_id_git_to_bzr(cm.id) for cm in cms]
94
return [None] + ret
164
95
165
96
def get_signature_text(self, revision_id):
166
97
raise errors.NoSuchRevision(self, revision_id)
167
98
168
def lookup_revision_id(self, revid):
169
"""Lookup a revision id.
170
171
:param revid: Bazaar revision id.
172
:return: Tuple with git revisionid and mapping.
173
"""
174
# Yes, this doesn't really work, but good enough as a stub
175
return osutils.sha(rev_id).hexdigest(), self.get_mapping()
176
177
99
def has_signature_for_revision_id(self, revision_id):
178
100
return False
179
101
180
def lookup_git_revid(self, bzr_revid):
181
try:
182
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
183
except errors.InvalidRevisionId:
184
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(default_mapping.convert_revision_id_bzr_to_git(revid))
109
ret[revid] = tuple([default_mapping.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
110
return ret
185
111
186
112
def get_revision(self, revision_id):
187
git_commit_id, mapping = self.lookup_git_revid(revision_id)
188
try:
189
commit = self._git.commit(git_commit_id)
190
except KeyError:
191
raise errors.NoSuchRevision(self, revision_id)
113
git_commit_id = default_mapping.convert_revision_id_bzr_to_git(revision_id)
114
commit = self._git.commit(git_commit_id)
192
115
# print "fetched revision:", git_commit_id
193
revision = mapping.import_commit(commit)
194
assert revision is not None
116
revision = self._parse_rev(commit)
195
117
return revision
196
118
197
119
def has_revision(self, revision_id):
198
120
try:
199
121
self.get_revision(revision_id)
200
except errors.NoSuchRevision:
122
except NoSuchRevision:
201
123
return False
202
124
else:
203
125
return True
204
126
205
def get_revisions(self, revids):
206
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(default_mapping.convert_revision_id_git_to_bzr(commit.id))
137
rev.parent_ids = tuple([default_mapping.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
207
145
208
146
def revision_trees(self, revids):
209
147
for revid in revids:
211
149
212
150
def revision_tree(self, revision_id):
213
151
revision_id = revision.ensure_null(revision_id)
152
214
153
if revision_id == revision.NULL_REVISION:
215
154
inv = inventory.Inventory(root_id=None)
216
155
inv.revision_id = revision_id
217
156
return revisiontree.RevisionTree(self, inv, revision_id)
157
218
158
return GitRevisionTree(self, revision_id)
219
159
220
160
def get_inventory(self, revision_id):
221
161
assert revision_id != None
222
162
return self.revision_tree(revision_id).inventory
223
163
224
def set_make_working_trees(self, trees):
225
pass
226
227
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
228
progress=None):
229
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("__", "_")
230
171
231
172
232
173
class GitRevisionTree(revisiontree.RevisionTree):
233
174
234
175
def __init__(self, repository, revision_id):
235
self._revision_id = revision_id
236
176
self._repository = repository
237
store = repository._git.object_store
238
assert isinstance(revision_id, str)
239
git_id, self.mapping = repository.lookup_git_revid(revision_id)
240
try:
241
commit = store[git_id]
242
except KeyError, r:
243
raise errors.NoSuchRevision(repository, revision_id)
244
self.tree = commit.tree
245
self._inventory = GitInventory(self.tree, self.mapping, store,
246
revision_id)
177
self.revision_id = revision_id
178
git_id = default_mapping.convert_revision_id_bzr_to_git(revision_id)
179
self.tree = repository._git.commit(git_id).tree
180
self._inventory = inventory.Inventory(revision_id=revision_id)
181
self._inventory.root.revision = revision_id
182
self._build_inventory(self.tree, self._inventory.root, "")
247
183
248
184
def get_revision_id(self):
249
return self._revision_id
185
return self.revision_id
250
186
251
def get_file_text(self, file_id, path=None):
252
if path is not None:
253
entry = self._inventory._get_ie(path)
254
else:
255
entry = self._inventory[file_id]
187
def get_file_text(self, file_id):
188
entry = self._inventory[file_id]
256
189
if entry.kind == 'directory': return ""
257
return entry.object.data
258
259
260
class GitRepositoryFormat(repository.RepositoryFormat):
261
"""Git repository format."""
190
return self._repository._git.blob(entry.text_id).data
191
192
def _build_inventory(self, tree, ie, path):
193
assert isinstance(path, str)
194
for b in tree.contents:
195
basename = b.name.decode("utf-8")
196
if path == "":
197
child_path = b.name
198
else:
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':
202
child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
203
elif b.mode[0] == '1':
204
if b.mode[1] == '0':
205
child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
206
child_ie.text_sha1 = osutils.sha_string(b.data)
207
elif b.mode[1] == '2':
208
child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
209
child_ie.text_sha1 = osutils.sha_string("")
210
else:
211
raise AssertionError(
212
"Unknown file kind, perms=%r." % (b.mode,))
213
child_ie.text_id = b.id
214
child_ie.text_size = b.size
215
else:
216
raise AssertionError(
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
220
self._inventory.add(child_ie)
221
if b.mode[0] == '0':
222
self._build_inventory(b, child_ie, child_path)
223
224
225
class GitFormat(object):
262
226
263
227
supports_tree_reference = False
264
rich_root_data = True
265
228
266
229
def get_format_description(self):
267
230
return "Git Repository"
268
269
def initialize(self, url, shared=False, _internal=False):
270
raise bzr_errors.UninitializableFormat(self)
271
272
def check_conversion_target(self, target_repo_format):
273
return target_repo_format.rich_root_data
274
275
def network_name(self):
276
return "git"
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0