/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

Don't claim to support working trees for bare repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
    errors,
21
21
    ui,
22
22
    )
 
23
from bzrlib.graph import (
 
24
    PendingAncestryResult,
 
25
    )
23
26
from bzrlib.repository import (
24
27
    InterRepository,
25
28
    )
57
60
        self._pending = []
58
61
        self.pb = pb
59
62
 
60
 
    def import_revisions(self, revids):
 
63
    def import_revisions(self, revids, roundtrip):
 
64
        """Import a set of revisions into this git repository.
 
65
 
 
66
        :param revids: Revision ids of revisions to import
 
67
        :param roundtrip: Whether to roundtrip bzr metadata
 
68
        """
61
69
        for i, revid in enumerate(revids):
62
70
            if self.pb:
63
71
                self.pb.update("pushing revisions", i, len(revids))
64
 
            git_commit = self.import_revision(revid)
 
72
            git_commit = self.import_revision(revid, roundtrip)
65
73
            yield (revid, git_commit)
66
74
 
67
 
    def import_revision(self, revid):
68
 
        """Import the gist of a revision into this Git repository.
 
75
    def import_revision(self, revid, roundtrip):
 
76
        """Import a revision into this Git repository.
69
77
 
 
78
        :param revid: Revision id of the revision
 
79
        :param roundtrip: Whether to roundtrip bzr metadata
70
80
        """
71
 
        inv = self._object_store.parent_invs_cache.get_inventory(revid)
 
81
        tree = self._object_store.tree_cache.revision_tree(revid)
72
82
        rev = self.source.get_revision(revid)
73
83
        commit = None
74
 
        for path, obj in self._object_store._revision_to_objects(rev, inv):
75
 
            if obj._type == "commit":
 
84
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
 
85
            roundtrip):
 
86
            if obj.type_name == "commit":
76
87
                commit = obj
77
88
            self._pending.append((obj, path))
78
89
        return commit.id
102
113
        """See InterRepository.copy_content."""
103
114
        self.fetch(revision_id, pb, find_ghosts=False)
104
115
 
105
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
106
 
            fetch_spec=None):
107
 
        raise NoPushSupport()
 
116
    def dfetch_refs(self, update_refs):
 
117
        """Fetch non-roundtripped revisions into the target repository.
 
118
 
 
119
        :param update_refs: Generate refs to fetch. Receives dictionary 
 
120
            with old names to old git shas. Should return a dictionary
 
121
            of new names to Bazaar revision ids.
 
122
        :return: revision id map, old refs dictionary and new refs dictionary
 
123
        """
 
124
        raise NotImplementedError(self.dfetch_refs)
 
125
 
 
126
    def fetch_refs(self, update_refs):
 
127
        """Fetch possibly roundtripped revisions into the target repository.
 
128
 
 
129
        :param update_refs: Generate refs to fetch. Receives dictionary 
 
130
            with old refs (git shas), returns dictionary of new names to 
 
131
            git shas.
 
132
        :return: old refs, new refs
 
133
        """
 
134
        raise NotImplementedError(self.fetch_refs)
108
135
 
109
136
 
110
137
class InterToLocalGitRepository(InterToGitRepository):
111
 
 
112
 
    def missing_revisions(self, stop_revisions, check_revid):
 
138
    """InterBranch implementation between a Bazaar and a Git repository."""
 
139
 
 
140
    def __init__(self, source, target):
 
141
        super(InterToLocalGitRepository, self).__init__(source, target)
 
142
        self.target_store = self.target._git.object_store
 
143
        self.target_refs = self.target._git.refs
 
144
 
 
145
    def _revision_needs_fetching(self, revid):
 
146
        if revid == NULL_REVISION:
 
147
            return False
 
148
        try:
 
149
            sha_id = self.source_store._lookup_revision_sha1(revid)
 
150
        except KeyError:
 
151
            return False
 
152
        try:
 
153
            return (sha_id not in self.target_store)
 
154
        except errors.NoSuchRevision:
 
155
            # Ghost, can't push
 
156
            return False
 
157
 
 
158
    def missing_revisions(self, stop_revisions):
 
159
        """Find the revisions that are missing from the target repository.
 
