To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to push.py
- browse files at revision 0.200.221
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.221
- Committer: Jelmer Vernooij
- Date: 2009-02-08 15:55:41 UTC
- mto: (0.312.1 master) (6883.23.1 bundle-git)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: jelmer@samba.org-20090208155541-nz99rcyajxi5fp8g
Add FOSDEM roundtripping notes.
- files added:
- foreign
- files removed:
- HACKING
- files renamed:
- tests/test_mapping.py => tests/test_ids.py
- files modified:
- Makefile
added
removed
push.py
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
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
"""Push implementation that simply prints message saying push is not supported."""
18
19
from bzrlib import (
20
errors,
21
ui,
22
)
23
from bzrlib.graph import (
24
PendingAncestryResult,
25
)
26
from bzrlib.repository import (
27
InterRepository,
28
)
29
from bzrlib.revision import (
30
NULL_REVISION,
31
)
32
33
from bzrlib.plugins.git.errors import (
34
NoPushSupport,
35
)
36
from bzrlib.plugins.git.object_store import (
37
BazaarObjectStore,
38
)
39
from bzrlib.plugins.git.repository import (
40
GitRepository,
41
LocalGitRepository,
42
GitRepositoryFormat,
43
)
44
from bzrlib.plugins.git.remote import (
45
RemoteGitRepository,
46
)
47
48
49
class MissingObjectsIterator(object):
50
"""Iterate over git objects that are missing from a target repository.
51
52
"""
53
54
def __init__(self, store, source, pb=None):
55
"""Create a new missing objects iterator.
56
57
"""
58
self.source = source
59
self._object_store = store
60
self._pending = []
61
self.pb = pb
62
63
def import_revisions(self, revids, roundtrip):
64
for i, revid in enumerate(revids):
65
if self.pb:
66
self.pb.update("pushing revisions", i, len(revids))
67
git_commit = self.import_revision(revid, roundtrip)
68
yield (revid, git_commit)
69
70
def import_revision(self, revid, roundtrip):
71
"""Import the gist of a revision into this Git repository.
72
73
"""
74
tree = self._object_store.tree_cache.revision_tree(revid)
75
rev = self.source.get_revision(revid)
76
commit = None
77
for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
78
roundtrip):
79
if obj.type_name == "commit":
80
commit = obj
81
self._pending.append((obj, path))
82
return commit.id
83
84
def __len__(self):
85
return len(self._pending)
86
87
def __iter__(self):
88
return iter(self._pending)
89
90
91
class InterToGitRepository(InterRepository):
92
"""InterRepository that copies into a Git repository."""
93
94
_matching_repo_format = GitRepositoryFormat()
95
96
def __init__(self, source, target):
97
super(InterToGitRepository, self).__init__(source, target)
98
self.mapping = self.target.get_mapping()
99
self.source_store = BazaarObjectStore(self.source, self.mapping)
100
101
@staticmethod
102
def _get_repo_format_to_test():
103
return None
104
105
def copy_content(self, revision_id=None, pb=None):
106
"""See InterRepository.copy_content."""
107
self.fetch(revision_id, pb, find_ghosts=False)
108
109
110
class InterToLocalGitRepository(InterToGitRepository):
111
112
def __init__(self, source, target):
113
super(InterToLocalGitRepository, self).__init__(source, target)
114
self.target_store = self.target._git.object_store
115
self.target_refs = self.target._git.refs
116
117
def missing_revisions(self, stop_revisions, check_revid):
118
missing = []
119
graph = self.source.get_graph()
120
pb = ui.ui_factory.nested_progress_bar()
121
try:
122
for revid, _ in graph.iter_ancestry(stop_revisions):
123
pb.update("determining revisions to fetch", len(missing))
124
if not check_revid(revid):
125
missing.append(revid)
126
finally:
127
pb.finished()
128
return graph.iter_topo_order(missing)
129
130
def fetch_refs(self, refs):
131
fetch_spec = PendingAncestryResult(refs.values(), self.source)
132
self.fetch(fetch_spec=fetch_spec)
133
134
def dfetch_refs(self, refs):
135
old_refs = self.target._git.get_refs()
136
new_refs = dict(old_refs)
137
revidmap, gitidmap = self.dfetch(refs.values())
138
for name, revid in refs.iteritems():
139
try:
140
gitid = gitidmap[revid]
141
except KeyError:
142
gitid = self.source_store._lookup_revision_sha1(revid)
143
self.target._git.refs[name] = gitid
144
new_refs[name] = gitid
145
return revidmap, old_refs, new_refs
146
147
def _find_missing_revs(self, stop_revisions):
148
def check_revid(revid):
149
if revid == NULL_REVISION:
150
return True
151
sha_id = self.source_store._lookup_revision_sha1(revid)
152
try:
153
return (sha_id in self.target_store)
154
except errors.NoSuchRevision:
155
# Ghost, can't push
156
return True
157
return list(self.missing_revisions(stop_revisions, check_revid))
158
159
def dfetch(self, stop_revisions):
160
"""Import the gist of the ancestry of a particular revision."""
161
gitidmap = {}
162
revidmap = {}
163
self.source.lock_read()
164
try:
165
todo = self._find_missing_revs(stop_revisions)
166
pb = ui.ui_factory.nested_progress_bar()
167
try:
168
object_generator = MissingObjectsIterator(self.source_store,
169
self.source, pb)
170
for old_bzr_revid, git_commit in object_generator.import_revisions(
171
todo, roundtrip=False):
172
new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
173
revidmap[old_bzr_revid] = new_bzr_revid
174
gitidmap[old_bzr_revid] = git_commit
175
self.target_store.add_objects(object_generator)
176
finally:
177
pb.finished()
178
finally:
179
self.source.unlock()
180
return revidmap, gitidmap
181
182
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
183
fetch_spec=None):
184
if revision_id is not None:
185
stop_revisions = [revision_id]
186
elif fetch_spec is not None:
187
stop_revisions = fetch_spec.heads
188
else:
189
stop_revisions = self.source.all_revision_ids()
190
self.source.lock_read()
191
try:
192
todo = self._find_missing_revs(stop_revisions)
193
pb = ui.ui_factory.nested_progress_bar()
194
try:
195
object_generator = MissingObjectsIterator(self.source_store,
196
self.source, pb)
197
for (revid, git_sha) in object_generator.import_revisions(
198
todo, roundtrip=True):
199
try:
200
self.mapping.revision_id_bzr_to_foreign(revid)
201
except errors.InvalidRevisionId:
202
self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
203
self.target_store.add_objects(object_generator)
204
finally:
205
pb.finished()
206
finally:
207
self.source.unlock()
208
209
@staticmethod
210
def is_compatible(source, target):
211
"""Be compatible with GitRepository."""
212
return (not isinstance(source, GitRepository) and
213
isinstance(target, LocalGitRepository))
214
215
216
class InterToRemoteGitRepository(InterToGitRepository):
217
218
def dfetch_refs(self, new_refs):
219
"""Import the gist of the ancestry of a particular revision."""
220
revidmap = {}
221
old_refs = {}
222
def determine_wants(refs):
223
ret = {}
224
old_refs.update(new_refs)
225
for name, revid in new_refs.iteritems():
226
ret[name] = self.source_store._lookup_revision_sha1(revid)
227
return ret
228
self.source.lock_read()
229
try:
230
new_refs = self.target.send_pack(determine_wants,
231
self.source_store.generate_lossy_pack_contents)
232
finally:
233
self.source.unlock()
234
return revidmap, old_refs, new_refs
235
236
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
237
fetch_spec=None):
238
raise NoPushSupport()
239
240
@staticmethod
241
def is_compatible(source, target):
242
"""Be compatible with GitRepository."""
243
return (not isinstance(source, GitRepository) and
244
isinstance(target, RemoteGitRepository))
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0