bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
1 |
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Map from Git sha's to Bazaar objects."""
|
|
18 |
||
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
19 |
from dulwich.objects import ( |
20 |
Blob, |
|
21 |
Tree, |
|
|
0.200.565
by Jelmer Vernooij
Cope with 'binary' shas. |
22 |
hex_to_sha, |
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
23 |
)
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
24 |
from dulwich.object_store import ( |
|
0.200.457
by Jelmer Vernooij
Use BaseObjectStore. |
25 |
BaseObjectStore, |
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
26 |
ObjectStoreIterator, |
27 |
)
|
|
|
0.200.249
by Jelmer Vernooij
Implement Tree. |
28 |
import stat |
29 |
||
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
30 |
from bzrlib import ( |
|
0.200.440
by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well. |
31 |
debug, |
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
32 |
errors, |
|
0.200.478
by Jelmer Vernooij
Cope with disappeared revisions. |
33 |
trace, |
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
34 |
ui, |
35 |
)
|
|
|
0.200.541
by Jelmer Vernooij
Cope with NULL_REVISION. |
36 |
from bzrlib.revision import ( |
37 |
NULL_REVISION, |
|
38 |
)
|
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
39 |
|
|
0.200.467
by Jelmer Vernooij
Raise proper errors for ghosts. |
40 |
from bzrlib.plugins.git.errors import ( |
41 |
GhostRevision, |
|
42 |
)
|
|
43 |
||
|
0.200.229
by Jelmer Vernooij
More work on converter. |
44 |
from bzrlib.plugins.git.mapping import ( |
|
0.200.463
by Jelmer Vernooij
Support remote dpush (except for references). |
45 |
default_mapping, |
|
0.200.359
by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted. |
46 |
directory_to_tree, |
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
47 |
extract_unusual_modes, |
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
48 |
mapping_registry, |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
49 |
revision_to_commit, |
50 |
)
|
|
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
51 |
from bzrlib.plugins.git.shamap import ( |
52 |
SqliteGitShaMap, |
|
|
0.200.476
by Jelmer Vernooij
Fix Tdb backend, use tdb if possible by default. |
53 |
TdbGitShaMap, |
|
0.200.231
by Jelmer Vernooij
Partially fix pull. |
54 |
)
|
55 |
||
|
0.200.228
by Jelmer Vernooij
Split out map. |
56 |
|
|
0.200.452
by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's. |
57 |
def get_object_store(repo, mapping=None): |
58 |
git = getattr(repo, "_git", None) |
|
59 |
if git is not None: |
|
60 |
return git.object_store |
|
61 |
return BazaarObjectStore(repo, mapping) |
|
62 |
||
63 |
||
|
0.200.457
by Jelmer Vernooij
Use BaseObjectStore. |
64 |
class BazaarObjectStore(BaseObjectStore): |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
65 |
"""A Git-style object store backed onto a Bazaar repository.""" |
|
0.200.228
by Jelmer Vernooij
Split out map. |
66 |
|
67 |
def __init__(self, repository, mapping=None): |
|
68 |
self.repository = repository |
|
69 |
if mapping is None: |
|
|
0.200.463
by Jelmer Vernooij
Support remote dpush (except for references). |
70 |
self.mapping = default_mapping |
|
0.200.228
by Jelmer Vernooij
Split out map. |
71 |
else: |
72 |
self.mapping = mapping |
|
|
0.200.476
by Jelmer Vernooij
Fix Tdb backend, use tdb if possible by default. |
73 |
try: |
74 |
self._idmap = TdbGitShaMap.from_repository(repository) |
|
75 |
except ImportError: |
|
76 |
self._idmap = SqliteGitShaMap.from_repository(repository) |
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
77 |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
78 |
def _update_sha_map(self, stop_revision=None): |
79 |
if stop_revision is None: |
|
80 |
all_revids = self.repository.all_revision_ids() |
|
81 |
else: |
|
82 |
all_revids = self.repository.get_ancestry(stop_revision) |
|
83 |
first = all_revids.pop(0) # Pop leading None |
|
84 |
assert first is None |
|
|
0.200.231
by Jelmer Vernooij
Partially fix pull. |
85 |
graph = self.repository.get_graph() |
|
0.200.230
by Jelmer Vernooij
Implement sha cache. |
86 |
present_revids = set(self._idmap.revids()) |
|
0.200.347
by Jelmer Vernooij
Simplify converter a bit. |
87 |
missing_revids = [revid for revid in graph.iter_topo_order(all_revids) if revid not in present_revids] |
|
0.200.231
by Jelmer Vernooij
Partially fix pull. |
88 |
pb = ui.ui_factory.nested_progress_bar() |
89 |
try: |
|
|
0.200.347
by Jelmer Vernooij
Simplify converter a bit. |
90 |
for i, revid in enumerate(missing_revids): |
91 |
pb.update("updating git map", i, len(missing_revids)) |
|
|
0.200.231
by Jelmer Vernooij
Partially fix pull. |
92 |
self._update_sha_map_revision(revid) |
93 |
finally: |
|
|
0.200.232
by Jelmer Vernooij
Fix pull from remote branches. |
94 |
self._idmap.commit() |
|
0.200.231
by Jelmer Vernooij
Partially fix pull. |
95 |
pb.finished() |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
96 |
|
|
0.200.422
by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects. |
97 |
def __iter__(self): |
98 |
self._update_sha_map() |
|
99 |
return iter(self._idmap.sha1s()) |
|
100 |
||
|
0.200.229
by Jelmer Vernooij
More work on converter. |
101 |
def _update_sha_map_revision(self, revid): |
102 |
inv = self.repository.get_inventory(revid) |
|
103 |
rev = self.repository.get_revision(revid) |
|
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
104 |
unusual_modes = extract_unusual_modes(rev) |
105 |
tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes) |
|
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
106 |
commit_obj = revision_to_commit(rev, tree_sha, |
|
0.200.487
by Jelmer Vernooij
Prevent deep recursion if the shamap is out of date. |
107 |
self._idmap.lookup_commit) |
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
108 |
try: |
109 |
foreign_revid, mapping = mapping_registry.parse_revision_id(revid) |
|
110 |
except errors.InvalidRevisionId: |
|
111 |
pass
|
|
112 |
else: |
|
113 |
if foreign_revid != commit_obj.id: |
|
|
0.200.440
by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well. |
114 |
if not "fix-shamap" in debug.debug_flags: |
115 |
raise AssertionError("recreated git commit had different sha1: expected %s, got %s" % (foreign_revid, commit_obj.id)) |
|
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
116 |
self._idmap.add_entry(commit_obj.id, "commit", (revid, tree_sha)) |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
117 |
|
|
0.200.353
by Jelmer Vernooij
fileids/revids are plain strings, not unicode |
118 |
def _check_expected_sha(self, expected_sha, object): |
119 |
if expected_sha is None: |
|
120 |
return
|
|
|
0.200.565
by Jelmer Vernooij
Cope with 'binary' shas. |
121 |
if len(expected_sha) == 40: |
122 |
if expected_sha != object.sha().hexdigest(): |
|
123 |
raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha)) |
|
124 |
elif len(expected_sha) == 20: |
|
125 |
if expected_sha != object.sha().digest(): |
|
126 |
raise AssertionError("Invalid sha for %r: %s" % (object, sha_to_hex(expected_sha))) |
|
127 |
else: |
|
128 |
raise AssertionError("Unknown length %d for %r" % (len(expected_sha), expected_sha)) |
|
|
0.200.353
by Jelmer Vernooij
fileids/revids are plain strings, not unicode |
129 |
|
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
130 |
def _get_ie_object(self, entry, inv, unusual_modes): |
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
131 |
if entry.kind == "directory": |
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
132 |
return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes) |
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
133 |
else: |
134 |
return self._get_blob(entry.file_id, entry.revision) |
|
135 |
||
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
136 |
def _get_ie_object_or_sha1(self, entry, inv, unusual_modes): |
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
137 |
if entry.kind == "directory": |
138 |
try: |
|
139 |
return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None |
|
140 |
except KeyError: |
|
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
141 |
ret = self._get_ie_object(entry, inv, unusual_modes) |
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
142 |
self._idmap.add_entry(ret.id, "tree", (entry.file_id, inv.revision_id)) |
143 |
return ret.id, ret |
|
144 |
else: |
|
145 |
try: |
|
146 |
return self._idmap.lookup_blob(entry.file_id, entry.revision), None |
|
147 |
except KeyError: |
|
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
148 |
ret = self._get_ie_object(entry, inv, unusual_modes) |
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
149 |
self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision)) |
150 |
return ret.id, ret |
|
151 |
||
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
152 |
def _get_ie_sha1(self, entry, inv, unusual_modes): |
153 |
return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0] |
|
|
0.200.359
by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted. |
154 |
|
|
0.200.353
by Jelmer Vernooij
fileids/revids are plain strings, not unicode |
155 |
def _get_blob(self, fileid, revision, expected_sha=None): |
|
0.200.236
by Jelmer Vernooij
require bzr 1.13. |
156 |
"""Return a Git Blob object from a fileid and revision stored in bzr. |
157 |
|
|
158 |
:param fileid: File id of the text
|
|
159 |
:param revision: Revision of the text
|
|
160 |
"""
|
|
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
161 |
text = self.repository.texts.get_record_stream([(fileid, revision)], |
162 |
"unordered", True).next().get_bytes_as("fulltext") |
|
|
0.200.229
by Jelmer Vernooij
More work on converter. |
163 |
blob = Blob() |
164 |
blob._text = text |
|
|
0.200.353
by Jelmer Vernooij
fileids/revids are plain strings, not unicode |
165 |
self._check_expected_sha(expected_sha, blob) |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
166 |
return blob |
167 |
||
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
168 |
def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None): |
|
0.200.343
by Jelmer Vernooij
Use file ids consistently in map. |
169 |
"""Return a Git Tree object from a file id and a revision stored in bzr. |
|
0.200.249
by Jelmer Vernooij
Implement Tree. |
170 |
|
|
0.200.343
by Jelmer Vernooij
Use file ids consistently in map. |
171 |
:param fileid: fileid in the tree.
|
|
0.200.249
by Jelmer Vernooij
Implement Tree. |
172 |
:param revision: Revision of the tree.
|
173 |
"""
|
|
|
0.200.549
by Jelmer Vernooij
Fix storing of unusual file modes. |
174 |
tree = directory_to_tree(inv[fileid], |
175 |
lambda ie: self._get_ie_sha1(ie, inv, unusual_modes), |
|
176 |
unusual_modes) |
|
|
0.200.353
by Jelmer Vernooij
fileids/revids are plain strings, not unicode |
177 |
self._check_expected_sha(expected_sha, tree) |
|
0.200.249
by Jelmer Vernooij
Implement Tree. |
178 |
return tree |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
179 |
|
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
180 |
def _get_commit(self, rev, tree_sha, expected_sha=None): |
|
0.200.467
by Jelmer Vernooij
Raise proper errors for ghosts. |
181 |
try: |
182 |
commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1) |
|
183 |
except errors.NoSuchRevision, e: |
|
184 |
raise GhostRevision(e.branch, e.revision) |
|
|
0.200.353
by Jelmer Vernooij
fileids/revids are plain strings, not unicode |
185 |
self._check_expected_sha(expected_sha, commit) |
186 |
return commit |
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
187 |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
188 |
def get_parents(self, sha): |
|
0.200.454
by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server. |
189 |
"""Retrieve the parents of a Git commit by SHA1. |
190 |
||
191 |
:param sha: SHA1 of the commit
|
|
192 |
:raises: KeyError, NotCommitError
|
|
193 |
"""
|
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
194 |
return self[sha].parents |
195 |
||
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
196 |
def _lookup_revision_sha1(self, revid): |
|
0.200.449
by Jelmer Vernooij
Use BazaarObjectStore to find matching SHA1s for bzr revisions. |
197 |
"""Return the SHA1 matching a Bazaar revision.""" |
|
0.200.541
by Jelmer Vernooij
Cope with NULL_REVISION. |
198 |
if revid == NULL_REVISION: |
199 |
return "0" * 40 |
|
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
200 |
try: |
|
0.200.487
by Jelmer Vernooij
Prevent deep recursion if the shamap is out of date. |
201 |
return self._idmap.lookup_commit(revid) |
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
202 |
except KeyError: |
|
0.200.487
by Jelmer Vernooij
Prevent deep recursion if the shamap is out of date. |
203 |
self._update_sha_map(revid) |
204 |
return self._idmap.lookup_commit(revid) |
|
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
205 |
|
|
0.200.310
by Jelmer Vernooij
Fix pull from remote branches. |
206 |
def get_raw(self, sha): |
|
0.200.454
by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server. |
207 |
"""Get the raw representation of a Git object by SHA1. |
208 |
||
209 |
:param sha: SHA1 of the git object
|
|
210 |
"""
|
|
|
0.200.566
by Jelmer Vernooij
Fix ObjectStore.get_raw() . |
211 |
obj = self[sha] |
212 |
return (obj.type, obj.as_raw_string()) |
|
|
0.200.310
by Jelmer Vernooij
Fix pull from remote branches. |
213 |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
214 |
def __contains__(self, sha): |
215 |
# See if sha is in map
|
|
216 |
try: |
|
|
0.200.568
by Jelmer Vernooij
Properly check that matching bzr objects exist. |
217 |
(type, type_data) = self._lookup_git_sha(sha) |
218 |
if type == "commit": |
|
219 |
return self.repository.has_revision(type_data[0]) |
|
220 |
elif type == "blob": |
|
221 |
return self.repository.texts.has_version(type_data) |
|
222 |
elif type == "tree": |
|
223 |
return self.repository.has_revision(type_data[1]) |
|
224 |
else: |
|
225 |
raise AssertionError("Unknown object type '%s'" % type) |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
226 |
except KeyError: |
227 |
return False |
|
228 |
else: |
|
229 |
return True |
|
230 |
||
231 |
def _lookup_git_sha(self, sha): |
|
232 |
# See if sha is in map
|
|
233 |
try: |
|
234 |
return self._idmap.lookup_git_sha(sha) |
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
235 |
except KeyError: |
236 |
# if not, see if there are any unconverted revisions and add them
|
|
237 |
# to the map, search for sha in map again
|
|
238 |
self._update_sha_map() |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
239 |
return self._idmap.lookup_git_sha(sha) |
240 |
||
241 |
def __getitem__(self, sha): |
|
242 |
(type, type_data) = self._lookup_git_sha(sha) |
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
243 |
# convert object to git object
|
|
0.200.229
by Jelmer Vernooij
More work on converter. |
244 |
if type == "commit": |
|
0.200.478
by Jelmer Vernooij
Cope with disappeared revisions. |
245 |
try: |
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
246 |
rev = self.repository.get_revision(type_data[0]) |
|
0.200.478
by Jelmer Vernooij
Cope with disappeared revisions. |
247 |
except errors.NoSuchRevision: |
248 |
trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data) |
|
249 |
raise KeyError(sha) |
|
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
250 |
return self._get_commit(rev, type_data[1], expected_sha=sha) |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
251 |
elif type == "blob": |
|
0.200.353
by Jelmer Vernooij
fileids/revids are plain strings, not unicode |
252 |
return self._get_blob(type_data[0], type_data[1], expected_sha=sha) |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
253 |
elif type == "tree": |
|
0.200.561
by Jelmer Vernooij
Cope with revisions pointed to by trees in the shamap disappearing. |
254 |
try: |
255 |
inv = self.repository.get_inventory(type_data[1]) |
|
256 |
rev = self.repository.get_revision(type_data[1]) |
|
257 |
except errors.NoSuchRevision: |
|
258 |
trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data) |
|
259 |
raise KeyError(sha) |
|
|
0.200.556
by Jelmer Vernooij
Fix syntax error. |
260 |
unusual_modes = extract_unusual_modes(rev) |
|
0.200.491
by Jelmer Vernooij
Cope with map for Tree objects becoming invalid. |
261 |
try: |
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
262 |
return self._get_tree(type_data[0], type_data[1], inv, unusual_modes, |
|
0.200.491
by Jelmer Vernooij
Cope with map for Tree objects becoming invalid. |
263 |
expected_sha=sha) |
264 |
except errors.NoSuchRevision: |
|
265 |
raise KeyError(sha) |
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
266 |
else: |
267 |
raise AssertionError("Unknown object type '%s'" % type) |