/brz/remove-bazaar

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

Use peeling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
16
16
 
17
17
"""Push implementation that simply prints message saying push is not supported."""
18
18
 
 
19
from dulwich.objects import ZERO_SHA
 
20
from dulwich.walk import Walker
 
21
 
19
22
from bzrlib import (
20
23
    errors,
21
24
    ui,
31
34
    NoPushSupport,
32
35
    )
33
36
from bzrlib.plugins.git.object_store import (
34
 
    BazaarObjectStore,
 
37
    get_object_store,
35
38
    )
36
39
from bzrlib.plugins.git.repository import (
37
40
    GitRepository,
41
44
from bzrlib.plugins.git.remote import (
42
45
    RemoteGitRepository,
43
46
    )
 
47
from bzrlib.plugins.git.unpeel_map import (
 
48
    UnpeelMap,
 
49
    )
44
50
 
45
51
 
46
52
class MissingObjectsIterator(object):
83
89
            if obj.type_name == "commit":
84
90
                commit = obj
85
91
            self._pending.append((obj, path))
 
92
        if commit is None:
 
93
            raise AssertionError("no commit object generated for revision %s" %
 
94
                revid)
86
95
        return commit.id
87
96
 
88
97
    def __len__(self):
100
109
    def __init__(self, source, target):
101
110
        super(InterToGitRepository, self).__init__(source, target)
102
111
        self.mapping = self.target.get_mapping()
103
 
        self.source_store = BazaarObjectStore(self.source, self.mapping)
 
112
        self.source_store = get_object_store(self.source, self.mapping)
104
113
 
105
114
    @staticmethod
106
115
    def _get_repo_format_to_test():
110
119
        """See InterRepository.copy_content."""
111
120
        self.fetch(revision_id, pb, find_ghosts=False)
112
121
 
113
 
    def dfetch_refs(self, update_refs):
114
 
        """Fetch non-roundtripped revisions into the target repository.
115
 
 
116
 
        :param update_refs: Generate refs to fetch. Receives dictionary
117
 
            with old names to old git shas. Should return a dictionary
118
 
            of new names to Bazaar revision ids.
119
 
        :return: revision id map, old refs dictionary and new refs dictionary
120
 
        """
121
 
        raise NotImplementedError(self.dfetch_refs)
122
 
 
123
 
    def fetch_refs(self, update_refs):
124
 
        """Fetch possibly roundtripped revisions into the target repository.
 
122
    def fetch_refs(self, update_refs, lossy):
 
123
        """Fetch possibly roundtripped revisions into the target repository
 
124
        and update refs.
125
125
 
126
126
        :param update_refs: Generate refs to fetch. Receives dictionary
127
127
            with old refs (git shas), returns dictionary of new names to
128
128
            git shas.
 
129
        :param lossy: Whether to roundtrip
129
130
        :return: old refs, new refs
130
131
        """
131
132
        raise NotImplementedError(self.fetch_refs)
132
133
 
 
134
    def search_missing_revision_ids(self,
 
135
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
136
            limit=None):
 
137
        git_shas = []
 
138
        todo = []
 
139
        if revision_ids:
 
140
            todo.extend(revision_ids)
 
141
        if if_present_ids:
 
142
            todo.extend(revision_ids)
 
143
        self.source_store.lock_read()
 
144
        try:
 
145
            for revid in revision_ids:
 
146
                if revid == NULL_REVISION:
 
147
                    continue
 
148
                git_sha = self.source_store._lookup_revision_sha1(revid)
 
149
                git_shas.append(git_sha)
 
150
            walker = Walker(self.source_store,
 
151
                include=git_shas, exclude=[sha for sha in self.target.bzrdir.get_refs_container().values() if sha != ZERO_SHA])
 
152
            missing_revids = set()
 
153
            for entry in walker:
 
154
                for (kind, type_data) in self.source_store.lookup_git_sha(entry.commit.id):
 
155
                    if kind == "commit":
 
156
                        missing_revids.add(type_data[0])
 
157
        finally:
 
158
            self.source_store.unlock()
 
159
        return self.source.revision_ids_to_search_result(missing_revids)
 
160
 
133
161
 
134
162
class InterToLocalGitRepository(InterToGitRepository):
135
163
    """InterBranch implementation between a Bazaar and a Git repository."""
136
164
 
137
165
    def __init__(self, source, target):
138
166
        super(InterToLocalGitRepository, self).__init__(source, target)
139
 
        self.target_store = self.target._git.object_store
140
 
        self.target_refs = self.target._git.refs
 
167
        self.target_store = self.target.bzrdir._git.object_store
 
168
        self.target_refs = self.target.bzrdir._git.refs
 
169
 
 
170
    def _commit_needs_fetching(self, sha_id):
 
171
        try:
 
172
            return (sha_id not in self.target_store)
 
173
        except errors.NoSuchRevision:
 
174
            # Ghost, can't push
 
175
            return False
141
176
 
142
177
    def _revision_needs_fetching(self, sha_id, revid):
143
178
        if revid == NULL_REVISION:
147
182
                sha_id = self.source_store._lookup_revision_sha1(revid)
148
183
            except KeyError:
149
184
                return False
150
 
        try:
151
 
            return (sha_id not in self.target_store)
152
 
        except errors.NoSuchRevision:
153
 
            # Ghost, can't push
154
 
            return False
 
185
        return self._commit_needs_fetching(sha_id)
155
186
 
156
187
    def missing_revisions(self, stop_revisions):
157
188
        """Find the revisions that are missing from the target repository.
164
195
        """
165
196
        revid_sha_map = {}
166
197
        stop_revids = []
167
 
        stop_sha1s = []
168
198
        for (sha1, revid) in stop_revisions:
169
199
            if sha1 is not None and revid is not None:
170
200
                revid_sha_map[revid] = sha1
 
201
                stop_revids.append(revid)
171
202
            elif sha1 is not None:
172
 
                stop_sha1s.append(sha1)
 
203
                if self._commit_needs_fetching(sha1):
 
204
                    for (kind, (revid, tree_sha, verifiers)) in self.source_store.lookup_git_sha(sha1):
 
205
                        revid_sha_map[revid] = sha1
 
206
                        stop_revids.append(revid)
173
207
            else:
174
208
                assert revid is not None
175
209
                stop_revids.append(revid)
176
 
        missing = []
 
210
        missing = set()
177
211
        graph = self.source.get_graph()
178
212
        pb = ui.ui_factory.nested_progress_bar()
179
213
        try:
180
 
            for revid, _ in graph.iter_ancestry(stop_revids):
181
 
                assert type(revid) is str
 
214
            while stop_revids:
 
215
                new_stop_revids = []
 
216
                for revid in stop_revids:
 
217
                    sha1 = revid_sha_map.get(revid)
 
218
                    if (not revid in missing and
 
219
                        self._revision_needs_fetching(sha1, revid)):
 
220
                        missing.add(revid)
 
221
                        new_stop_revids.append(revid)
 
222
                stop_revids = set()
 
223
                parent_map = graph.get_parent_map(new_stop_revids)
 
224
                for parent_revids in parent_map.itervalues():
 
225
                    stop_revids.update(parent_revids)
182
226
                pb.update("determining revisions to fetch", len(missing))
183
 
                sha1 = revid_sha_map.get(revid)
184
 
                if self._revision_needs_fetching(sha1, revid):
185
 
                    missing.append(revid)
186
227
        finally:
187
228
            pb.finished()
188
 
        for sha1 in stop_sha1s:
189
 
            try:
190
 
                (kind, (revid, tree_sha, verifiers)) = self.source_store.lookup_git_sha(sha1)
191
 
            except KeyError:
192
 
                continue
193
 
            else:
194
 
                missing.append(revid)
195
 
                revid_sha_map[revid] = sha1
196
229
        return graph.iter_topo_order(missing)
197
230
 
198
231
    def _get_target_bzr_refs(self):
202
235
            with Git SHA, Bazaar revid as values.
203
236
        """
204
237
        bzr_refs = {}
205
 
        refs = self.target._git.get_refs()
206
 
        for k, v in refs.iteritems():
 
238
        refs = {}
 
239
        for k in self.target._git.refs.allkeys():
 
240
            v = self.target._git.refs.read_ref(k)
207
241
            try:
208
 
                (kind, type_data) = self.source_store.lookup_git_sha(v)
 
242
                for (kind, type_data) in self.source_store.lookup_git_sha(v):
 
243
                    if kind == "commit" and self.source.has_revision(type_data[0]):
 
244
                        revid = type_data[0]
 
245
                        break
 
246
                else:
 
247
                    revid = None
209
248
            except KeyError:
210
249
                revid = None
211
 
            else:
212
 
                if kind == "commit":
213
 
                    revid = type_data[0]
214
 
                else:
215
 
                    revid = None
216
250
            bzr_refs[k] = (v, revid)
217
251
        return bzr_refs
218
252
 
219
 
    def fetch_refs(self, update_refs):
220
 
        self.source.lock_read()
221
 
        try:
222
 
            old_refs = self._get_target_bzr_refs()
223
 
            new_refs = update_refs(old_refs)
224
 
            self.fetch(mapped_refs=new_refs.values())
225
 
        finally:
226
 
            self.source.unlock()
227
 
        return old_refs, new_refs
228
 
 
229
 
    def dfetch_refs(self, update_refs):
230
 
        self.source.lock_read()
231
 
        try:
232
 
            old_refs = self._get_target_bzr_refs()
233
 
            new_refs = update_refs(old_refs)
234
 
            revidmap, gitidmap = self.dfetch(new_refs.values())
 
253
    def fetch_refs(self, update_refs, lossy):
 
254
        self.source_store.lock_read()
 
255
        try:
 
256
            old_refs = self._get_target_bzr_refs()
 
257
            new_refs = update_refs(old_refs)
 
258
            revidmap = self.fetch_objects(
 
259
                [(git_sha, bzr_revid) for (git_sha, bzr_revid) in new_refs.values() if git_sha is None or not git_sha.startswith('ref:')], roundtrip=not lossy)
235
260
            for name, (gitid, revid) in new_refs.iteritems():
236
261
                if gitid is None:
237
262
                    try:
238
 
                        gitid = gitidmap[revid]
 
263
                        gitid = revidmap[revid][0]
239
264
                    except KeyError:
240
265
                        gitid = self.source_store._lookup_revision_sha1(revid)
241
 
                self.target._git.refs[name] = gitid
242
 
                new_refs[name] = (gitid, self.source_store.lookup_git_sha(gitid)[1][0])
 
266
                assert len(gitid) == 40 or gitid.startswith('ref: ')
 
267
                self.target_refs[name] = gitid
243
268
        finally:
244
 
            self.source.unlock()
 
269
            self.source_store.unlock()
245
270
        return revidmap, old_refs, new_refs
246
271
 
247
 
    def _get_missing_objects_iterator(self, pb):
248
 
        return MissingObjectsIterator(self.source_store, self.source, pb)
249
 
 
250
 
    def dfetch(self, stop_revisions):
251
 
        """Import the gist of the ancestry of a particular revision."""
252
 
        gitidmap = {}
 
272
    def fetch_objects(self, revs, roundtrip):
 
273
        todo = list(self.missing_revisions(revs))
253
274
        revidmap = {}
254
 
        self.source.lock_read()
 
275
        pb = ui.ui_factory.nested_progress_bar()
255
276
        try:
256
 
            todo = list(self.missing_revisions(stop_revisions))
257
 
            pb = ui.ui_factory.nested_progress_bar()
258
 
            try:
259
 
                object_generator = self._get_missing_objects_iterator(pb)
260
 
                for old_bzr_revid, git_commit in object_generator.import_revisions(
261
 
                    todo, roundtrip=False):
262
 
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
263
 
                    revidmap[old_bzr_revid] = new_bzr_revid
264
 
                    gitidmap[old_bzr_revid] = git_commit
265
 
                self.target_store.add_objects(object_generator)
266
 
            finally:
267
 
                pb.finished()
 
277
            object_generator = MissingObjectsIterator(
 
278
                self.source_store, self.source, pb)
 
279
            for (old_revid, git_sha) in object_generator.import_revisions(
 
280
                todo, roundtrip=roundtrip):
 
281
                try:
 
282
                    self.mapping.revision_id_bzr_to_foreign(old_revid)
 
283
                except errors.InvalidRevisionId:
 
284
                    self.target_refs[self.mapping.revid_as_refname(old_revid)] = git_sha
 
285
                if not roundtrip:
 
286
                    new_revid = self.mapping.revision_id_foreign_to_bzr(git_sha)
 
287
                else:
 
288
                    new_revid = old_revid
 
289
                revidmap[old_revid] = (git_sha, new_revid)
 
290
            self.target_store.add_objects(object_generator)
 
291
            return revidmap
268
292
        finally:
269
 
            self.source.unlock()
270
 
        return revidmap, gitidmap
 
293
            pb.finished()
271
294
 
272
295
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
273
296
            fetch_spec=None, mapped_refs=None):
