/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Martin Pool
  • Date: 2006-06-20 03:30:14 UTC
  • mfrom: (1793 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060620033014-e19ce470e2ce6561
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
51
51
 
52
52
 
53
53
# TODO: option to show delta summaries for merged-in revisions
 
54
from itertools import izip
54
55
import re
55
56
 
56
57
from bzrlib.delta import compare_trees
232
233
    for index, rev_id in cut_revs:
233
234
        rev_nos[rev_id] = index
234
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
235
249
    # now we just print all the revisions
236
 
    for sequence, rev_id, merge_depth, end_of_merge in merge_sorted_revisions:
237
 
        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()):
238
252
 
239
253
        if searchRE:
240
254
            if not searchRE.search(rev.message):
461
475
            out.append("%d:" % revno)
462
476
        out.append(self.truncate(self.short_committer(rev), 20))
463
477
        out.append(self.date_string(rev))
464
 
        out.append(self.message(rev).replace('\n', ' '))
 
478
        out.append(rev.get_summary())
465
479
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
466
480
 
467
481
 
491
505
        raise BzrCommandError("unknown log formatter: %r" % name)
492
506
 
493
507
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
494
 
    # deprecated; for compatability
 
508
    # deprecated; for compatibility
495
509
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
496
510
    lf.show(revno, rev, delta)
497
511