160
 
 
161
        :param stop_revisions: Revisions to check for (tuples with 
 
162
            Git SHA1, bzr revid)
 
163
        :return: sequence of missing revisions, in topological order
 
164
        :raise: NoSuchRevision if the stop_revisions are not present in
 
165
            the source
 
166
        """
 
167
        stop_revids = [revid for (sha1, revid) in stop_revisions]
113
168
        missing = []
 
169
        graph = self.source.get_graph()
114
170
        pb = ui.ui_factory.nested_progress_bar()
115
171
        try:
116
 
            graph = self.source.get_graph()
117
 
            for revid, _ in graph.iter_ancestry(stop_revisions):
 
172
            for revid, _ in graph.iter_ancestry(stop_revids):
 
173
                assert type(revid) is str
118
174
                pb.update("determining revisions to fetch", len(missing))
119
 
                if not check_revid(revid):
 
175
                if self._revision_needs_fetching(revid):
120
176
                    missing.append(revid)
121
 
            return graph.iter_topo_order(missing)
122
177
        finally:
123
178
            pb.finished()
124
 
 
125
 
    def dfetch_refs(self, refs):
126
 
        new_refs = {}
127
 
        revidmap, gitidmap = self.dfetch(refs.values())
128
 
        for name, revid in refs.iteritems():
129
 
            if revid in gitidmap:
130
 
                gitid = gitidmap[revid]
 
179
        return graph.iter_topo_order(missing)
 
180
 
 
181
    def _get_target_bzr_refs(self):
 
182
        """Return a dictionary with references.
 
183
 
 
184
        :return: Dictionary with reference names as keys and tuples
 
185
            with Git SHA, Bazaar revid as values.
 
