← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Ian Clatworthy
  • Date: 2009-01-24 12:38:17 UTC
  • mto: (3976.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3978.
  • Revision ID: ian.clatworthy@canonical.com-20090124123817-q11ovizmi67y5gva
api compatibility: calculate_view_revisions rebases merge depth again

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
368
368
    view_revisions = _filter_revision_range(list(view_revs_iter),
369
369
                                            start_rev_id,
370
370
                                            end_rev_id)
371
 
 
 
371
    return _rebase_merge_depth(view_revisions)
 
372
 
 
373
 
 
374
def _rebase_merge_depth(view_revisions):
 
375
    """Adjust depths upwards so the top level is 0."""
372
376
    # Rebase merge_depth - unless there are no revisions or 
373
377
    # either the first or last revision have merge_depth = 0.
374
378
    if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
445
449
        view_revisions = _filter_revisions_touching_file_id(branch,
446
450
            specific_fileid, view_revisions,
447
451
            include_merges=generate_merge_revisions)
448
 
    return view_revisions
 
452
    return _rebase_merge_depth(view_revisions)
449
453
 
450
454
 
451
455
def make_log_rev_iterator(branch, view_revisions, generate_delta, search,