← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

Merge in upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
36
36
                           MissingText)
37
37
from bzrlib.trace import mutter
38
38
from bzrlib.progress import ProgressBar
 
39
from bzrlib.reconcile import RepoReconciler
39
40
from bzrlib.revision import NULL_REVISION
40
41
from bzrlib.symbol_versioning import *
41
42
 
150
151
            self.from_repository.revision_store,
151
152
            revs,
152
153
            pb=self.pb)
 
154
        # fixup inventory if needed:
 
155
        # this is expensive because we have no inverse index to current ghosts.
 
156
        # but on local disk its a few seconds and sftp push is already insane.
 
157
        # so we just-do-it.
 
158
        # FIXME: the generic code path should not need this, if it truely is
 
159
        # generic.
 
160
        reconciler = RepoReconciler(self.to_repository)
 
161
        reconciler.reconcile()
153
162
 
154
163
    def _fetch_weave_texts(self, revs):
155
164
        file_ids = self.from_repository.fileid_involved_by_set(revs)