/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 more tests, simplify push code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
142
142
        self.target_store = self.target._git.object_store
143
143
        self.target_refs = self.target._git.refs
144
144
 
145
 
    def missing_revisions(self, stop_revisions, check_revid):
 
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
            raise errors.NoSuchRevision(self.source, revid)
 
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):
146
159
        """Find the revisions that are missing from the target repository.
147
160
 
148
161
        :param stop_revisions: Revisions to check for
149
 
        :param check_revid: Convenience function to check if a revid is 
150
 
            present.
151
162
        :return: sequence of missing revisions, in topological order
 
163
        :raise: NoSuchRevision if the stop_revisions are not present in
 
164
            the source
152
165
        """
153
166
        missing = []
154
167
        graph = self.source.get_graph()
156
169
        try:
157
170
            for revid, _ in graph.iter_ancestry(stop_revisions):
158
171
                pb.update("determining revisions to fetch", len(missing))
159
 
                if not check_revid(revid):
 
172
                if self._revision_needs_fetching(revid):
160
173
                    missing.append(revid)
161
174
        finally:
162
175
            pb.finished()
182
195
            new_refs[name] = revid
183
196
        return revidmap, old_refs, new_refs
184
197
 
185
 
    def _find_missing_revs(self, stop_revisions):
186
 
        def check_revid(revid):
187
 
            if revid == NULL_REVISION:
188
 
                return True
189
 
            sha_id = self.source_store._lookup_revision_sha1(revid)
190
 
            try:
191
 
                return (sha_id in self.target_store)
192
 
            except errors.NoSuchRevision:
193
 
                # Ghost, can't push
194
 
                return True
195
 
        return list(self.missing_revisions(stop_revisions, check_revid))
196
 
 
197
198
    def _get_missing_objects_iterator(self, pb):
198
199
        return MissingObjectsIterator(self.source_store, self.source, pb)
199
200
 
203
204
        revidmap = {}
204
205
        self.source.lock_read()
205
206
        try:
206
 
            todo = self._find_missing_revs(stop_revisions)
 
207
            todo = list(self.missing_revisions(stop_revisions))
207
208
            pb = ui.ui_factory.nested_progress_bar()
208
209
            try:
209
 
                object_generator = self._get_missing_objects_iterator()
 
210
                object_generator = self._get_missing_objects_iterator(pb)
210
211
                for old_bzr_revid, git_commit in object_generator.import_revisions(
211
212
                    todo, roundtrip=False):
212
213
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
229
230
            stop_revisions = self.source.all_revision_ids()
230
231
        self.source.lock_read()
231
232
        try:
232
 
            todo = self._find_missing_revs(stop_revisions)
 
233
            todo = list(self.missing_revisions(stop_revisions))
233
234
            pb = ui.ui_factory.nested_progress_bar()
234
235
            try:
235
236
                object_generator = self._get_missing_objects_iterator(pb)