/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

  • Committer: Roland Mas
  • Date: 2009-09-10 12:38:52 UTC
  • mto: (0.239.9 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: lolando@debian.org-20090910123852-2mo5olfx8ef5fccr
Use ProtocolGraphWalker's cache

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
1
 
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009 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
30
30
from bzrlib.plugins.git.errors import (
31
31
    NoPushSupport,
32
32
    )
 
33
from bzrlib.plugins.git.mapping import (
 
34
    extract_unusual_modes,
 
35
    )
33
36
from bzrlib.plugins.git.object_store import (
34
37
    BazaarObjectStore,
35
38
    )
54
57
        """
55
58
        self.source = source
56
59
        self._object_store = store
 
60
        self._revids = set()
 
61
        self._sent_shas = set()
57
62
        self._pending = []
58
63
        self.pb = pb
59
64
 
60
 
    def import_revisions(self, revids, roundtrip):
61
 
        """Import a set of revisions into this git repository.
62
 
 
63
 
        :param revids: Revision ids of revisions to import
64
 
        :param roundtrip: Whether to roundtrip bzr metadata
65
 
        """
 
65
    def import_revisions(self, revids):
 
66
        self._revids.update(revids)
66
67
        for i, revid in enumerate(revids):
67
68
            if self.pb:
68
69
                self.pb.update("pushing revisions", i, len(revids))
69
 
            git_commit = self.import_revision(revid, roundtrip)
 
70
            git_commit = self.import_revision(revid)
70
71
            yield (revid, git_commit)
71
72
 
72
 
    def import_revision(self, revid, roundtrip):
73
 
        """Import a revision into this Git repository.
74
 
 
75
 
        :param revid: Revision id of the revision
76
 
        :param roundtrip: Whether to roundtrip bzr metadata
 
73
    def need_sha(self, sha):
 
74
        if sha is None or sha in self._sent_shas:
 
75
            return False
 
76
        (type, (fileid, revid)) = self._object_store._idmap.lookup_git_sha(sha)
 
77
        assert type in ("blob", "tree")
 
78
        if revid in self._revids:
 
79
            # Not sent yet, and part of the set of revisions to send
 
80
            return True
 
81
        # Not changed in the revisions to send, so either not necessary
 
82
        # or already present remotely (as git doesn't do ghosts)
 
83
        return False
 
84
 
 
85
    def queue(self, sha, obj, path, ie=None, inv=None, unusual_modes=None):
 
86
        if obj is None:
 
87
            # Can't lazy-evaluate directories, since they might be eliminated
 
88
            if ie.kind == "directory":
 
89
                obj = self._object_store._get_ie_object(ie, inv, unusual_modes)
 
90
                if obj is None:
 
91
                    return
 
92
            else:
 
93
                obj = (ie, inv, unusual_modes)
 
94
        self._pending.append((obj, path))
 
95
        self._sent_shas.add(sha)
 
96
 
 
97
    def import_revision(self, revid):
 
98
        """Import the gist of a revision into this Git repository.
 
99
 
77
100
        """
78
 
        tree = self._object_store.tree_cache.revision_tree(revid)
 
101
        inv = self.source.get_inventory(revid)
79
102
        rev = self.source.get_revision(revid)
80
 
        commit = None
81
 
        for path, obj, ie in self._object_store._revision_to_objects(rev, tree,
82
 
            roundtrip):
83
 
            if obj.type_name == "commit":
84
 
                commit = obj
85
 
            self._pending.append((obj, path))
 
103
        unusual_modes = extract_unusual_modes(rev)
 
104
        todo = [inv.root]
 
105
        tree_sha = None
 
106
        while todo:
 
107
            ie = todo.pop()
 
108
            (sha, object) = self._object_store._get_ie_object_or_sha1(ie, inv, unusual_modes)
 
109
            if ie.parent_id is None:
 
110
                tree_sha = sha
 
111
            if not self.need_sha(sha):
 
112
                continue
 
113
            self.queue(sha, object, inv.id2path(ie.file_id), ie, inv, unusual_modes)
 
114
            if ie.kind == "directory":
 
115
                todo.extend(ie.children.values())
 
116
        assert tree_sha is not None
 
117
        commit = self._object_store._get_commit(rev, tree_sha)
 
118
        self.queue(commit.id, commit, None, None)
86
119
        return commit.id
87
120
 
88
121
    def __len__(self):
89
122
        return len(self._pending)
90
123
 
91
124
    def __iter__(self):
92
 
        return iter(self._pending)
 
125
        for i, (object, path) in enumerate(self._pending):
 
126
            if self.pb:
 
127
                self.pb.update("writing pack objects", i, len(self))
 
128
            if isinstance(object, tuple):
 
129
                object = self._object_store._get_ie_object(*object)
 
130
            yield (object, path)   
93
131
 
94
132
 
95
133
class InterToGitRepository(InterRepository):
110
148
        """See InterRepository.copy_content."""
111
149
        self.fetch(revision_id, pb, find_ghosts=False)
112
150
 
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.
125
 
 
126
 
        :param update_refs: Generate refs to fetch. Receives dictionary
127
 
            with old refs (git shas), returns dictionary of new names to
128
 
            git shas.
129
 
        :return: old refs, new refs
130
 
        """
131
 
        raise NotImplementedError(self.fetch_refs)
 
151
    def fetch(self, revision_id=None, pb=None, find_ghosts=False, 
 
152
            fetch_spec=None):
 
153
        raise NoPushSupport()
132
154
 
133
155
 
134
156
class InterToLocalGitRepository(InterToGitRepository):
135
 
    """InterBranch implementation between a Bazaar and a Git repository."""
136
 
 
137
 
    def __init__(self, source, target):
138
 
        super(InterToLocalGitRepository, self).__init__(source, target)
139
 
        self.target_store = self.target._git.object_store
140
 
        self.target_refs = self.target._git.refs
141
 
 
142
 
    def _revision_needs_fetching(self, sha_id, revid):
143
 
        if revid == NULL_REVISION:
144
 
            return False
145
 
        if sha_id is None:
146
 
            try:
147
 
                sha_id = self.source_store._lookup_revision_sha1(revid)
148
 
            except KeyError:
149
 
                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
155
 
 
156
 
    def missing_revisions(self, stop_revisions):
157
 
        """Find the revisions that are missing from the target repository.
158
 
 
159
 
        :param stop_revisions: Revisions to check for (tuples with
160
 
            Git SHA1, bzr revid)
161
 
        :return: sequence of missing revisions, in topological order
162
 
        :raise: NoSuchRevision if the stop_revisions are not present in
163
 
            the source
164
 
        """
165
 
        revid_sha_map = {}
166
 
        stop_revids = []
167
 
        stop_sha1s = []
168
 
        for (sha1, revid) in stop_revisions:
169
 
            if sha1 is not None and revid is not None:
170
 
                revid_sha_map[revid] = sha1
171
 
            elif sha1 is not None:
172
 
                stop_sha1s.append(sha1)
173
 
            else:
174
 
                assert revid is not None
175
 
                stop_revids.append(revid)
 
157
 
 
158
    def missing_revisions(self, stop_revisions, check_revid):
176
159
        missing = []
177
 
        graph = self.source.get_graph()
178
160
        pb = ui.ui_factory.nested_progress_bar()
179
161
        try:
180
 
            for revid, _ in graph.iter_ancestry(stop_revids):
181
 
                assert type(revid) is str
 
162
            graph = self.source.get_graph()
 
163
            for revid, _ in graph.iter_ancestry(stop_revisions):
182
164
                pb.update("determining revisions to fetch", len(missing))
183
 
                sha1 = revid_sha_map.get(revid)
184
 
                if self._revision_needs_fetching(sha1, revid):
 
165
                if not check_revid(revid):
185
166
                    missing.append(revid)
 
167
            return graph.iter_topo_order(missing)
186
168
        finally:
187
169
            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
 
        return graph.iter_topo_order(missing)
197
 
 
198
 
    def _get_target_bzr_refs(self):
199
 
        """Return a dictionary with references.
200
 
 
201
 
        :return: Dictionary with reference names as keys and tuples
202
 
            with Git SHA, Bazaar revid as values.
203
 
        """
204
 
        bzr_refs = {}
205
 
        refs = self.target._git.get_refs()
206
 
        for k, v in refs.iteritems():
207
 
            try:
208
 
                (kind, type_data) = self.source_store.lookup_git_sha(v)
209
 
            except KeyError:
210
 
                revid = None
211
 
            else:
212
 
                if kind == "commit":
213
 
                    revid = type_data[0]
214
 
                else:
215
 
                    revid = None
216
 
            bzr_refs[k] = (v, revid)
217
 
        return bzr_refs
218
 
 
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())
235
 
            for name, (gitid, revid) in new_refs.iteritems():
236
 
                if gitid is None:
237
 
                    try:
238
 
                        gitid = gitidmap[revid]
239
 
                    except KeyError:
240
 
                        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])
243
 
        finally:
244
 
            self.source.unlock()
245
 
        return revidmap, old_refs, new_refs
246
 
 
247
 
    def _get_missing_objects_iterator(self, pb):
248
 
        return MissingObjectsIterator(self.source_store, self.source, pb)
 
170
 
 
171
    def dfetch_refs(self, refs):
 
172
        new_refs = {}
 
173
        revidmap, gitidmap = self.dfetch(refs.values())
 
174
        for name, revid in refs.iteritems():
 
175
            if revid in gitidmap:
 
176
                gitid = gitidmap[revid]
 
177
            else:
 
178
                gitid = self.source_store._lookup_revision_sha1(revid)
 
179
            self.target._git.refs[name] = gitid
 
180
            new_refs[name] = gitid
 
181
        return revidmap, new_refs
249
182
 
250
183
    def dfetch(self, stop_revisions):
251
184
        """Import the gist of the ancestry of a particular revision."""
253
186
        revidmap = {}
254
187
        self.source.lock_read()
255
188
        try:
256
 
            todo = list(self.missing_revisions(stop_revisions))
 
189
            target_store = self.target._git.object_store
 
190
            def check_revid(revid):
 
191
                if revid == NULL_REVISION:
 
192
                    return True
 
193
                try:
 
194
                    return (self.source_store._lookup_revision_sha1(revid) in target_store)
 
195
                except errors.NoSuchRevision:
 
196
                    # Ghost, can't dpush
 
197
                    return True
 
198
            todo = list(self.missing_revisions(stop_revisions, check_revid))
257
199
            pb = ui.ui_factory.nested_progress_bar()
258
200
            try:
259
 
                object_generator = self._get_missing_objects_iterator(pb)
 
201
                object_generator = MissingObjectsIterator(self.source_store, self.source, pb)
260
202
                for old_bzr_revid, git_commit in object_generator.import_revisions(
261
 
                    todo, roundtrip=False):
 
203
                    todo):
262
204
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
263
205
                    revidmap[old_bzr_revid] = new_bzr_revid
264
206
                    gitidmap[old_bzr_revid] = git_commit
265
 
                self.target_store.add_objects(object_generator)
 
207
                target_store.add_objects(object_generator) 
266
208
            finally:
267
209
                pb.finished()
268
210
        finally:
269
211
            self.source.unlock()
270
212
        return revidmap, gitidmap
271
213
 
272
 
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
273
 
            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()
283
 
        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()
297
 
        finally:
298
 
            self.source.unlock()
299
 
 
300
214
    @staticmethod
301
215
    def is_compatible(source, target):
302
216
        """Be compatible with GitRepository."""
303
 
        return (not isinstance(source, GitRepository) and
 
217
        return (not isinstance(source, GitRepository) and 
304
218
                isinstance(target, LocalGitRepository))
305
219
 
306
220
 
307
221
class InterToRemoteGitRepository(InterToGitRepository):
308
222
 
309
 
    def dfetch_refs(self, update_refs):
 
223
    def dfetch_refs(self, new_refs):
310
224
        """Import the gist of the ancestry of a particular revision."""
311
225
        revidmap = {}
312
 
        def determine_wants(old_refs):
 
226
        def determine_wants(refs):
313
227
            ret = {}
314
 
            self.old_refs = old_refs
315
 
            self.new_refs = update_refs(self.old_refs)
316
 
            for name, (gitid, revid) in self.new_refs.iteritems():
317
 
                if gitid is None:
318
 
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
319
 
                else:
320
 
                    ret[name] = gitid
 
228
            for name, revid in new_refs.iteritems():
 
229
                ret[name] = self.source_store._lookup_revision_sha1(revid)
321
230
            return ret
322
231
        self.source.lock_read()
323
232
        try:
324
233
            new_refs = self.target.send_pack(determine_wants,
325
 
                    self.source_store.generate_lossy_pack_contents)
 
234
                    self.source_store.generate_pack_contents)
326
235
        finally:
327
236
            self.source.unlock()
328
 
        return revidmap, self.old_refs, self.new_refs
329
 
 
330
 
    def fetch_refs(self, update_refs):
331
 
        raise NoPushSupport()
 
237
        return revidmap, new_refs
332
238
 
333
239
    @staticmethod
334
240
    def is_compatible(source, target):
335
241
        """Be compatible with GitRepository."""
336
 
        return (not isinstance(source, GitRepository) and
 
242
        return (not isinstance(source, GitRepository) and 
337
243
                isinstance(target, RemoteGitRepository))