← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
180
180
                    from_texts = self.from_repository.texts
181
181
                    to_texts.insert_record_stream(from_texts.get_record_stream(
182
182
                        text_keys, self.to_repository._fetch_order,
183
 
                        self.to_repository._fetch_uses_deltas))
 
183
                        not self.to_repository._fetch_uses_deltas))
184
184
                    # Cause an error if a text occurs after we have done the
185
185
                    # copy.
186
186
                    text_keys = None
243
243
            to_weave.insert_record_stream(from_weave.get_record_stream(
244
244
                [(rev_id,) for rev_id in revs],
245
245
                self.to_repository._fetch_order,
246
 
                self.to_repository._fetch_uses_deltas))
 
246
                not self.to_repository._fetch_uses_deltas))
247
247
        finally:
248
248
            child_pb.finished()
249
249
 
255
255
        to_sf.insert_record_stream(filter_absent(from_sf.get_record_stream(
256
256
            [(rev_id,) for rev_id in revs],
257
257
            self.to_repository._fetch_order,
258
 
            self.to_repository._fetch_uses_deltas)))
 
258
            True)))
 
259
        # Bug #261339, some knit repositories accidentally had deltas in their
 
260
        # revision stream, when you weren't ever supposed to have deltas.
 
261
        # So we now *force* fulltext copying for signatures and revisions
259
262
        self._fetch_just_revision_texts(revs)
260
263
 
261
264
    def _fetch_just_revision_texts(self, version_ids):
264
267
        to_rf.insert_record_stream(from_rf.get_record_stream(
265
268
            [(rev_id,) for rev_id in version_ids],
266
269
            self.to_repository._fetch_order,
267
 
            self.to_repository._fetch_uses_deltas))
 
270
            True))
 
271
        # Bug #261339, some knit repositories accidentally had deltas in their
 
272
        # revision stream, when you weren't ever supposed to have deltas.
 
273
        # So we now *force* fulltext copying for signatures and revisions
268
274
 
269
275
    def _generate_root_texts(self, revs):
270
276
        """This will be called by __fetch between fetching weave texts and
380
386
                                      parents)
381
387
 
382
388
    def fetch_revisions(self, revision_ids):
 
389
        # TODO: should this batch them up rather than requesting 10,000
 
390
        #       revisions at once?
383
391
        for revision in self.source.get_revisions(revision_ids):
384
392
            self.target.add_revision(revision.revision_id, revision)
385
393