~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Ian Clatworthy
  • Date: 2007-09-25 05:35:07 UTC
  • mto: (2858.1.1 ianc-integration2)
  • mto: This revision was merged to the branch mainline in revision 2860.
  • Revision ID: ian.clatworthy@internode.on.net-20070925053507-pcgw7jrgdggp2mq8
fix up plain-to-annotated knit conversion

Show diffs side-by-side

added added

removed removed

Lines of Context:
625
625
            # TODO: remove parent texts when they are not relevant any more for 
626
626
            # memory pressure reduction. RBC 20060313
627
627
            # pb.update('Converting versioned data', 0, len(order))
 
628
            total = len(order)
628
629
            for index, version in enumerate(order):
629
 
                pb.update('Converting versioned data', index, len(order))
 
630
                pb.update('Converting versioned data', index, total)
630
631
                _, _, parent_text = target.add_lines(version,
631
632
                                               self.source.get_parents(version),
632
633
                                               self.source.get_lines(version),
640
641
                                        msg,
641
642
                                        version_ids,
642
643
                                        ignore_missing)
 
644
            else:
 
645
                return total
643
646
        finally:
644
647
            pb.finished()
645
648