186
        """
 
187
        bzr_refs = {}
 
188
        refs = self.target._git.get_refs()
 
189
        for k, v in refs.iteritems():
 
190
            try:
 
191
                (kind, type_data) = self.source_store.lookup_git_sha(v)
 
192
            except KeyError:
 
193
                revid = None
131
194
            else:
132
 
                gitid = self.source_store._lookup_revision_sha1(revid)
133
 
            self.target._git.refs[name] = gitid
134
 
            new_refs[name] = gitid
135
 
        return revidmap, new_refs
 
195
                if kind == "commit":
 
196
                    revid = type_data[0]
 
197
                else:
 
198
                    revid = None
 
199
            bzr_refs[k] = (v, revid)
 
200
        return bzr_refs
 
201
 
 
202
    def fetch_refs(self, update_refs):
 
203
        self.source.lock_read()
 
204
        try:
 
205
            old_refs = self._get_target_bzr_refs()
 
206
            new_refs = update_refs(old_refs)
 
207
            self.fetch(mapped_refs=new_refs.values())
 
208
        finally:
 
209
            self.source.unlock()
 
210
        return old_refs, new_refs
 
211
 
 
212
    def dfetch_refs(self, update_refs):
 
213
        self.source.lock_read()
 
214
        try:
 
215
            old_refs = self._get_target_bzr_refs()
 
216
            new_refs = update_refs(old_refs)
 
217
            revidmap, gitidmap = self.dfetch(new_refs.values())
 
218
            for name, (gitid, revid) in new_refs.iteritems():
 
219
                if gitid is None:
 
220
                    try:
 
221
                        gitid = gitidmap[revid]
 
222
                    except KeyError:
 
223
                        gitid = self.source_store._lookup_revision_sha1(revid)
 
224
                self.target._git.refs[name] = gitid
 
225
                new_refs[name] = (gitid, self.source_store.lookup_git_sha(gitid)[1][0])
 
226
        finally:
 
227
            self.source.unlock()
 
228
        return revidmap, old_refs, new_refs
 
229
 
 
230
    def _get_missing_objects_iterator(self, pb):
 
231
        return MissingObjectsIterator(self.source_store, self.source, pb)
136
232
 
137
233
    def dfetch(self, stop_revisions):
138
234
        """Import the gist of the ancestry of a particular revision."""
140
236
        revidmap = {}
141
237
        self.source.lock_read()
142
238
        try:
143
 
            target_store = self.target._git.object_store
144
 
            def check_revid(revid):
145
 
                if revid == NULL_REVISION:
146
 
                    return True
147
 
                try:
148
 
                    return (self.source_store._lookup_revision_sha1(revid) in target_store)
149
 
                except errors.NoSuchRevision:
150
 
                    # Ghost, can't dpush
151
 
                    return True
152
 
            todo = list(self.missing_revisions(stop_revisions, check_revid))
 
239
            todo = list(self.missing_revisions(stop_revisions))
153
240
            pb = ui.ui_factory.nested_progress_bar()
154
241
            try:
155
 
                object_generator = MissingObjectsIterator(self.source_store, self.source, pb)
 
242
                object_generator = self._get_missing_objects_iterator(pb)
156
243
                for old_bzr_revid, git_commit in object_generator.import_revisions(
157
 
                    todo):
 
244
                    todo, roundtrip=False):
158
245
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
159
246
                    revidmap[old_bzr_revid] = new_bzr_revid
160
247
                    gitidmap[old_bzr_revid] = git_commit
161
 
                target_store.add_objects(object_generator)
 
248
                self.target_store.add_objects(object_generator)
162
249
            finally:
163
250
                pb.finished()
164
251
        finally:
165
252
            self.source.unlock()
166
253
        return revidmap, gitidmap
167
254
 
 
255
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
256
            fetch_spec=None, mapped_refs=None):
 
257
        if mapped_refs is not None:
 
258
            stop_revisions = mapped_refs
 
259
        elif revision_id is not None:
 
260
            stop_revisions = [(None, revision_id)]
 
261
        elif fetch_spec is not None:
 
262
            stop_revisions = [(None, revid) for revid in fetch_spec.heads]
 
263
        else:
 
264
            stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
 
265
        self.source.lock_read()
 
266
        try:
 
267
            todo = list(self.missing_revisions(stop_revisions))
 
268
            pb = ui.ui_factory.nested_progress_bar()
 
269
            try:
 
270
                object_generator = self._get_missing_objects_iterator(pb)
 
271
                for (revid, git_sha) in object_generator.import_revisions(
 
272
                    todo, roundtrip=True):
 
273
                    try:
 
274
                        self.mapping.revision_id_bzr_to_foreign(revid)
 
275
                    except errors.InvalidRevisionId:
 
276
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
 
277
                self.target_store.add_objects(object_generator)
 
278
            finally:
 
279
                pb.finished()
 
280
        finally:
 
281
            self.source.unlock()
 
282
 
168
283
    @staticmethod
169
284
    def is_compatible(source, target):
170
285
        """Be compatible with GitRepository."""
174
289
 
175
290
class InterToRemoteGitRepository(InterToGitRepository):
176
291
 
177
 
    def dfetch_refs(self, new_refs):
 
292
    def dfetch_refs(self, update_refs):
178
293
        """Import the gist of the ancestry of a particular revision."""
179
294
        revidmap = {}
180
 
        def determine_wants(refs):
 
295
        def determine_wants(old_refs):
181
296
            ret = {}
182
 
            for name, revid in new_refs.iteritems():
183
 
                ret[name] = self.source_store._lookup_revision_sha1(revid)
 
297
            self.old_refs = old_refs
 
298
            self.new_refs = update_refs(self.old_refs)
 
299
            for name, (gitid, revid) in self.new_refs.iteritems():
 
300
                if gitid is None:
 
301
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
 
302
                else:
 
303
                    ret[name] = gitid
184
304
            return ret
185
305
        self.source.lock_read()
186
306
        try:
187
307
            new_refs = self.target.send_pack(determine_wants,
188
 
                    self.source_store.generate_pack_contents)
 
308
                    self.source_store.generate_lossy_pack_contents)
189
309
        finally:
190
310
            self.source.unlock()
191
 
        return revidmap, new_refs
 
311
        return revidmap, self.old_refs, self.new_refs
 
312
 
 
313
    def fetch_refs(self, update_refs):
 
314
        raise NoPushSupport()
192
315
 
193
316
    @staticmethod
194
317
    def is_compatible(source, target):