/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 breezy/log.py

  • Committer: Jelmer Vernooij
  • Date: 2018-08-08 02:14:32 UTC
  • mfrom: (7063 work)
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180808021432-nomib3je4cu2xqkm
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/log.py
464
464
        for revs in revision_iterator:
465
465
            for (rev_id, revno, merge_depth), rev, delta in revs:
466
466
                # 0 levels means show everything; merge_depth counts from 0
467
 
                if levels != 0 and merge_depth >= levels:
 
467
                if levels != 0 and merge_depth is not None and merge_depth >= levels:
468
468
                    continue
469
469
                if omit_merges and len(rev.parent_ids) > 1:
470
470
                    continue