← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Aaron Bentley
  • Date: 2006-06-23 14:28:15 UTC
  • mto: This revision was merged to the branch mainline in revision 1807.
  • Revision ID: abentley@panoramicfeedback.com-20060623142815-a48f3a00b1a14679
Apply review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
216
216
        mainline_revs.insert(0, None)
217
217
    else:
218
218
        mainline_revs.insert(0, which_revs[start_revision-2][1])
219
 
    if getattr(lf, 'show_merge', False) is False:
220
 
        no_merges = True 
 
219
    if getattr(lf, 'show_merge', None) is not None:
 
220
        include_merges = True 
221
221
    else:
222
 
        no_merges = False
 
222
        include_merges = False 
223
223
    view_revisions = list(get_view_revisions(mainline_revs, rev_nos, branch,
224
 
                          direction, no_merges=no_merges))
 
224
                          direction, include_merges=include_merges))
225
225
 
226
226
    def iter_revisions():
227
227
        revision_ids = [r for r, n, d in view_revisions]
263
263
 
264
264
 
265
265
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
266
 
                       no_merges=False):
 
266
                       include_merges=True):
267
267
    """Produce an iterator of revisions to show
268
268
    :return: an iterator of (revision_id, revno, merge_depth)
269
269
    (if there is no revno for a revision, None is supplied)
270
270
    """
271
 
    if no_merges is True:
 
271
    if include_merges is False:
272
272
        revision_ids = mainline_revs[1:]
273
273
        if direction == 'reverse':
274
274
            revision_ids.reverse()