274
 
        if mapped_refs is not None:
275
 
            stop_revisions = mapped_refs
276
 
        elif revision_id is not None:
277
 
            stop_revisions = [(None, revision_id)]
278
 
        elif fetch_spec is not None:
279
 
            stop_revisions = [(None, revid) for revid in fetch_spec.heads]
280
 
        else:
281
 
            stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
282
 
        self.source.lock_read()
 
297
        if not self.mapping.roundtripping:
 
298
            raise NoPushSupport()
 
299
        self.source_store.lock_read()
283
300
        try:
284
 
            todo = list(self.missing_revisions(stop_revisions))
285
 
            pb = ui.ui_factory.nested_progress_bar()
286
 
            try:
287
 
                object_generator = self._get_missing_objects_iterator(pb)
288
 
                for (revid, git_sha) in object_generator.import_revisions(
289
 
                    todo, roundtrip=True):
290
 
                    try:
291
 
                        self.mapping.revision_id_bzr_to_foreign(revid)
292
 
                    except errors.InvalidRevisionId:
293
 
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
294
 
                self.target_store.add_objects(object_generator)
295
 
            finally:
296
 
                pb.finished()
 
301
            if mapped_refs is not None:
 
302
                stop_revisions = mapped_refs
 
303
            elif revision_id is not None:
 
