~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin von Gagern
  • Date: 2011-09-09 15:21:21 UTC
  • mto: This revision was merged to the branch mainline in revision 6148.
  • Revision ID: martin.vgagern@gmx.net-20110909152121-b6z6v7vx3puh3ttm
Introduce an option "--omit-merges" for "bzr log".

This will omit the merging commits themselves, i.e. commits with more than a
single parent.  The idea is that these commits tend to describe the
mechanics of code development, but are at best only summaries of the work
done in sidelines.  So omitting them but including the sidelines will print
all the commits that actually contributed features to the code, without too
much noise and duplicate information.  This is particularly useful when
generating change logs for websites or tarballs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2423
2423
                   help='Show merged revisions like --levels 0 does.'),
2424
2424
            Option('include-merges', hidden=True,
2425
2425
                   help='Historical alias for --include-sidelines.'),
 
2426
            Option('omit-merges',
 
2427
                   help='Do not report commits with more than one parent.'),
2426
2428
            Option('exclude-common-ancestry',
2427
2429
                   help='Display only the revisions that are not part'
2428
2430
                   ' of both ancestries (require -rX..Y)'
2467
2469
            show_diff=False,
2468
2470
            include_merges=False,
2469
2471
            include_sidelines=None,
 
2472
            omit_merges=False,
2470
2473
            authors=None,
2471
2474
            exclude_common_ancestry=False,
2472
2475
            signatures=False,
2606
2609
            message_search=message, delta_type=delta_type,
2607
2610
            diff_type=diff_type, _match_using_deltas=match_using_deltas,
2608
2611
            exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2609
 
            signature=signatures
 
2612
            signature=signatures, omit_merges=omit_merges,
2610
2613
            )
2611
2614
        Logger(b, rqst).show(lf)
2612
2615