← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

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,
72
71
    progress,
73
72
    static_tuple,
74
73
    trace,
75
74
    tsort,
76
75
    tuned_gzip,
77
 
    ui,
78
76
    )
79
77
""")
80
78
from bzrlib import (
81
79
    errors,
82
80
    osutils,
 
81
    patiencediff,
83
82
    )
84
83
from bzrlib.errors import (
85
84
    FileExists,
1756
1755
        :return: An iterator over (line, key).
1757
1756
        """
1758
1757
        if pb is None:
1759
 
            pb = ui.ui_factory.nested_progress_bar()
 
1758
            pb = progress.DummyProgress()
1760
1759
        keys = set(keys)
1761
1760
        total = len(keys)
1762
1761
        done = False
3417
3416
            raise exc_class, exc_value, exc_traceback
3418
3417
 
3419
3418
 
 
3419
# Deprecated, use PatienceSequenceMatcher instead
 
3420
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
 
3421
 
 
3422
 
3420
3423
def annotate_knit(knit, revision_id):
3421
3424
    """Annotate a knit with no cached annotations.
3422
3425