304
                stop_revisions = [(None, revision_id)]
 
305
            elif fetch_spec is not None:
 
306
                recipe = fetch_spec.get_recipe()
 
307
                if recipe[0] in ("search", "proxy-search"):
 
308
                    stop_revisions = [(None, revid) for revid in recipe[1]]
 
309
                else:
 
310
                    raise AssertionError("Unsupported search result type %s" % recipe[0])
 
311
            else:
 
312
                stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
 
313
            self.fetch_objects(stop_revisions, roundtrip=True)
297
314
        finally:
298
 
            self.source.unlock()
 
315
            self.source_store.unlock()
299
316
 
300
317
    @staticmethod
301
318
    def is_compatible(source, target):
306
323
 
307
324
class InterToRemoteGitRepository(InterToGitRepository):
308
325
 
309
 
    def dfetch_refs(self, update_refs):
 
326
    def fetch_refs(self, update_refs, lossy):
310
327
        """Import the gist of the ancestry of a particular revision."""
 
328
        if not lossy:
 
329
            raise NoPushSupport()
 
330
        unpeel_map = UnpeelMap.from_repository(self.source)
311
331
        revidmap = {}
312
332
        def determine_wants(old_refs):
313
333
            ret = {}
314
 
            self.old_refs = old_refs
 
334
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
315
335
            self.new_refs = update_refs(self.old_refs)
316
336
            for name, (gitid, revid) in self.new_refs.iteritems():
317
337
                if gitid is None:
318
 
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
 
338
                    git_sha = self.source_store._lookup_revision_sha1(revid)
 
339
                    ret[name] = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
319
340
                else:
320
341
                    ret[name] = gitid
321
342
            return ret
322
 
        self.source.lock_read()
 
343
        self.source_store.lock_read()
323
344
        try:
324
345
            new_refs = self.target.send_pack(determine_wants,
325
346
                    self.source_store.generate_lossy_pack_contents)
326
347
        finally:
327
 
            self.source.unlock()
 
348
            self.source_store.unlock()
 
349
        # FIXME: revidmap?
328
350
        return revidmap, self.old_refs, self.new_refs
329
351
 
330
 
    def fetch_refs(self, update_refs):
331
 
        raise NoPushSupport()
332
 
 
333
352
    @staticmethod
334
353
    def is_compatible(source, target):
335
354
        """Be compatible with GitRepository."""