← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
73
73
    trace,
74
74
    tsort,
75
75
    tuned_gzip,
 
76
    ui,
76
77
    )
77
78
""")
78
79
from bzrlib import (
1755
1756
        :return: An iterator over (line, key).
1756
1757
        """
1757
1758
        if pb is None:
1758
 
            pb = progress.DummyProgress()
 
1759
            pb = ui.ui_factory.nested_progress_bar()
1759
1760
        keys = set(keys)
1760
1761
        total = len(keys)
1761
1762
        done = False