← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Lukáš Lalinský
  • Date: 2007-12-17 17:28:25 UTC
  • mfrom: (3120 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3123.
  • Revision ID: lalinsky@gmail.com-20071217172825-tr3pqm1mhvs3gwnn
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
123
123
        self.from_weaves = self.from_repository.weave_store
124
124
        self.count_total = 0
125
125
        self.file_ids_names = {}
126
 
        pp = ProgressPhase('Fetch phase', 4, self.pb)
 
126
        pp = ProgressPhase('Transferring', 4, self.pb)
127
127
        try:
128
128
            pp.next_phase()
129
129
            revs = self._revids_to_fetch()
347
347
        to_store = self.target.weave_store
348
348
        for tree in self.iter_rev_trees(revs):
349
349
            revision_id = tree.inventory.root.revision
350
 
            root_id = tree.inventory.root.file_id
 
350
            root_id = tree.get_root_id()
351
351
            parents = inventory_weave.get_parents(revision_id)
352
352
            if root_id not in versionedfile:
353
353
                versionedfile[root_id] = to_store.get_weave_or_empty(root_id,