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, |
|
|
0.200.864
by Jelmer Vernooij
Cope with the first commit being pointless. |
21 |
Tree, |
|
0.200.586
by Jelmer Vernooij
Fix issues pointed out by pyflakes. |
22 |
sha_to_hex, |
|
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 |
)
|
|
0.200.249
by Jelmer Vernooij
Implement Tree. |
27 |
|
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
28 |
from bzrlib import ( |
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
29 |
errors, |
|
0.200.789
by Jelmer Vernooij
Cope with ghosts, cache inventories. |
30 |
lru_cache, |
|
0.200.478
by Jelmer Vernooij
Cope with disappeared revisions. |
31 |
trace, |
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
32 |
ui, |
|
0.200.773
by Jelmer Vernooij
Implement inventory_to_objects |
33 |
urlutils, |
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
34 |
)
|
|
0.200.541
by Jelmer Vernooij
Cope with NULL_REVISION. |
35 |
from bzrlib.revision import ( |
36 |
NULL_REVISION, |
|
37 |
)
|
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
38 |
|
|
0.200.229
by Jelmer Vernooij
More work on converter. |
39 |
from bzrlib.plugins.git.mapping import ( |
|
0.200.463
by Jelmer Vernooij
Support remote dpush (except for references). |
40 |
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. |
41 |
directory_to_tree, |
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
42 |
extract_unusual_modes, |
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
43 |
mapping_registry, |
|
0.200.795
by Jelmer Vernooij
simplify sha extraction for blobs, process multiple blobs at once. |
44 |
symlink_to_blob, |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
45 |
)
|
|
0.200.260
by Jelmer Vernooij
Add DictGitShaMap, useful for testing. |
46 |
from bzrlib.plugins.git.shamap import ( |
|
0.200.842
by Jelmer Vernooij
Allow content cache to be provided. |
47 |
from_repository as cache_from_repository, |
|
0.200.231
by Jelmer Vernooij
Partially fix pull. |
48 |
)
|
49 |
||
|
0.200.228
by Jelmer Vernooij
Split out map. |
50 |
|
|
0.200.452
by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's. |
51 |
def get_object_store(repo, mapping=None): |
52 |
git = getattr(repo, "_git", None) |
|
53 |
if git is not None: |
|
54 |
return git.object_store |
|
55 |
return BazaarObjectStore(repo, mapping) |
|
56 |
||
57 |
||
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
58 |
MAX_TREE_CACHE_SIZE = 50 * 1024 * 1024 |
59 |
||
60 |
||
61 |
class LRUTreeCache(object): |
|
|
0.200.789
by Jelmer Vernooij
Cope with ghosts, cache inventories. |
62 |
|
63 |
def __init__(self, repository): |
|
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
64 |
def approx_tree_size(tree): |
|
0.200.789
by Jelmer Vernooij
Cope with ghosts, cache inventories. |
65 |
# Very rough estimate, 1k per inventory entry
|
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
66 |
return len(tree.inventory) * 1024 |
|
0.200.789
by Jelmer Vernooij
Cope with ghosts, cache inventories. |
67 |
self.repository = repository |
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
68 |
self._cache = lru_cache.LRUSizeCache(max_size=MAX_TREE_CACHE_SIZE, |
69 |
after_cleanup_size=None, compute_size=approx_tree_size) |
|
|
0.200.789
by Jelmer Vernooij
Cope with ghosts, cache inventories. |
70 |
|
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
71 |
def revision_tree(self, revid): |
|
0.200.789
by Jelmer Vernooij
Cope with ghosts, cache inventories. |
72 |
try: |
73 |
return self._cache[revid] |
|
74 |
except KeyError: |
|
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
75 |
tree = self.repository.revision_tree(revid) |
76 |
self.add(tree) |
|
77 |
return tree |
|
78 |
||
79 |
def iter_revision_trees(self, revids): |
|
80 |
trees = dict([(k, self._cache.get(k)) for k in revids]) |
|
81 |
for tree in self.repository.revision_trees( |
|
82 |
[r for r, v in trees.iteritems() if v is None]): |
|
83 |
trees[tree.get_revision_id()] = tree |
|
84 |
self.add(tree) |
|
85 |
return (trees[r] for r in revids) |
|
86 |
||
87 |
def revision_trees(self, revids): |
|
88 |
return list(self.iter_revision_trees(revids)) |
|
89 |
||
90 |
def add(self, tree): |
|
91 |
self._cache.add(tree.get_revision_id(), tree) |
|
|
0.200.789
by Jelmer Vernooij
Cope with ghosts, cache inventories. |
92 |
|
93 |
||
|
0.200.793
by Jelmer Vernooij
Make _check_expected_sha a global fn. |
94 |
def _check_expected_sha(expected_sha, object): |
|
0.200.797
by Jelmer Vernooij
Add docstring, fix formatting. |
95 |
"""Check whether an object matches an expected SHA. |
96 |
||
97 |
:param expected_sha: None or expected SHA as either binary or as hex digest
|
|
98 |
:param object: Object to verify
|
|
99 |
"""
|
|
|
0.200.793
by Jelmer Vernooij
Make _check_expected_sha a global fn. |
100 |
if expected_sha is None: |
101 |
return
|
|
102 |
if len(expected_sha) == 40: |
|
103 |
if expected_sha != object.sha().hexdigest(): |
|
|
0.200.797
by Jelmer Vernooij
Add docstring, fix formatting. |
104 |
raise AssertionError("Invalid sha for %r: %s" % (object, |
105 |
expected_sha)) |
|
|
0.200.793
by Jelmer Vernooij
Make _check_expected_sha a global fn. |
106 |
elif len(expected_sha) == 20: |
107 |
if expected_sha != object.sha().digest(): |
|
|
0.200.797
by Jelmer Vernooij
Add docstring, fix formatting. |
108 |
raise AssertionError("Invalid sha for %r: %s" % (object, |
109 |
sha_to_hex(expected_sha))) |
|
|
0.200.793
by Jelmer Vernooij
Make _check_expected_sha a global fn. |
110 |
else: |
|
0.200.797
by Jelmer Vernooij
Add docstring, fix formatting. |
111 |
raise AssertionError("Unknown length %d for %r" % (len(expected_sha), |
112 |
expected_sha)) |
|
|
0.200.793
by Jelmer Vernooij
Make _check_expected_sha a global fn. |
113 |
|
114 |
||
|
0.250.2
by Jelmer Vernooij
Make it work for evolution. |
115 |
def _tree_to_objects(tree, parent_trees, idmap, unusual_modes): |
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
116 |
"""Iterate over the objects that were introduced in a revision. |
117 |
||
|
0.200.841
by Jelmer Vernooij
Eliminate InventorySHAMap. |
118 |
:param idmap: id map
|
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
119 |
:param unusual_modes: Unusual file modes
|
|
0.200.837
by Jelmer Vernooij
Return inventory entries when creating git objects for a revision. |
120 |
:return: Yields (path, object, ie) entries
|
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
121 |
"""
|
122 |
new_trees = {} |
|
123 |
new_blobs = [] |
|
124 |
shamap = {} |
|
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
125 |
try: |
126 |
base_tree = parent_trees[0] |
|
127 |
other_parent_trees = parent_trees[1:] |
|
128 |
except IndexError: |
|
129 |
base_tree = tree._repository.revision_tree(NULL_REVISION) |
|
130 |
other_parent_trees = [] |
|
|
0.200.868
by Jelmer Vernooij
Cope with no-change merges. |
131 |
def find_unchanged_parent_ie(ie, parent_trees): |
132 |
assert ie.kind in ("symlink", "file") |
|
133 |
for ptree in parent_trees: |
|
134 |
try: |
|
135 |
pie = ptree.inventory[ie.file_id] |
|
136 |
except errors.NoSuchId: |
|
137 |
pass
|
|
138 |
else: |
|
139 |
if (pie.text_sha1 == ie.text_sha1 and |
|
140 |
pie.kind == ie.kind and |
|
141 |
pie.symlink_target == ie.symlink_target): |
|
142 |
return pie |
|
143 |
raise KeyError |
|
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
144 |
for (file_id, path, changed_content, versioned, parent, name, kind, |
145 |
executable) in tree.iter_changes(base_tree): |
|
146 |
if kind[1] == "file": |
|
147 |
ie = tree.inventory[file_id] |
|
148 |
if changed_content: |
|
|
0.200.868
by Jelmer Vernooij
Cope with no-change merges. |
149 |
|
150 |
try: |
|
151 |
pie = find_unchanged_parent_ie(ie, other_parent_trees) |
|
152 |
except KeyError: |
|
153 |
pass
|
|
154 |
else: |
|
155 |
shamap[ie.file_id] = idmap.lookup_blob_id( |
|
156 |
pie.file_id, pie.revision) |
|
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
157 |
if not file_id in shamap: |
158 |
new_blobs.append((path[1], ie)) |
|
159 |
new_trees[urlutils.dirname(path[1])] = parent[1] |
|
160 |
elif kind[1] == "symlink": |
|
161 |
ie = tree.inventory[file_id] |
|
162 |
if changed_content: |
|
163 |
blob = symlink_to_blob(ie) |
|
|
0.200.868
by Jelmer Vernooij
Cope with no-change merges. |
164 |
shamap[file_id] = blob.id |
165 |
try: |
|
166 |
find_unchanged_parent_ie(ie, other_parent_trees) |
|
167 |
except KeyError: |
|
168 |
yield path[1], blob, ie |
|
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
169 |
new_trees[urlutils.dirname(path[1])] = parent[1] |
|
0.250.3
by Jelmer Vernooij
Simplify.. |
170 |
elif kind[1] not in (None, "directory"): |
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
171 |
raise AssertionError(kind[1]) |
|
0.250.2
by Jelmer Vernooij
Make it work for evolution. |
172 |
if path[0] is not None: |
173 |
new_trees[urlutils.dirname(path[0])] = parent[0] |
|
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
174 |
|
|
0.250.2
by Jelmer Vernooij
Make it work for evolution. |
175 |
for (path, ie), chunks in tree.iter_files_bytes( |
176 |
[(ie.file_id, (path, ie)) for (path, ie) in new_blobs]): |
|
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
177 |
obj = Blob() |
|
0.200.851
by Jelmer Vernooij
Use blob.chunked. |
178 |
obj.chunked = chunks |
|
0.200.837
by Jelmer Vernooij
Return inventory entries when creating git objects for a revision. |
179 |
yield path, obj, ie |
180 |
shamap[ie.file_id] = obj.id |
|
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
181 |
|
182 |
for fid in unusual_modes: |
|
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
183 |
new_trees[tree.id2path(fid)] = tree.inventory[fid].parent_id |
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
184 |
|
185 |
trees = {} |
|
186 |
while new_trees: |
|
187 |
items = new_trees.items() |
|
188 |
new_trees = {} |
|
189 |
for path, file_id in items: |
|
|
0.250.2
by Jelmer Vernooij
Make it work for evolution. |
190 |
try: |
191 |
parent_id = tree.inventory[file_id].parent_id |
|
192 |
except errors.NoSuchId: |
|
193 |
# Directory was removed recursively perhaps ?
|
|
194 |
continue
|
|
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
195 |
if parent_id is not None: |
196 |
parent_path = urlutils.dirname(path) |
|
197 |
new_trees[parent_path] = parent_id |
|
198 |
trees[path] = file_id |
|
199 |
||
|
0.200.808
by Jelmer Vernooij
Avoid recalculating tree shas we already have. |
200 |
def ie_to_hexsha(ie): |
201 |
try: |
|
202 |
return shamap[ie.file_id] |
|
203 |
except KeyError: |
|
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
204 |
if ie.kind in ("file", "symlink"): |
|
0.200.868
by Jelmer Vernooij
Cope with no-change merges. |
205 |
try: |
206 |
return idmap.lookup_blob_id(ie.file_id, ie.revision) |
|
207 |
except KeyError: |
|
208 |
# no-change merge ?
|
|
209 |
blob = Blob() |
|
210 |
blob.data = tree.get_file_text(ie.file_id) |
|
211 |
return blob.id |
|
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
212 |
elif ie.kind == "directory": |
213 |
# Not all cache backends store the tree information,
|
|
214 |
# calculate again from scratch
|
|
215 |
ret = directory_to_tree(ie, ie_to_hexsha, unusual_modes) |
|
216 |
if ret is None: |
|
217 |
return ret |
|
218 |
return ret.id |
|
219 |
else: |
|
220 |
raise AssertionError |
|
|
0.200.808
by Jelmer Vernooij
Avoid recalculating tree shas we already have. |
221 |
|
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
222 |
for path in sorted(trees.keys(), reverse=True): |
|
0.250.1
by Jelmer Vernooij
Use iter_changes() rather than iterating over all contents of an inventory. |
223 |
ie = tree.inventory[trees[path]] |
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
224 |
assert ie.kind == "directory" |
|
0.200.808
by Jelmer Vernooij
Avoid recalculating tree shas we already have. |
225 |
obj = directory_to_tree(ie, ie_to_hexsha, unusual_modes) |
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
226 |
if obj is not None: |
|
0.200.837
by Jelmer Vernooij
Return inventory entries when creating git objects for a revision. |
227 |
yield path, obj, ie |
|
0.200.798
by Jelmer Vernooij
Split out _inventory_to_objects into a function. |
228 |
shamap[ie.file_id] = obj.id |
229 |
||
230 |
||
|
0.200.457
by Jelmer Vernooij
Use BaseObjectStore. |
231 |
class BazaarObjectStore(BaseObjectStore): |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
232 |
"""A Git-style object store backed onto a Bazaar repository.""" |
|
0.200.228
by Jelmer Vernooij
Split out map. |
233 |
|
234 |
def __init__(self, repository, mapping=None): |
|
235 |
self.repository = repository |
|
236 |
if mapping is None: |
|
|
0.200.463
by Jelmer Vernooij
Support remote dpush (except for references). |
237 |
self.mapping = default_mapping |
|
0.200.228
by Jelmer Vernooij
Split out map. |
238 |
else: |
239 |
self.mapping = mapping |
|
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
240 |
self._cache = cache_from_repository(repository) |
|
0.200.842
by Jelmer Vernooij
Allow content cache to be provided. |
241 |
self._content_cache_types = ("tree") |
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
242 |
self.start_write_group = self._cache.idmap.start_write_group |
243 |
self.abort_write_group = self._cache.idmap.abort_write_group |
|
244 |
self.commit_write_group = self._cache.idmap.commit_write_group |
|
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
245 |
self.tree_cache = LRUTreeCache(self.repository) |
|
0.200.228
by Jelmer Vernooij
Split out map. |
246 |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
247 |
def _update_sha_map(self, stop_revision=None): |
|
0.200.683
by Jelmer Vernooij
Lazier checking of which revisions need to be fetched. |
248 |
graph = self.repository.get_graph() |
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
249 |
if stop_revision is None: |
|
0.200.683
by Jelmer Vernooij
Lazier checking of which revisions need to be fetched. |
250 |
heads = graph.heads(self.repository.all_revision_ids()) |
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
251 |
else: |
|
0.200.683
by Jelmer Vernooij
Lazier checking of which revisions need to be fetched. |
252 |
heads = set([stop_revision]) |
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
253 |
missing_revids = self._cache.idmap.missing_revisions(heads) |
|
0.200.683
by Jelmer Vernooij
Lazier checking of which revisions need to be fetched. |
254 |
while heads: |
255 |
parents = graph.get_parent_map(heads) |
|
256 |
todo = set() |
|
257 |
for p in parents.values(): |
|
|
0.200.684
by Jelmer Vernooij
Properly close write groups. |
258 |
todo.update([x for x in p if x not in missing_revids]) |
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
259 |
heads = self._cache.idmap.missing_revisions(todo) |
|
0.200.684
by Jelmer Vernooij
Properly close write groups. |
260 |
missing_revids.update(heads) |
|
0.200.694
by Jelmer Vernooij
Avoid processing NULL_REVISION. |
261 |
if NULL_REVISION in missing_revids: |
262 |
missing_revids.remove(NULL_REVISION) |
|
|
0.200.750
by Jelmer Vernooij
Remove unused tree code, add mechanism for migrating between sha maps. |
263 |
missing_revids = self.repository.has_revisions(missing_revids) |
264 |
if not missing_revids: |
|
265 |
return
|
|
|
0.200.735
by Jelmer Vernooij
Use convenience functions for start/stop write groups. |
266 |
self.start_write_group() |
|
0.200.231
by Jelmer Vernooij
Partially fix pull. |
267 |
try: |
|
0.200.733
by Jelmer Vernooij
Use start/stop commit write group. |
268 |
pb = ui.ui_factory.nested_progress_bar() |
269 |
try: |
|
270 |
for i, revid in enumerate(graph.iter_topo_order(missing_revids)): |
|
|
0.200.750
by Jelmer Vernooij
Remove unused tree code, add mechanism for migrating between sha maps. |
271 |
trace.mutter('processing %r', revid) |
|
0.200.733
by Jelmer Vernooij
Use start/stop commit write group. |
272 |
pb.update("updating git map", i, len(missing_revids)) |
273 |
self._update_sha_map_revision(revid) |
|
274 |
finally: |
|
275 |
pb.finished() |
|
|
0.200.735
by Jelmer Vernooij
Use convenience functions for start/stop write groups. |
276 |
except: |
277 |
self.abort_write_group() |
|
278 |
raise
|
|
279 |
else: |
|
280 |
self.commit_write_group() |
|
|
0.200.229
by Jelmer Vernooij
More work on converter. |
281 |
|
|
0.200.422
by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects. |
282 |
def __iter__(self): |
283 |
self._update_sha_map() |
|
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
284 |
return iter(self._cache.idmap.sha1s()) |
|
0.200.422
by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects. |
285 |
|
|
0.200.855
by Jelmer Vernooij
_get_ -> _reconstruct_. |
286 |
def _reconstruct_commit(self, rev, tree_sha): |
|
0.238.7
by Jelmer Vernooij
Cope with ghosts a bit better. |
287 |
def parent_lookup(revid): |
288 |
try: |
|
289 |
return self._lookup_revision_sha1(revid) |
|
290 |
except errors.NoSuchRevision: |
|
291 |
trace.warning("Ignoring ghost parent %s", revid) |
|
292 |
return None |
|
|
0.242.1
by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings. |
293 |
return self.mapping.export_commit(rev, tree_sha, parent_lookup) |
|
0.238.7
by Jelmer Vernooij
Cope with ghosts a bit better. |
294 |
|
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
295 |
def _revision_to_objects(self, rev, tree): |
|
0.200.548
by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees. |
296 |
unusual_modes = extract_unusual_modes(rev) |
|
0.200.789
by Jelmer Vernooij
Cope with ghosts, cache inventories. |
297 |
present_parents = self.repository.has_revisions(rev.parent_ids) |
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
298 |
parent_trees = self.tree_cache.revision_trees( |
|
0.200.797
by Jelmer Vernooij
Add docstring, fix formatting. |
299 |
[p for p in rev.parent_ids if p in present_parents]) |
|
0.200.773
by Jelmer Vernooij
Implement inventory_to_objects |
300 |
tree_sha = None |
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
301 |
for path, obj, ie in _tree_to_objects(tree, parent_trees, |
|
0.250.2
by Jelmer Vernooij
Make it work for evolution. |
302 |
self._cache.idmap, unusual_modes): |
|
0.200.837
by Jelmer Vernooij
Return inventory entries when creating git objects for a revision. |
303 |
yield path, obj, ie |
|
0.200.773
by Jelmer Vernooij
Implement inventory_to_objects |
304 |
if path == "": |
305 |
tree_sha = obj.id |
|
|
0.200.784
by Jelmer Vernooij
Use common object generation code in push. |
306 |
if tree_sha is None: |
|
0.250.2
by Jelmer Vernooij
Make it work for evolution. |
307 |
# Pointless commit - get the tree sha elsewhere
|
|
0.200.864
by Jelmer Vernooij
Cope with the first commit being pointless. |
308 |
if not rev.parent_ids: |
309 |
tree_sha = Tree().id |
|
310 |
else: |
|
311 |
base_sha1 = self._lookup_revision_sha1(rev.parent_ids[0]) |
|
312 |
tree_sha = self[base_sha1].tree |
|
|
0.200.855
by Jelmer Vernooij
_get_ -> _reconstruct_. |
313 |
commit_obj = self._reconstruct_commit(rev, tree_sha) |
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
314 |
try: |
|
0.200.841
by Jelmer Vernooij
Eliminate InventorySHAMap. |
315 |
foreign_revid, mapping = mapping_registry.parse_revision_id( |
316 |
rev.revision_id) |
|
|
0.231.1
by Jelmer Vernooij
Check that regenerated objects have the expected sha1. |
317 |
except errors.InvalidRevisionId: |
318 |
pass
|
|
319 |
else: |
|
|
0.200.794
by Jelmer Vernooij
Use _check_expected_sha rather than custom checks. |
320 |
_check_expected_sha(foreign_revid, commit_obj) |
|
0.200.837
by Jelmer Vernooij
Return inventory entries when creating git objects for a revision. |
321 |
yield None, commit_obj, None |
|
0.200.783
by Jelmer Vernooij
Move object generation into a separate function. |
322 |
|
|
0.200.838
by Jelmer Vernooij
Add convenience object for updating the object store. |
323 |
def _get_updater(self, rev): |
|
0.200.849
by Jelmer Vernooij
Allow cache backends to decide when to add entries rather than adding once per commit. |
324 |
return self._cache.get_updater(rev) |
|
0.200.838
by Jelmer Vernooij
Add convenience object for updating the object store. |
325 |
|
|
0.200.783
by Jelmer Vernooij
Move object generation into a separate function. |
326 |
def _update_sha_map_revision(self, revid): |
327 |
rev = self.repository.get_revision(revid) |
|
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
328 |
tree = self.tree_cache.revision_tree(rev.revision_id) |
|
0.200.838
by Jelmer Vernooij
Add convenience object for updating the object store. |
329 |
updater = self._get_updater(rev) |
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
330 |
for path, obj, ie in self._revision_to_objects(rev, tree): |
|
0.200.844
by Jelmer Vernooij
Add infrastructure for multiple cache formats. |
331 |
updater.add_object(obj, ie) |
|
0.200.838
by Jelmer Vernooij
Add convenience object for updating the object store. |
332 |
commit_obj = updater.finish() |
|
0.200.781
by Jelmer Vernooij
Return commit id after converting a revision. |
333 |
return commit_obj.id |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
334 |
|
|
0.200.855
by Jelmer Vernooij
_get_ -> _reconstruct_. |
335 |
def _reconstruct_blobs(self, keys): |
|
0.200.236
by Jelmer Vernooij
require bzr 1.13. |
336 |
"""Return a Git Blob object from a fileid and revision stored in bzr. |
|
0.200.670
by Jelmer Vernooij
Fix symlinks. |
337 |
|
|
0.200.236
by Jelmer Vernooij
require bzr 1.13. |
338 |
:param fileid: File id of the text
|
339 |
:param revision: Revision of the text
|
|
340 |
"""
|
|
|
0.250.2
by Jelmer Vernooij
Make it work for evolution. |
341 |
stream = self.repository.iter_files_bytes( |
342 |
((key[0], key[1], key) for key in keys)) |
|
|
0.200.856
by Jelmer Vernooij
Support reconstructing multiple blobs at the same time. |
343 |
for (fileid, revision, expected_sha), chunks in stream: |
|
0.200.854
by Jelmer Vernooij
_get_blob -> _get_blobs. |
344 |
blob = Blob() |
345 |
blob.chunked = chunks |
|
|
0.200.868
by Jelmer Vernooij
Cope with no-change merges. |
346 |
if blob.id != expected_sha and blob.data == "": |
|
0.200.854
by Jelmer Vernooij
_get_blob -> _get_blobs. |
347 |
# Perhaps it's a symlink ?
|
348 |
tree = self.tree_cache.revision_tree(revision) |
|
349 |
entry = tree.inventory[fileid] |
|
|
0.200.868
by Jelmer Vernooij
Cope with no-change merges. |
350 |
if entry.kind == 'symlink': |
351 |
blob = symlink_to_blob(entry) |
|
|
0.200.854
by Jelmer Vernooij
_get_blob -> _get_blobs. |
352 |
_check_expected_sha(expected_sha, blob) |
353 |
yield blob |
|
|
0.200.229
by Jelmer Vernooij
More work on converter. |
354 |
|
|
0.200.855
by Jelmer Vernooij
_get_ -> _reconstruct_. |
355 |
def _reconstruct_tree(self, fileid, revid, inv, unusual_modes, |
356 |
expected_sha=None): |
|
|
0.200.343
by Jelmer Vernooij
Use file ids consistently in map. |
357 |
"""Return a Git Tree object from a file id and a revision stored in bzr. |
|
0.200.249
by Jelmer Vernooij
Implement Tree. |
358 |
|
|
0.200.343
by Jelmer Vernooij
Use file ids consistently in map. |
359 |
:param fileid: fileid in the tree.
|
|
0.200.249
by Jelmer Vernooij
Implement Tree. |
360 |
:param revision: Revision of the tree.
|
361 |
"""
|
|
|
0.200.776
by Jelmer Vernooij
Remove unnecessary lookups. |
362 |
def get_ie_sha1(entry): |
363 |
if entry.kind == "directory": |
|
|
0.200.808
by Jelmer Vernooij
Avoid recalculating tree shas we already have. |
364 |
try: |
|
0.200.859
by Jelmer Vernooij
Trivial cleanups. |
365 |
return self._cache.idmap.lookup_tree_id(entry.file_id, |
366 |
revid) |
|
|
0.200.812
by Jelmer Vernooij
Catch KeyError from lookup_tree as well - some caches (such as sqlite) don't store all trees, only some. |
367 |
except (NotImplementedError, KeyError): |
|
0.200.855
by Jelmer Vernooij
_get_ -> _reconstruct_. |
368 |
obj = self._reconstruct_tree(entry.file_id, revid, inv, |
|
0.200.808
by Jelmer Vernooij
Avoid recalculating tree shas we already have. |
369 |
unusual_modes) |
370 |
if obj is None: |
|
371 |
return None |
|
372 |
else: |
|
373 |
return obj.id |
|
|
0.200.776
by Jelmer Vernooij
Remove unnecessary lookups. |
374 |
elif entry.kind in ("file", "symlink"): |
|
0.200.868
by Jelmer Vernooij
Cope with no-change merges. |
375 |
try: |
376 |
return self._cache.idmap.lookup_blob_id(entry.file_id, |
|
377 |
entry.revision) |
|
378 |
except KeyError: |
|
379 |
# no-change merge?
|
|
380 |
return self._reconstruct_blobs( |
|
381 |
[(entry.file_id, entry.revision, None)]).next().id |
|
|
0.200.776
by Jelmer Vernooij
Remove unnecessary lookups. |
382 |
else: |
383 |
raise AssertionError("unknown entry kind '%s'" % entry.kind) |
|
384 |
tree = directory_to_tree(inv[fileid], get_ie_sha1, unusual_modes) |
|
|
0.200.793
by Jelmer Vernooij
Make _check_expected_sha a global fn. |
385 |
_check_expected_sha(expected_sha, tree) |
|
0.200.249
by Jelmer Vernooij
Implement Tree. |
386 |
return tree |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
387 |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
388 |
def get_parents(self, sha): |
|
0.200.454
by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server. |
389 |
"""Retrieve the parents of a Git commit by SHA1. |
390 |
||
391 |
:param sha: SHA1 of the commit
|
|
392 |
:raises: KeyError, NotCommitError
|
|
393 |
"""
|
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
394 |
return self[sha].parents |
395 |
||
|
0.200.364
by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision. |
396 |
def _lookup_revision_sha1(self, revid): |
|
0.200.449
by Jelmer Vernooij
Use BazaarObjectStore to find matching SHA1s for bzr revisions. |
397 |
"""Return the SHA1 matching a Bazaar revision.""" |
|
0.200.541
by Jelmer Vernooij
Cope with NULL_REVISION. |
398 |
if revid == NULL_REVISION: |
399 |
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. |
400 |
try: |
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
401 |
return self._cache.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. |
402 |
except KeyError: |
|
0.200.682
by Jelmer Vernooij
Avoid doing a full sha map update if we already know the SHA1. |
403 |
try: |
404 |
return mapping_registry.parse_revision_id(revid)[0] |
|
405 |
except errors.InvalidRevisionId: |
|
406 |
self._update_sha_map(revid) |
|
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
407 |
return self._cache.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. |
408 |
|
|
0.200.310
by Jelmer Vernooij
Fix pull from remote branches. |
409 |
def get_raw(self, sha): |
|
0.200.454
by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server. |
410 |
"""Get the raw representation of a Git object by SHA1. |
411 |
||
412 |
:param sha: SHA1 of the git object
|
|
413 |
"""
|
|
|
0.200.566
by Jelmer Vernooij
Fix ObjectStore.get_raw() . |
414 |
obj = self[sha] |
415 |
return (obj.type, obj.as_raw_string()) |
|
|
0.200.310
by Jelmer Vernooij
Fix pull from remote branches. |
416 |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
417 |
def __contains__(self, sha): |
418 |
# See if sha is in map
|
|
419 |
try: |
|
|
0.200.568
by Jelmer Vernooij
Properly check that matching bzr objects exist. |
420 |
(type, type_data) = self._lookup_git_sha(sha) |
421 |
if type == "commit": |
|
422 |
return self.repository.has_revision(type_data[0]) |
|
423 |
elif type == "blob": |
|
424 |
return self.repository.texts.has_version(type_data) |
|
425 |
elif type == "tree": |
|
426 |
return self.repository.has_revision(type_data[1]) |
|
427 |
else: |
|
428 |
raise AssertionError("Unknown object type '%s'" % type) |
|
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
429 |
except KeyError: |
430 |
return False |
|
431 |
||
432 |
def _lookup_git_sha(self, sha): |
|
433 |
# See if sha is in map
|
|
434 |
try: |
|
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
435 |
return self._cache.idmap.lookup_git_sha(sha) |
|
0.200.228
by Jelmer Vernooij
Split out map. |
436 |
except KeyError: |
|
0.200.670
by Jelmer Vernooij
Fix symlinks. |
437 |
# if not, see if there are any unconverted revisions and add them
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
438 |
# to the map, search for sha in map again
|
439 |
self._update_sha_map() |
|
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
440 |
return self._cache.idmap.lookup_git_sha(sha) |
|
0.200.437
by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents. |
441 |
|
442 |
def __getitem__(self, sha): |
|
|
0.200.849
by Jelmer Vernooij
Allow cache backends to decide when to add entries rather than adding once per commit. |
443 |
if self._cache.content_cache is not None: |
|
0.200.840
by Jelmer Vernooij
Support using content cache. |
444 |
try: |
|
0.200.847
by Jelmer Vernooij
Add BzrGitCache object. |
445 |
return self._cache.content_cache[sha] |
|
0.200.840
by Jelmer Vernooij
Support using content cache. |
446 |
except KeyError: |
447 |
pass
|
|
|
0.200.850
by Jelmer Vernooij
Fix tests. |
448 |
(type, type_data) = self._lookup_git_sha(sha) |
|
0.200.228
by Jelmer Vernooij
Split out map. |
449 |
# convert object to git object
|
|
0.200.229
by Jelmer Vernooij
More work on converter. |
450 |
if type == "commit": |
|
0.200.787
by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents. |
451 |
(revid, tree_sha) = type_data |
|
0.200.478
by Jelmer Vernooij
Cope with disappeared revisions. |
452 |
try: |
|
0.200.787
by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents. |
453 |
rev = self.repository.get_revision(revid) |
|
0.200.478
by Jelmer Vernooij
Cope with disappeared revisions. |
454 |
except errors.NoSuchRevision: |
|
0.200.836
by Jelmer Vernooij
Allow content cache. |
455 |
trace.mutter('entry for %s %s in shamap: %r, but not found in ' |
456 |
'repository', type, sha, type_data) |
|
|
0.200.478
by Jelmer Vernooij
Cope with disappeared revisions. |
457 |
raise KeyError(sha) |
|
0.200.858
by Jelmer Vernooij
Fix typo. |
458 |
commit = self._reconstruct_commit(rev, tree_sha) |
|
0.200.793
by Jelmer Vernooij
Make _check_expected_sha a global fn. |
459 |
_check_expected_sha(sha, commit) |
|
0.200.785
by Jelmer Vernooij
Eliminate _get_commit. |
460 |
return commit |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
461 |
elif type == "blob": |
|
0.200.787
by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents. |
462 |
(fileid, revision) = type_data |
|
0.200.855
by Jelmer Vernooij
_get_ -> _reconstruct_. |
463 |
return self._reconstruct_blobs([(fileid, revision, sha)]).next() |
|
0.200.229
by Jelmer Vernooij
More work on converter. |
464 |
elif type == "tree": |
|
0.200.787
by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents. |
465 |
(fileid, revid) = type_data |
|
0.200.561
by Jelmer Vernooij
Cope with revisions pointed to by trees in the shamap disappearing. |
466 |
try: |
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
467 |
tree = self.tree_cache.revision_tree(revid) |
|
0.200.787
by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents. |
468 |
rev = self.repository.get_revision(revid) |
|
0.200.561
by Jelmer Vernooij
Cope with revisions pointed to by trees in the shamap disappearing. |
469 |
except errors.NoSuchRevision: |
470 |
trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data) |
|
471 |
raise KeyError(sha) |
|
|
0.200.556
by Jelmer Vernooij
Fix syntax error. |
472 |
unusual_modes = extract_unusual_modes(rev) |
|
0.200.491
by Jelmer Vernooij
Cope with map for Tree objects becoming invalid. |
473 |
try: |
|
0.200.855
by Jelmer Vernooij
_get_ -> _reconstruct_. |
474 |
return self._reconstruct_tree(fileid, revid, tree.inventory, |
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
475 |
unusual_modes, expected_sha=sha) |
|
0.200.491
by Jelmer Vernooij
Cope with map for Tree objects becoming invalid. |
476 |
except errors.NoSuchRevision: |
477 |
raise KeyError(sha) |
|
|
0.200.228
by Jelmer Vernooij
Split out map. |
478 |
else: |
479 |
raise AssertionError("Unknown object type '%s'" % type) |
|
|
0.200.782
by Jelmer Vernooij
Add custom generate_pack_contents implementation. |
480 |
|
|
0.200.871
by Jelmer Vernooij
Fix fetching from bzr-git's server. |
481 |
def generate_pack_contents(self, have, want, progress=None, get_tagged=None): |
|
0.200.782
by Jelmer Vernooij
Add custom generate_pack_contents implementation. |
482 |
"""Iterate over the contents of a pack file. |
483 |
||
484 |
:param have: List of SHA1s of objects that should not be sent
|
|
485 |
:param want: List of SHA1s of objects that should be sent
|
|
486 |
"""
|
|
|
0.200.787
by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents. |
487 |
processed = set() |
488 |
for commit_sha in have: |
|
489 |
try: |
|
490 |
(type, (revid, tree_sha)) = self._lookup_git_sha(commit_sha) |
|
491 |
except KeyError: |
|
492 |
pass
|
|
493 |
else: |
|
494 |
assert type == "commit" |
|
495 |
processed.add(revid) |
|
496 |
pending = set() |
|
497 |
for commit_sha in want: |
|
498 |
if commit_sha in have: |
|
499 |
continue
|
|
500 |
(type, (revid, tree_sha)) = self._lookup_git_sha(commit_sha) |
|
501 |
assert type == "commit" |
|
502 |
pending.add(revid) |
|
503 |
todo = set() |
|
504 |
while pending: |
|
505 |
processed.update(pending) |
|
506 |
next_map = self.repository.get_parent_map(pending) |
|
507 |
next_pending = set() |
|
508 |
for item in next_map.iteritems(): |
|
509 |
todo.add(item[0]) |
|
510 |
next_pending.update(p for p in item[1] if p not in processed) |
|
511 |
pending = next_pending |
|
512 |
if NULL_REVISION in todo: |
|
513 |
todo.remove(NULL_REVISION) |
|
514 |
trace.mutter('sending revisions %r', todo) |
|
515 |
ret = [] |
|
516 |
pb = ui.ui_factory.nested_progress_bar() |
|
517 |
try: |
|
518 |
for i, revid in enumerate(todo): |
|
519 |
pb.update("generating git objects", i, len(todo)) |
|
520 |
rev = self.repository.get_revision(revid) |
|
|
0.200.852
by Jelmer Vernooij
Cache trees rather than inventories. |
521 |
tree = self.tree_cache.revision_tree(revid) |
522 |
for path, obj, ie in self._revision_to_objects(rev, tree): |
|
|
0.200.787
by Jelmer Vernooij
Implement custom ObjectWalker.generate_pack_contents. |
523 |
ret.append((obj, path)) |
524 |
finally: |
|
525 |
pb.finished() |
|
526 |
return ret |
|
|
0.251.1
by Jelmer Vernooij
Implement ObjectStore.add_{thin_,}pack. |
527 |
|
528 |
def add_thin_pack(self): |
|
529 |
import tempfile |
|
530 |
import os |
|
531 |
fd, path = tempfile.mkstemp(suffix=".pack") |
|
532 |
f = os.fdopen(fd, 'wb') |
|
533 |
def commit(): |
|
534 |
from dulwich.pack import PackData, Pack |
|
535 |
from bzrlib.plugins.git.fetch import import_git_objects |
|
536 |
os.fsync(fd) |
|
537 |
f.close() |
|
538 |
if os.path.getsize(path) == 0: |
|
539 |
return
|
|
540 |
pd = PackData(path) |
|
541 |
pd.create_index_v2(path[:-5]+".idx", self.object_store.get_raw) |
|
542 |
||
543 |
p = Pack(path[:-5]) |
|
544 |
self.repository.lock_write() |
|
545 |
try: |
|
546 |
self.repository.start_write_group() |
|
547 |
try: |
|
548 |
import_git_objects(self.repository, self.mapping, |
|
549 |
p.iterobjects(get_raw=self.get_raw), |
|
550 |
self.object_store) |
|
551 |
except: |
|
552 |
self.repository.abort_write_group() |
|
553 |
raise
|
|
554 |
else: |
|
555 |
self.repository.commit_write_group() |
|
556 |
finally: |
|
557 |
self.repository.unlock() |
|
558 |
return f, commit |
|
559 |
||
560 |
# The pack isn't kept around anyway, so no point
|
|
561 |
# in treating full packs different from thin packs
|
|
562 |
add_pack = add_thin_pack |