/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

Add convenience method for getting missing objects iterator.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
61
61
        self.pb = pb
62
62
 
63
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
        """
64
69
        for i, revid in enumerate(revids):
65
70
            if self.pb:
66
71
                self.pb.update("pushing revisions", i, len(revids))
68
73
            yield (revid, git_commit)
69
74
 
70
75
    def import_revision(self, revid, roundtrip):
71
 
        """Import the gist of a revision into this Git repository.
 
76
        """Import a revision into this Git repository.
72
77
 
 
78
        :param revid: Revision id of the revision
 
79
        :param roundtrip: Whether to roundtrip bzr metadata
73
80
        """
74
81
        tree = self._object_store.tree_cache.revision_tree(revid)
75
82
        rev = self.source.get_revision(revid)
179
186
                return True
180
187
        return list(self.missing_revisions(stop_revisions, check_revid))
181
188
 
 
189
    def _get_missing_objects_iterator(self, pb):
 
190
        return MissingObjectsIterator(self.source_store, self.source, pb)
 
191
 
182
192
    def dfetch(self, stop_revisions):
183
193
        """Import the gist of the ancestry of a particular revision."""
184
194
        gitidmap = {}
188
198
            todo = self._find_missing_revs(stop_revisions)
189
199
            pb = ui.ui_factory.nested_progress_bar()
190
200
            try:
191
 
                object_generator = MissingObjectsIterator(self.source_store,
192
 
                    self.source, pb)
 
201
                object_generator = self._get_missing_objects_iterator()
193
202
                for old_bzr_revid, git_commit in object_generator.import_revisions(
194
203
                    todo, roundtrip=False):
195
204
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
215
224
            todo = self._find_missing_revs(stop_revisions)
216
225
            pb = ui.ui_factory.nested_progress_bar()
217
226
            try:
218
 
                object_generator = MissingObjectsIterator(self.source_store,
219
 
                    self.source, pb)
 
227
                object_generator = self._get_missing_objects_iterator(pb)
220
228
                for (revid, git_sha) in object_generator.import_revisions(
221
229
                    todo, roundtrip=True):
222
230
                    try: