1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
|
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Push implementation that simply prints message saying push is not supported."""
from bzrlib import (
errors,
ui,
)
from bzrlib.repository import (
InterRepository,
)
from bzrlib.revision import (
NULL_REVISION,
)
from bzrlib.plugins.git.errors import (
NoPushSupport,
)
from bzrlib.plugins.git.object_store import (
BazaarObjectStore,
)
from bzrlib.plugins.git.repository import (
GitRepository,
LocalGitRepository,
GitRepositoryFormat,
)
from bzrlib.plugins.git.remote import (
RemoteGitRepository,
)
from bzrlib.plugins.git.refs import (
UnpeelMap,
)
class MissingObjectsIterator(object):
"""Iterate over git objects that are missing from a target repository.
"""
def __init__(self, store, source, pb=None):
"""Create a new missing objects iterator.
"""
self.source = source
self._object_store = store
self._pending = []
self.pb = pb
def import_revisions(self, revids, roundtrip):
"""Import a set of revisions into this git repository.
:param revids: Revision ids of revisions to import
:param roundtrip: Whether to roundtrip bzr metadata
"""
for i, revid in enumerate(revids):
if self.pb:
self.pb.update("pushing revisions", i, len(revids))
git_commit = self.import_revision(revid, roundtrip)
yield (revid, git_commit)
def import_revision(self, revid, roundtrip):
"""Import a revision into this Git repository.
:param revid: Revision id of the revision
:param roundtrip: Whether to roundtrip bzr metadata
"""
tree = self._object_store.tree_cache.revision_tree(revid)
rev = self.source.get_revision(revid)
commit = None
for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
roundtrip):
if obj.type_name == "commit":
commit = obj
self._pending.append((obj, path))
return commit.id
def __len__(self):
return len(self._pending)
def __iter__(self):
return iter(self._pending)
class InterToGitRepository(InterRepository):
"""InterRepository that copies into a Git repository."""
_matching_repo_format = GitRepositoryFormat()
def __init__(self, source, target):
super(InterToGitRepository, self).__init__(source, target)
self.mapping = self.target.get_mapping()
self.source_store = BazaarObjectStore(self.source, self.mapping)
@staticmethod
def _get_repo_format_to_test():
return None
def copy_content(self, revision_id=None, pb=None):
"""See InterRepository.copy_content."""
self.fetch(revision_id, pb, find_ghosts=False)
def dfetch_refs(self, update_refs):
"""Fetch non-roundtripped revisions into the target repository.
:param update_refs: Generate refs to fetch. Receives dictionary
with old names to old git shas. Should return a dictionary
of new names to Bazaar revision ids.
:return: revision id map, old refs dictionary and new refs dictionary
"""
raise NotImplementedError(self.dfetch_refs)
def fetch_refs(self, update_refs):
"""Fetch possibly roundtripped revisions into the target repository.
:param update_refs: Generate refs to fetch. Receives dictionary
with old refs (git shas), returns dictionary of new names to
git shas.
:return: old refs, new refs
"""
raise NotImplementedError(self.fetch_refs)
class InterToLocalGitRepository(InterToGitRepository):
"""InterBranch implementation between a Bazaar and a Git repository."""
def __init__(self, source, target):
super(InterToLocalGitRepository, self).__init__(source, target)
self.target_store = self.target._git.object_store
self.target_refs = self.target._git.refs
def _revision_needs_fetching(self, sha_id, revid):
if revid == NULL_REVISION:
return False
if sha_id is None:
try:
sha_id = self.source_store._lookup_revision_sha1(revid)
except KeyError:
return False
try:
return (sha_id not in self.target_store)
except errors.NoSuchRevision:
# Ghost, can't push
return False
def missing_revisions(self, stop_revisions):
"""Find the revisions that are missing from the target repository.
:param stop_revisions: Revisions to check for (tuples with
Git SHA1, bzr revid)
:return: sequence of missing revisions, in topological order
:raise: NoSuchRevision if the stop_revisions are not present in
the source
"""
revid_sha_map = {}
stop_revids = []
stop_sha1s = []
for (sha1, revid) in stop_revisions:
if sha1 is not None and revid is not None:
revid_sha_map[revid] = sha1
elif sha1 is not None:
stop_sha1s.append(sha1)
else:
assert revid is not None
stop_revids.append(revid)
missing = []
graph = self.source.get_graph()
pb = ui.ui_factory.nested_progress_bar()
try:
for revid, _ in graph.iter_ancestry(stop_revids):
assert type(revid) is str
pb.update("determining revisions to fetch", len(missing))
sha1 = revid_sha_map.get(revid)
if self._revision_needs_fetching(sha1, revid):
missing.append(revid)
finally:
pb.finished()
for sha1 in stop_sha1s:
try:
for (kind, (revid, tree_sha, verifiers)) in self.source_store.lookup_git_sha(sha1):
missing.append(revid)
revid_sha_map[revid] = sha1
except KeyError:
continue
return graph.iter_topo_order(missing)
def _get_target_bzr_refs(self):
"""Return a dictionary with references.
:return: Dictionary with reference names as keys and tuples
with Git SHA, Bazaar revid as values.
"""
bzr_refs = {}
refs = {}
for k in self.target._git.refs.allkeys():
v = self.target._git.refs.read_ref(k)
try:
for (kind, type_data) in self.source_store.lookup_git_sha(v):
if kind == "commit" and self.source.has_revision(type_data[0]):
revid = type_data[0]
break
else:
revid = None
except KeyError:
revid = None
bzr_refs[k] = (v, revid)
return bzr_refs
def fetch_refs(self, update_refs):
self.source.lock_read()
try:
old_refs = self._get_target_bzr_refs()
new_refs = update_refs(old_refs)
self.fetch(mapped_refs=new_refs.values())
finally:
self.source.unlock()
return old_refs, new_refs
def dfetch_refs(self, update_refs):
self.source.lock_read()
try:
old_refs = self._get_target_bzr_refs()
new_refs = update_refs(old_refs)
gitidmap = {}
revidmap = {}
todo = list(self.missing_revisions(new_refs.values()))
pb = ui.ui_factory.nested_progress_bar()
try:
object_generator = self._get_missing_objects_iterator(pb)
for old_bzr_revid, git_commit in object_generator.import_revisions(
todo, roundtrip=False):
new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
assert type(old_bzr_revid) is str
assert type(new_bzr_revid) is str
assert type(git_commit) is str
revidmap[old_bzr_revid] = new_bzr_revid
gitidmap[old_bzr_revid] = git_commit
self.target_store.add_objects(object_generator)
finally:
pb.finished()
for name, (gitid, revid) in new_refs.iteritems():
if gitid is None:
try:
gitid = gitidmap[revid]
except KeyError:
gitid = self.source_store._lookup_revision_sha1(revid)
self.target_refs[name] = gitid
finally:
self.source.unlock()
return revidmap, old_refs, new_refs
def _get_missing_objects_iterator(self, pb):
return MissingObjectsIterator(self.source_store, self.source, pb)
def dfetch(self, stop_revisions):
"""Import the gist of the ancestry of a particular revision."""
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
fetch_spec=None, mapped_refs=None):
if not self.mapping.roundtripping:
raise NoPushSupport()
if mapped_refs is not None:
stop_revisions = mapped_refs
elif revision_id is not None:
stop_revisions = [(None, revision_id)]
elif fetch_spec is not None:
stop_revisions = [(None, revid) for revid in fetch_spec.heads]
else:
stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
self.source.lock_read()
try:
todo = list(self.missing_revisions(stop_revisions))
pb = ui.ui_factory.nested_progress_bar()
try:
object_generator = self._get_missing_objects_iterator(pb)
for (revid, git_sha) in object_generator.import_revisions(
todo, roundtrip=True):
try:
self.mapping.revision_id_bzr_to_foreign(revid)
except errors.InvalidRevisionId:
self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
self.target_store.add_objects(object_generator)
finally:
pb.finished()
finally:
self.source.unlock()
@staticmethod
def is_compatible(source, target):
"""Be compatible with GitRepository."""
return (not isinstance(source, GitRepository) and
isinstance(target, LocalGitRepository))
class InterToRemoteGitRepository(InterToGitRepository):
def dfetch_refs(self, update_refs):
"""Import the gist of the ancestry of a particular revision."""
unpeel_map = UnpeelMap.from_repository(self.source)
revidmap = {}
def determine_wants(old_refs):
ret = {}
self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
self.new_refs = update_refs(self.old_refs)
for name, (gitid, revid) in self.new_refs.iteritems():
if gitid is None:
ret[name] = unpeel_map.re_unpeel_tag(self.source_store._lookup_revision_sha1(revid), old_refs.get(name))
else:
ret[name] = gitid
return ret
self.source.lock_read()
try:
new_refs = self.target.send_pack(determine_wants,
self.source_store.generate_lossy_pack_contents)
finally:
self.source.unlock()
return revidmap, self.old_refs, self.new_refs
def fetch_refs(self, update_refs):
raise NoPushSupport()
@staticmethod
def is_compatible(source, target):
"""Be compatible with GitRepository."""
return (not isinstance(source, GitRepository) and
isinstance(target, RemoteGitRepository))
|