/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: Jelmer Vernooij
  • Date: 2010-05-05 09:58:55 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100505095855-i0165hooflvk9chy
Ignore control files in inventories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
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
    )
58
61
        self.pb = pb
59
62
 
60
63
    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
 
        """
66
64
        for i, revid in enumerate(revids):
67
65
            if self.pb:
68
66
                self.pb.update("pushing revisions", i, len(revids))
70
68
            yield (revid, git_commit)
71
69
 
72
70
    def import_revision(self, revid, roundtrip):
73
 
        """Import a revision into this Git repository.
 
71
        """Import the gist of a revision into this Git repository.
74
72
 
75
 
        :param revid: Revision id of the revision
76
 
        :param roundtrip: Whether to roundtrip bzr metadata
77
73
        """
78
74
        tree = self._object_store.tree_cache.revision_tree(revid)
79
75
        rev = self.source.get_revision(revid)
110
106
        """See InterRepository.copy_content."""
111
107
        self.fetch(revision_id, pb, find_ghosts=False)
112
108
 
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)
132
 
 
133
109
 
134
110
class InterToLocalGitRepository(InterToGitRepository):
135
 
    """InterBranch implementation between a Bazaar and a Git repository."""
136
111
 
137
112
    def __init__(self, source, target):
138
113
        super(InterToLocalGitRepository, self).__init__(source, target)
139
114
        self.target_store = self.target._git.object_store
140
115
        self.target_refs = self.target._git.refs
141
116
 
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)
 
117
    def missing_revisions(self, stop_revisions, check_revid):
176
118
        missing = []
177
 
        graph = self.source.get_graph()
178
119
        pb = ui.ui_factory.nested_progress_bar()
179
120
        try:
180
 
            for revid, _ in graph.iter_ancestry(stop_revids):
181
 
                assert type(revid) is str
 
121
            graph = self.source.get_graph()
 
122
            for revid, _ in graph.iter_ancestry(stop_revisions):
182
123
                pb.update("determining revisions to fetch", len(missing))
183
 
                sha1 = revid_sha_map.get(revid)
184
 
                if self._revision_needs_fetching(sha1, revid):
 
124
                if not check_revid(revid):
185
125
                    missing.append(revid)
 
126
            return graph.iter_topo_order(missing)
186
127
        finally:
187
128
            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()
 
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 = {}
 
137
        revidmap, gitidmap = self.dfetch(refs.values())
 
138
        for name, revid in refs.iteritems():
 
139
            if revid in gitidmap:
 
140
                gitid = gitidmap[revid]
 
141
            else:
 
142
                gitid = self.source_store._lookup_revision_sha1(revid)
 
143
            self.target._git.refs[name] = gitid
 
144
            new_refs[name] = gitid
245
145
        return revidmap, old_refs, new_refs
246
146
 
247
 
    def _get_missing_objects_iterator(self, pb):
248
 
        return MissingObjectsIterator(self.source_store, self.source, pb)
 
147
    def _find_missing_revs(self, stop_revisions):
 
148
        def check_revid(revid):
 
149
            if revid == NULL_REVISION:
 
150
                return True
 
151
            try:
 
152
                return (self.source_store._lookup_revision_sha1(revid) in self.target_store)
 
153
            except errors.NoSuchRevision:
 
154
                # Ghost, can't dpush
 
155
                return True
 
156
        return list(self.missing_revisions(stop_revisions, check_revid))
249
157
 
250
158
    def dfetch(self, stop_revisions):
251
159
        """Import the gist of the ancestry of a particular revision."""
253
161
        revidmap = {}
254
162
        self.source.lock_read()
255
163
        try:
256
 
            todo = list(self.missing_revisions(stop_revisions))
 
164
            todo = self._find_missing_revs(stop_revisions)
257
165
            pb = ui.ui_factory.nested_progress_bar()
258
166
            try:
259
 
                object_generator = self._get_missing_objects_iterator(pb)
 
167
                object_generator = MissingObjectsIterator(self.source_store,
 
168
                    self.source, pb)
260
169
                for old_bzr_revid, git_commit in object_generator.import_revisions(
261
170
                    todo, roundtrip=False):
262
171
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
270
179
        return revidmap, gitidmap
271
180
 
272
181
    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)]
 
182
            fetch_spec=None):
 
183
        if revision_id is not None:
 
184
            stop_revisions = [revision_id]
278
185
        elif fetch_spec is not None:
279
 
            stop_revisions = [(None, revid) for revid in fetch_spec.heads]
 
186
            stop_revisions = fetch_spec.heads
280
187
        else:
281
 
            stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
 
188
            stop_revisions = self.source.all_revision_ids()
282
189
        self.source.lock_read()
283
190
        try:
284
 
            todo = list(self.missing_revisions(stop_revisions))
 
191
            todo = self._find_missing_revs(stop_revisions)
285
192
            pb = ui.ui_factory.nested_progress_bar()
286
193
            try:
287
 
                object_generator = self._get_missing_objects_iterator(pb)
 
194
                object_generator = MissingObjectsIterator(self.source_store,
 
195
                    self.source, pb)
288
196
                for (revid, git_sha) in object_generator.import_revisions(
289
197
                    todo, roundtrip=True):
290
198
                    try:
306
214
 
307
215
class InterToRemoteGitRepository(InterToGitRepository):
308
216
 
309
 
    def dfetch_refs(self, update_refs):
 
217
    def dfetch_refs(self, new_refs):
310
218
        """Import the gist of the ancestry of a particular revision."""
311
219
        revidmap = {}
312
 
        def determine_wants(old_refs):
 
220
        old_refs = {}
 
221
        def determine_wants(refs):
313
222
            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
 
223
            old_refs.update(new_refs)
 
224
            for name, revid in new_refs.iteritems():
 
225
                ret[name] = self.source_store._lookup_revision_sha1(revid)
321
226
            return ret
322
227
        self.source.lock_read()
323
228
        try:
324
229
            new_refs = self.target.send_pack(determine_wants,
325
 
                    self.source_store.generate_lossy_pack_contents)
 
230
                    self.source_store.generate_pack_contents)
326
231
        finally:
327
232
            self.source.unlock()
328
 
        return revidmap, self.old_refs, self.new_refs
 
233
        return revidmap, old_refs, new_refs
329
234
 
330
 
    def fetch_refs(self, update_refs):
 
235
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
 
236
            fetch_spec=None):
331
237
        raise NoPushSupport()
332
238
 
333
239
    @staticmethod