← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-08-19 15:25:36 UTC
  • mfrom: (3640.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
(jam) Merge in bzr-1.6rc4 including the fix for bug #256757

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
            not self.to_repository._fetch_uses_deltas)))
259
259
        self._fetch_just_revision_texts(revs)
260
260
 
261
261
    def _fetch_just_revision_texts(self, version_ids):
264
264
        to_rf.insert_record_stream(from_rf.get_record_stream(
265
265
            [(rev_id,) for rev_id in version_ids],
266
266
            self.to_repository._fetch_order,
267
 
            self.to_repository._fetch_uses_deltas))
 
267
            not self.to_repository._fetch_uses_deltas))
268
268
 
269
269
    def _generate_root_texts(self, revs):
270
270
        """This will be called by __fetch between fetching weave texts and