bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
1 |
# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
|
0.200.135
by Jelmer Vernooij
Add stub for fetching data. |
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 |
||
0.200.292
by Jelmer Vernooij
Fix formatting. |
17 |
from cStringIO import ( |
18 |
StringIO, |
|
19 |
)
|
|
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
20 |
import dulwich as git |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
21 |
from dulwich.client import ( |
22 |
SimpleFetchGraphWalker, |
|
23 |
)
|
|
24 |
from dulwich.objects import ( |
|
25 |
Commit, |
|
0.200.303
by Jelmer Vernooij
Cope with tags during fetch. |
26 |
Tag, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
27 |
)
|
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
28 |
|
29 |
from bzrlib import ( |
|
0.231.2
by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet). |
30 |
debug, |
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
31 |
osutils, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
32 |
trace, |
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
33 |
ui, |
34 |
urlutils, |
|
35 |
)
|
|
36 |
from bzrlib.errors import ( |
|
37 |
InvalidRevisionId, |
|
38 |
NoSuchRevision, |
|
39 |
)
|
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
40 |
from bzrlib.inventory import ( |
41 |
Inventory, |
|
0.229.2
by Jelmer Vernooij
Initial work relying on inventory deltas. |
42 |
InventoryDirectory, |
43 |
InventoryFile, |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
44 |
InventoryLink, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
45 |
)
|
0.200.301
by Jelmer Vernooij
Cache inventories created. |
46 |
from bzrlib.lru_cache import ( |
47 |
LRUCache, |
|
48 |
)
|
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
49 |
from bzrlib.repository import ( |
50 |
InterRepository, |
|
51 |
)
|
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
52 |
from bzrlib.revision import ( |
53 |
NULL_REVISION, |
|
54 |
)
|
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
55 |
from bzrlib.tsort import ( |
56 |
topo_sort, |
|
57 |
)
|
|
0.200.135
by Jelmer Vernooij
Add stub for fetching data. |
58 |
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
59 |
from bzrlib.plugins.git.converter import ( |
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
60 |
BazaarObjectStore, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
61 |
)
|
0.231.2
by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet). |
62 |
from bzrlib.plugins.git.mapping import ( |
63 |
text_to_blob, |
|
64 |
)
|
|
0.200.169
by Jelmer Vernooij
Fix branch cloning. |
65 |
from bzrlib.plugins.git.repository import ( |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
66 |
LocalGitRepository, |
67 |
GitRepository, |
|
0.200.289
by Jelmer Vernooij
Cope with new member variables in RepositoryFormat. |
68 |
GitRepositoryFormat, |
0.200.261
by Jelmer Vernooij
More formatting fixes. |
69 |
)
|
70 |
from bzrlib.plugins.git.remote import ( |
|
71 |
RemoteGitRepository, |
|
72 |
)
|
|
0.216.4
by Jelmer Vernooij
Add basic pack fetch infrastructure. |
73 |
|
74 |
||
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
75 |
class BzrFetchGraphWalker(object): |
0.200.196
by Jelmer Vernooij
Add simple tests and docstrings for GraphWalker. |
76 |
"""GraphWalker implementation that uses a Bazaar repository.""" |
0.216.4
by Jelmer Vernooij
Add basic pack fetch infrastructure. |
77 |
|
78 |
def __init__(self, repository, mapping): |
|
79 |
self.repository = repository |
|
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
80 |
self.mapping = mapping |
81 |
self.done = set() |
|
82 |
self.heads = set(repository.all_revision_ids()) |
|
0.216.4
by Jelmer Vernooij
Add basic pack fetch infrastructure. |
83 |
self.parents = {} |
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
84 |
|
0.200.196
by Jelmer Vernooij
Add simple tests and docstrings for GraphWalker. |
85 |
def __iter__(self): |
86 |
return iter(self.next, None) |
|
87 |
||
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
88 |
def ack(self, sha): |
89 |
revid = self.mapping.revision_id_foreign_to_bzr(sha) |
|
90 |
self.remove(revid) |
|
91 |
||
92 |
def remove(self, revid): |
|
93 |
self.done.add(revid) |
|
0.200.177
by Jelmer Vernooij
Add git-import command. |
94 |
if revid in self.heads: |
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
95 |
self.heads.remove(revid) |
96 |
if revid in self.parents: |
|
97 |
for p in self.parents[revid]: |
|
98 |
self.remove(p) |
|
0.216.4
by Jelmer Vernooij
Add basic pack fetch infrastructure. |
99 |
|
100 |
def next(self): |
|
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
101 |
while self.heads: |
102 |
ret = self.heads.pop() |
|
103 |
ps = self.repository.get_parent_map([ret])[ret] |
|
0.216.4
by Jelmer Vernooij
Add basic pack fetch infrastructure. |
104 |
self.parents[ret] = ps |
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
105 |
self.heads.update([p for p in ps if not p in self.done]) |
106 |
try: |
|
107 |
self.done.add(ret) |
|
0.200.195
by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface. |
108 |
return self.mapping.revision_id_bzr_to_foreign(ret)[0] |
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
109 |
except InvalidRevisionId: |
110 |
pass
|
|
0.216.4
by Jelmer Vernooij
Add basic pack fetch infrastructure. |
111 |
return None |
112 |
||
0.200.140
by Jelmer Vernooij
Support negotiating with remote git repository and receiving pack. |
113 |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
114 |
def import_git_blob(texts, mapping, path, hexsha, base_inv, parent_id, |
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
115 |
revision_id, parent_invs, shagitmap, lookup_object, executable, symlink): |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
116 |
"""Import a git blob object into a bzr repository. |
117 |
||
0.200.261
by Jelmer Vernooij
More formatting fixes. |
118 |
:param texts: VersionedFiles to add to
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
119 |
:param path: Path in the tree
|
120 |
:param blob: A git blob
|
|
0.229.1
by Jelmer Vernooij
Start working with inventory deltas. |
121 |
:return: Inventory delta for this file
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
122 |
"""
|
123 |
file_id = mapping.generate_file_id(path) |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
124 |
if symlink: |
125 |
cls = InventoryLink |
|
126 |
else: |
|
127 |
cls = InventoryFile |
|
128 |
# We just have to hope this is indeed utf-8:
|
|
129 |
ie = cls(file_id, urlutils.basename(path).decode("utf-8"), |
|
130 |
parent_id) |
|
131 |
ie.executable = executable |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
132 |
# See if this has changed at all
|
133 |
try: |
|
134 |
base_sha = shagitmap.lookup_blob(file_id, base_inv.revision_id) |
|
135 |
except KeyError: |
|
136 |
base_sha = None |
|
137 |
else: |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
138 |
if (base_sha == hexsha and base_inv[file_id].executable == ie.executable |
139 |
and base_inv[file_id].kind == ie.kind): |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
140 |
# If nothing has changed since the base revision, we're done
|
141 |
return [] |
|
142 |
if base_sha == hexsha: |
|
143 |
ie.text_size = base_inv[file_id].text_size |
|
144 |
ie.text_sha1 = base_inv[file_id].text_sha1 |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
145 |
ie.symlink_target = base_inv[file_id].symlink_target |
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
146 |
ie.revision = base_inv[file_id].revision |
147 |
else: |
|
148 |
blob = lookup_object(hexsha) |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
149 |
if ie.kind == "symlink": |
150 |
ie.symlink_target = blob.data |
|
151 |
ie.text_size = None |
|
152 |
ie.text_sha1 = None |
|
153 |
else: |
|
154 |
ie.text_size = len(blob.data) |
|
155 |
ie.text_sha1 = osutils.sha_string(blob.data) |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
156 |
# Check what revision we should store
|
0.200.283
by Jelmer Vernooij
Avoid storing repeated texts for blobs. |
157 |
parent_keys = [] |
158 |
for pinv in parent_invs: |
|
0.200.285
by Jelmer Vernooij
Simplify blob import code. |
159 |
if not file_id in pinv: |
160 |
continue
|
|
161 |
if pinv[file_id].text_sha1 == ie.text_sha1: |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
162 |
# found a revision in one of the parents to use
|
0.200.283
by Jelmer Vernooij
Avoid storing repeated texts for blobs. |
163 |
ie.revision = pinv[file_id].revision |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
164 |
break
|
0.200.286
by Jelmer Vernooij
Prevent creating repeated directory texts. |
165 |
parent_keys.append((file_id, pinv[file_id].revision)) |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
166 |
if ie.revision is None: |
167 |
# Need to store a new revision
|
|
168 |
ie.revision = revision_id |
|
169 |
assert file_id is not None |
|
170 |
assert ie.revision is not None |
|
171 |
texts.add_lines((file_id, ie.revision), parent_keys, |
|
172 |
osutils.split_lines(blob.data)) |
|
0.231.2
by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet). |
173 |
if "verify" in debug.debug_flags: |
174 |
assert text_to_blob(blob.data).id == hexsha |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
175 |
shagitmap.add_entry(hexsha, "blob", (ie.file_id, ie.revision)) |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
176 |
if file_id in base_inv: |
177 |
old_path = base_inv.id2path(file_id) |
|
178 |
else: |
|
179 |
old_path = None |
|
180 |
return [(old_path, path, file_id, ie)] |
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
181 |
|
182 |
||
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
183 |
def import_git_tree(texts, mapping, path, hexsha, base_inv, parent_id, |
0.229.2
by Jelmer Vernooij
Initial work relying on inventory deltas. |
184 |
revision_id, parent_invs, shagitmap, lookup_object): |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
185 |
"""Import a git tree object into a bzr repository. |
186 |
||
0.200.261
by Jelmer Vernooij
More formatting fixes. |
187 |
:param texts: VersionedFiles object to add to
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
188 |
:param path: Path in the tree
|
189 |
:param tree: A git tree object
|
|
0.229.2
by Jelmer Vernooij
Initial work relying on inventory deltas. |
190 |
:param base_inv: Base inventory against which to return inventory delta
|
0.229.1
by Jelmer Vernooij
Start working with inventory deltas. |
191 |
:return: Inventory delta for this subtree
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
192 |
"""
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
193 |
ret = [] |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
194 |
file_id = mapping.generate_file_id(path) |
0.200.297
by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..). |
195 |
# We just have to hope this is indeed utf-8:
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
196 |
ie = InventoryDirectory(file_id, urlutils.basename(path.decode("utf-8")), |
197 |
parent_id) |
|
198 |
if not file_id in base_inv: |
|
199 |
# Newly appeared here
|
|
200 |
ie.revision = revision_id |
|
201 |
texts.add_lines((file_id, ie.revision), [], []) |
|
202 |
ret.append((None, path, file_id, ie)) |
|
203 |
else: |
|
204 |
# See if this has changed at all
|
|
0.200.287
by Jelmer Vernooij
Skip tree sha's already in the git sha map. |
205 |
try: |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
206 |
base_sha = shagitmap.lookup_tree(path, base_inv.revision_id) |
0.200.287
by Jelmer Vernooij
Skip tree sha's already in the git sha map. |
207 |
except KeyError: |
208 |
pass
|
|
0.200.288
by Jelmer Vernooij
Add test for init-repo. |
209 |
else: |
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
210 |
if base_sha == hexsha: |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
211 |
# If nothing has changed since the base revision, we're done
|
212 |
return [] |
|
213 |
# Remember for next time
|
|
0.200.300
by Jelmer Vernooij
Fix recursive deletion of dirs. |
214 |
existing_children = set() |
0.231.2
by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet). |
215 |
if "verify" in debug.debug_flags: |
216 |
# FIXME:
|
|
217 |
assert False |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
218 |
shagitmap.add_entry(hexsha, "tree", (file_id, revision_id)) |
219 |
tree = lookup_object(hexsha) |
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
220 |
for mode, name, hexsha in tree.entries(): |
221 |
entry_kind = (mode & 0700000) / 0100000 |
|
222 |
basename = name.decode("utf-8") |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
223 |
existing_children.add(basename) |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
224 |
if path == "": |
225 |
child_path = name |
|
226 |
else: |
|
227 |
child_path = urlutils.join(path, name) |
|
228 |
if entry_kind == 0: |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
229 |
ret.extend(import_git_tree(texts, mapping, child_path, hexsha, base_inv, |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
230 |
file_id, revision_id, parent_invs, shagitmap, lookup_object)) |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
231 |
elif entry_kind == 1: |
0.200.159
by Jelmer Vernooij
Fix branch tests. |
232 |
fs_mode = mode & 0777 |
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
233 |
file_kind = (mode & 070000) / 010000 |
234 |
if file_kind == 0: # regular file |
|
235 |
symlink = False |
|
236 |
elif file_kind == 2: |
|
237 |
symlink = True |
|
238 |
else: |
|
239 |
raise AssertionError("Unknown file kind, mode=%r" % (mode,)) |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
240 |
ret.extend(import_git_blob(texts, mapping, child_path, hexsha, base_inv, |
241 |
file_id, revision_id, parent_invs, shagitmap, lookup_object, |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
242 |
bool(fs_mode & 0111), symlink)) |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
243 |
else: |
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
244 |
raise AssertionError("Unknown object kind, perms=%r." % (mode,)) |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
245 |
# Remove any children that have disappeared
|
246 |
if file_id in base_inv: |
|
0.200.300
by Jelmer Vernooij
Fix recursive deletion of dirs. |
247 |
deletable = [v for k,v in base_inv[file_id].children.iteritems() if k not in existing_children] |
248 |
while deletable: |
|
249 |
ie = deletable.pop() |
|
250 |
ret.append((base_inv.id2path(ie.file_id), None, ie.file_id, None)) |
|
251 |
if ie.kind == "directory": |
|
252 |
deletable.extend(ie.children.values()) |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
253 |
return ret |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
254 |
|
255 |
||
0.200.226
by Jelmer Vernooij
Merge thin-pack work. |
256 |
def import_git_objects(repo, mapping, object_iter, target_git_object_retriever, |
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
257 |
heads, pb=None): |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
258 |
"""Import a set of git objects into a bzr repository. |
259 |
||
260 |
:param repo: Bazaar repository
|
|
261 |
:param mapping: Mapping to use
|
|
262 |
:param object_iter: Iterator over Git objects.
|
|
263 |
"""
|
|
264 |
# TODO: a more (memory-)efficient implementation of this
|
|
0.200.158
by Jelmer Vernooij
fetch works \o/ |
265 |
graph = [] |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
266 |
root_trees = {} |
0.200.158
by Jelmer Vernooij
fetch works \o/ |
267 |
revisions = {} |
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
268 |
checked = set() |
269 |
heads = list(heads) |
|
0.200.301
by Jelmer Vernooij
Cache inventories created. |
270 |
parent_invs_cache = LRUCache(50) |
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
271 |
# Find and convert commit objects
|
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
272 |
while heads: |
273 |
if pb is not None: |
|
274 |
pb.update("finding revisions to fetch", len(graph), None) |
|
275 |
head = heads.pop() |
|
276 |
assert isinstance(head, str) |
|
0.200.310
by Jelmer Vernooij
Fix pull from remote branches. |
277 |
try: |
278 |
o = object_iter[head] |
|
279 |
except KeyError: |
|
280 |
continue
|
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
281 |
if isinstance(o, Commit): |
282 |
rev = mapping.import_commit(o) |
|
0.200.295
by Jelmer Vernooij
Don't re-import revisions already fetched. |
283 |
if repo.has_revision(rev.revision_id): |
284 |
continue
|
|
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
285 |
root_trees[rev.revision_id] = o.tree |
0.200.158
by Jelmer Vernooij
fetch works \o/ |
286 |
revisions[rev.revision_id] = rev |
287 |
graph.append((rev.revision_id, rev.parent_ids)) |
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
288 |
target_git_object_retriever._idmap.add_entry(o.sha().hexdigest(), |
289 |
"commit", (rev.revision_id, o._tree)) |
|
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
290 |
heads.extend([p for p in o.parents if p not in checked]) |
0.200.303
by Jelmer Vernooij
Cope with tags during fetch. |
291 |
elif isinstance(o, Tag): |
292 |
heads.append(o.object[1]) |
|
0.200.296
by Jelmer Vernooij
Avoid iterating over all objects just to find the *Commits* to retrieve. |
293 |
else: |
294 |
trace.warning("Unable to import head object %r" % o) |
|
295 |
checked.add(head) |
|
0.200.158
by Jelmer Vernooij
fetch works \o/ |
296 |
# Order the revisions
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
297 |
# Create the inventory objects
|
0.200.158
by Jelmer Vernooij
fetch works \o/ |
298 |
for i, revid in enumerate(topo_sort(graph)): |
299 |
if pb is not None: |
|
300 |
pb.update("fetching revisions", i, len(graph)) |
|
301 |
rev = revisions[revid] |
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
302 |
# We have to do this here, since we have to walk the tree and
|
0.200.295
by Jelmer Vernooij
Don't re-import revisions already fetched. |
303 |
# we need to make sure to import the blobs / trees with the right
|
0.200.151
by Jelmer Vernooij
Support converting git objects to bzr objects. |
304 |
# path; this may involve adding them more than once.
|
305 |
def lookup_object(sha): |
|
0.200.301
by Jelmer Vernooij
Cache inventories created. |
306 |
try: |
0.200.217
by Jelmer Vernooij
Avoid reading everything into memory when accessing objects. |
307 |
return object_iter[sha] |
0.200.301
by Jelmer Vernooij
Cache inventories created. |
308 |
except KeyError: |
309 |
return target_git_object_retriever[sha] |
|
310 |
parent_invs = [] |
|
311 |
for parent_id in rev.parent_ids: |
|
312 |
try: |
|
313 |
parent_invs.append(parent_invs_cache[parent_id]) |
|
314 |
except KeyError: |
|
315 |
parent_inv = repo.get_inventory(parent_id) |
|
316 |
parent_invs.append(parent_inv) |
|
317 |
parent_invs_cache[parent_id] = parent_inv |
|
0.229.1
by Jelmer Vernooij
Start working with inventory deltas. |
318 |
if parent_invs == []: |
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
319 |
base_inv = Inventory(root_id=None) |
0.229.1
by Jelmer Vernooij
Start working with inventory deltas. |
320 |
else: |
321 |
base_inv = parent_invs[0] |
|
0.200.304
by Jelmer Vernooij
Try a bit harder to avoid fetching objects we don't need. |
322 |
inv_delta = import_git_tree(repo.texts, mapping, "", |
323 |
root_trees[revid], base_inv, None, revid, parent_invs, |
|
0.229.2
by Jelmer Vernooij
Initial work relying on inventory deltas. |
324 |
target_git_object_retriever._idmap, lookup_object) |
325 |
try: |
|
326 |
basis_id = rev.parent_ids[0] |
|
327 |
except IndexError: |
|
328 |
basis_id = NULL_REVISION |
|
0.229.3
by Jelmer Vernooij
Use inventory deltas internally so fetch is O(changes) rather than O(tree). |
329 |
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id, |
0.229.2
by Jelmer Vernooij
Initial work relying on inventory deltas. |
330 |
inv_delta, rev.revision_id, rev.parent_ids) |
0.200.301
by Jelmer Vernooij
Cache inventories created. |
331 |
parent_invs_cache[rev.revision_id] = inv |
0.229.1
by Jelmer Vernooij
Start working with inventory deltas. |
332 |
repo.add_revision(rev.revision_id, rev) |
0.200.272
by Jelmer Vernooij
Actually store idmap. |
333 |
target_git_object_retriever._idmap.commit() |
0.200.141
by Jelmer Vernooij
Separate out local and remote fetching. |
334 |
|
335 |
||
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
336 |
class InterGitNonGitRepository(InterRepository): |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
337 |
"""Base InterRepository that copies revisions from a Git into a non-Git |
0.200.291
by Jelmer Vernooij
Print proper error about not supporting push. |
338 |
repository."""
|
0.200.135
by Jelmer Vernooij
Add stub for fetching data. |
339 |
|
0.200.289
by Jelmer Vernooij
Cope with new member variables in RepositoryFormat. |
340 |
_matching_repo_format = GitRepositoryFormat() |
0.200.143
by Jelmer Vernooij
Reoncile InterGitRepository objects. |
341 |
|
342 |
@staticmethod
|
|
343 |
def _get_repo_format_to_test(): |
|
344 |
return None |
|
345 |
||
0.200.135
by Jelmer Vernooij
Add stub for fetching data. |
346 |
def copy_content(self, revision_id=None, pb=None): |
347 |
"""See InterRepository.copy_content.""" |
|
348 |
self.fetch(revision_id, pb, find_ghosts=False) |
|
349 |
||
0.200.295
by Jelmer Vernooij
Don't re-import revisions already fetched. |
350 |
def fetch(self, revision_id=None, pb=None, find_ghosts=False, mapping=None, |
351 |
fetch_spec=None): |
|
0.200.247
by Jelmer Vernooij
Fix git-import. |
352 |
self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts, |
353 |
mapping=mapping, fetch_spec=fetch_spec) |
|
354 |
||
355 |
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False, |
|
356 |
mapping=None, fetch_spec=None): |
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
357 |
if mapping is None: |
358 |
mapping = self.source.get_mapping() |
|
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
359 |
if revision_id is not None: |
360 |
interesting_heads = [revision_id] |
|
361 |
elif fetch_spec is not None: |
|
362 |
interesting_heads = fetch_spec.heads |
|
363 |
else: |
|
364 |
interesting_heads = None |
|
0.200.247
by Jelmer Vernooij
Fix git-import. |
365 |
self._refs = {} |
366 |
def determine_wants(refs): |
|
367 |
self._refs = refs |
|
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
368 |
if interesting_heads is None: |
0.200.247
by Jelmer Vernooij
Fix git-import. |
369 |
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")] |
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
370 |
else: |
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
371 |
ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads] |
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
372 |
return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))] |
0.200.247
by Jelmer Vernooij
Fix git-import. |
373 |
self.fetch_objects(determine_wants, mapping, pb) |
374 |
return self._refs |
|
0.200.225
by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches. |
375 |
|
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
376 |
|
377 |
||
378 |
class InterRemoteGitNonGitRepository(InterGitNonGitRepository): |
|
379 |
"""InterRepository that copies revisions from a remote Git into a non-Git |
|
380 |
repository."""
|
|
381 |
||
382 |
def fetch_objects(self, determine_wants, mapping, pb=None): |
|
383 |
def progress(text): |
|
384 |
pb.update("git: %s" % text.rstrip("\r\n"), 0, 0) |
|
385 |
graph_walker = BzrFetchGraphWalker(self.target, mapping) |
|
386 |
create_pb = None |
|
387 |
if pb is None: |
|
388 |
create_pb = pb = ui.ui_factory.nested_progress_bar() |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
389 |
target_git_object_retriever = BazaarObjectStore(self.target, mapping) |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
390 |
recorded_wants = [] |
391 |
||
392 |
def record_determine_wants(heads): |
|
393 |
wants = determine_wants(heads) |
|
394 |
recorded_wants.extend(wants) |
|
395 |
return wants |
|
396 |
||
397 |
try: |
|
398 |
self.target.lock_write() |
|
399 |
try: |
|
400 |
self.target.start_write_group() |
|
401 |
try: |
|
402 |
objects_iter = self.source.fetch_objects( |
|
403 |
record_determine_wants, |
|
404 |
graph_walker, |
|
0.200.310
by Jelmer Vernooij
Fix pull from remote branches. |
405 |
target_git_object_retriever.get_raw, |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
406 |
progress) |
407 |
import_git_objects(self.target, mapping, objects_iter, |
|
408 |
target_git_object_retriever, recorded_wants, pb) |
|
409 |
finally: |
|
410 |
self.target.commit_write_group() |
|
411 |
finally: |
|
412 |
self.target.unlock() |
|
413 |
finally: |
|
414 |
if create_pb: |
|
415 |
create_pb.finished() |
|
416 |
||
417 |
@staticmethod
|
|
418 |
def is_compatible(source, target): |
|
419 |
"""Be compatible with GitRepository.""" |
|
420 |
# FIXME: Also check target uses VersionedFile
|
|
421 |
return (isinstance(source, RemoteGitRepository) and |
|
422 |
target.supports_rich_root() and |
|
423 |
not isinstance(target, GitRepository)) |
|
424 |
||
425 |
||
426 |
class InterLocalGitNonGitRepository(InterGitNonGitRepository): |
|
427 |
"""InterRepository that copies revisions from a remote Git into a non-Git |
|
428 |
repository."""
|
|
429 |
||
430 |
def fetch_objects(self, determine_wants, mapping, pb=None): |
|
431 |
wants = determine_wants(self.source._git.get_refs()) |
|
432 |
create_pb = None |
|
433 |
if pb is None: |
|
434 |
create_pb = pb = ui.ui_factory.nested_progress_bar() |
|
0.200.320
by Jelmer Vernooij
Handle lightweight checkouts. |
435 |
target_git_object_retriever = BazaarObjectStore(self.target, mapping) |
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
436 |
try: |
437 |
self.target.lock_write() |
|
438 |
try: |
|
439 |
self.target.start_write_group() |
|
440 |
try: |
|
441 |
import_git_objects(self.target, mapping, |
|
442 |
self.source._git.object_store, |
|
443 |
target_git_object_retriever, wants, pb) |
|
444 |
finally: |
|
445 |
self.target.commit_write_group() |
|
446 |
finally: |
|
447 |
self.target.unlock() |
|
448 |
finally: |
|
449 |
if create_pb: |
|
450 |
create_pb.finished() |
|
451 |
||
452 |
@staticmethod
|
|
453 |
def is_compatible(source, target): |
|
454 |
"""Be compatible with GitRepository.""" |
|
455 |
# FIXME: Also check target uses VersionedFile
|
|
456 |
return (isinstance(source, LocalGitRepository) and |
|
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
457 |
target.supports_rich_root() and |
458 |
not isinstance(target, GitRepository)) |
|
459 |
||
460 |
||
461 |
class InterGitRepository(InterRepository): |
|
0.200.291
by Jelmer Vernooij
Print proper error about not supporting push. |
462 |
"""InterRepository that copies between Git repositories.""" |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
463 |
|
0.200.289
by Jelmer Vernooij
Cope with new member variables in RepositoryFormat. |
464 |
_matching_repo_format = GitRepositoryFormat() |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
465 |
|
466 |
@staticmethod
|
|
467 |
def _get_repo_format_to_test(): |
|
468 |
return None |
|
469 |
||
470 |
def copy_content(self, revision_id=None, pb=None): |
|
471 |
"""See InterRepository.copy_content.""" |
|
472 |
self.fetch(revision_id, pb, find_ghosts=False) |
|
473 |
||
474 |
def fetch(self, revision_id=None, pb=None, find_ghosts=False, |
|
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
475 |
mapping=None, fetch_spec=None): |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
476 |
if mapping is None: |
477 |
mapping = self.source.get_mapping() |
|
478 |
def progress(text): |
|
0.200.261
by Jelmer Vernooij
More formatting fixes. |
479 |
trace.info("git: %s", text) |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
480 |
r = self.target._git |
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
481 |
if revision_id is not None: |
0.200.195
by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface. |
482 |
args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]] |
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
483 |
elif fetch_spec is not None: |
484 |
args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads] |
|
0.200.247
by Jelmer Vernooij
Fix git-import. |
485 |
if fetch_spec is None and revision_id is None: |
486 |
determine_wants = r.object_store.determine_wants_all |
|
0.226.2
by Jelmer Vernooij
Cope with new fetch_spec argument. |
487 |
else: |
0.200.247
by Jelmer Vernooij
Fix git-import. |
488 |
determine_wants = lambda x: [y for y in args if not y in r.object_store] |
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
489 |
|
490 |
graphwalker = SimpleFetchGraphWalker(r.heads().values(), r.get_parents) |
|
491 |
f, commit = r.object_store.add_pack() |
|
492 |
try: |
|
493 |
self.source._git.fetch_pack(path, determine_wants, graphwalker, f.write, progress) |
|
494 |
f.close() |
|
495 |
commit() |
|
496 |
except: |
|
497 |
f.close() |
|
498 |
raise
|
|
499 |
||
500 |
@staticmethod
|
|
501 |
def is_compatible(source, target): |
|
502 |
"""Be compatible with GitRepository.""" |
|
503 |
return (isinstance(source, GitRepository) and |
|
504 |
isinstance(target, GitRepository)) |