← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Martin Pool
  • Date: 2006-06-20 05:32:16 UTC
  • mfrom: (1797 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1798.
  • Revision ID: mbp@sourcefrog.net-20060620053216-817857d7ca3e9d1f
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
49
49
all the changes since the previous revision that touched hello.c.
50
50
"""
51
51
 
52
 
 
53
52
# TODO: option to show delta summaries for merged-in revisions
54
 
#
55
 
# TODO: deltas_for_log_reverse seems no longer called; delete it?
56
53
 
 
54
from itertools import izip
57
55
import re
58
56
 
59
57
from bzrlib.delta import compare_trees
235
233
    for index, rev_id in cut_revs:
236
234
        rev_nos[rev_id] = index
237
235
 
 
236
    def iter_revisions():
 
237
        revision_ids = [r for s, r, m, e in merge_sorted_revisions]
 
238
        num = 9
 
239
        while revision_ids:
 
240
            revisions = branch.repository.get_revisions(revision_ids[:num])
 
241
            for revision in revisions:
 
242
                yield revision
 
243
            revision_ids  = revision_ids[num:]
 
244
            num = int(num * 1.5)
 
245
            
 
246
        revisions = branch.repository.get_revisions()
 
247
        for revision in revisions:
 
248
            yield revision
238
249
    # now we just print all the revisions
239
 
    for sequence, rev_id, merge_depth, end_of_merge in merge_sorted_revisions:
240
 
        rev = branch.repository.get_revision(rev_id)
 
250
    for ((sequence, rev_id, merge_depth, end_of_merge), rev) in \
 
251
        izip(merge_sorted_revisions, iter_revisions()):
241
252
 
242
253
        if searchRE:
243
254
            if not searchRE.search(rev.message):