/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 bzrlib/fetch.py

  • Committer: Robert Collins
  • Date: 2008-07-28 09:12:28 UTC
  • mto: This revision was merged to the branch mainline in revision 3584.
  • Revision ID: robertc@robertcollins.net-20080728091228-jyx4832utkwztez3
Defer decision to reconcile to the repository being fetched into.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
199
199
                    self._fetch_revision_texts(revs, pb)
200
200
                else:
201
201
                    raise AssertionError("Unknown knit kind %r" % knit_kind)
 
202
            if self.to_repository._fetch_reconcile:
 
203
                self.to_repository.reconcile()
202
204
        finally:
203
205
            if pb is not None:
204
206
                pb.finished()
274
276
        pass
275
277
 
276
278
 
277
 
class GenericRepoFetcher(RepoFetcher):
278
 
    """This is a generic repo to repo fetcher.
279
 
 
280
 
    This triggers a reconciliation after fetching to ensure integrity.
281
 
    """
282
 
 
283
 
    def _fetch_revision_texts(self, revs, pb):
284
 
        RepoFetcher._fetch_revision_texts(self, revs, pb)
285
 
        self.to_repository.reconcile()
286
 
 
287
 
 
288
279
class Inter1and2Helper(object):
289
280
    """Helper for operations that convert data from model 1 and 2
290
281
    
422
413
                pass
423
414
            self._copy_revision(rev)
424
415
            count += 1
425
 
        # fixup inventory if needed: 
426
 
        # this is expensive because we have no inverse index to current ghosts.
427
 
        # but on local disk its a few seconds and sftp push is already insane.
428
 
        # so we just-do-it.
429
 
        # FIXME: repository should inform if this is needed.
430
 
        self.to_repository.reconcile()
431
416
 
432
417
    def _copy_revision(self, rev):
433
418
        self.helper.fetch_revisions([rev])