/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 breezy/git/interrepo.py

Use different method names for operations with slightly different

Merged from https://code.launchpad.net/~jelmer/brz/fix-dw/+merge/394292

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/interrepo.py
268
268
        with self.source_store.lock_read():
269
269
            old_refs = self._get_target_bzr_refs()
270
270
            new_refs = update_refs(old_refs)
271
 
            revidmap = self.fetch_objects(
 
271
            revidmap = self.fetch_revs(
272
272
                [(git_sha, bzr_revid)
273
273
                 for (git_sha, bzr_revid) in new_refs.values()
274
274
                 if git_sha is None or not git_sha.startswith(SYMREF)],
292
292
                    result_refs[name] = (gitid, revid if not lossy else self.mapping.revision_id_foreign_to_bzr(gitid))
293
293
        return revidmap, old_refs, result_refs
294
294
 
295
 
    def fetch_objects(self, revs, lossy, limit=None):
 
295
    def fetch_revs(self, revs, lossy, limit=None):
296
296
        if not lossy and not self.mapping.roundtripping:
297
297
            for git_sha, bzr_revid in revs:
298
298
                if (bzr_revid is not None and
338
338
                              for revid in self.source.all_revision_ids()]
339
339
        self._warn_slow()
340
340
        try:
341
 
            revidmap = self.fetch_objects(stop_revisions, lossy=lossy)
 
341
            revidmap = self.fetch_revs(stop_revisions, lossy=lossy)
342
342
        except NoPushSupport:
343
343
            raise NoRoundtrippingSupport(self.source, self.target)
344
344
        return FetchResult(revidmap)