← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Martin Pool
  • Date: 2010-08-18 04:26:39 UTC
  • mfrom: (129.1.8 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100818042639-mjoxtngyjwiu05fo
* PPA rebuild for lucid.
* PPA rebuild for karmic.
* PPA rebuild onto jaunty.
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
68
68
    index as _mod_index,
69
69
    lru_cache,
70
70
    pack,
 
71
    patiencediff,
71
72
    progress,
72
73
    static_tuple,
73
74
    trace,
74
75
    tsort,
75
76
    tuned_gzip,
 
77
    ui,
76
78
    )
77
79
""")
78
80
from bzrlib import (
79
81
    errors,
80
82
    osutils,
81
 
    patiencediff,
82
83
    )
83
84
from bzrlib.errors import (
84
85
    FileExists,
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
3416
3417
            raise exc_class, exc_value, exc_traceback
3417
3418
 
3418
3419
 
3419
 
# Deprecated, use PatienceSequenceMatcher instead
3420
 
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
3421
 
 
3422
 
 
3423
3420
def annotate_knit(knit, revision_id):
3424
3421
    """Annotate a knit with no cached annotations.
3425
3422