← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Robert Collins
  • Date: 2010-06-21 01:30:45 UTC
  • mfrom: (5309 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5310.
  • Revision ID: robertc@robertcollins.net-20100621013045-s59nfjps3rkcn53j
Merge trunk to fix NEWS sections.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
70
70
    diff,
71
71
    errors,
72
72
    foreign,
 
73
    osutils,
73
74
    repository as _mod_repository,
74
75
    revision as _mod_revision,
75
76
    revisionspec,
432
433
        else:
433
434
            specific_files = None
434
435
        s = StringIO()
 
436
        path_encoding = osutils.get_diff_header_encoding()
435
437
        diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
436
 
            new_label='')
 
438
            new_label='', path_encoding=path_encoding)
437
439
        return s.getvalue()
438
440
 
439
441
    def _create_log_revision_iterator(self):
522
524
    elif not generate_merge_revisions:
523
525
        # If we only want to see linear revisions, we can iterate ...
524
526
        iter_revs = _generate_flat_revisions(branch, start_rev_id, end_rev_id,
525
 
                                             direction)
 
527
                                             direction, exclude_common_ancestry)
526
528
        if direction == 'forward':
527
529
            iter_revs = reversed(iter_revs)
528
530
    else:
544
546
        return [(rev_id, revno_str, 0)]
545
547
 
546
548
 
547
 
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction):
548
 
    result = _linear_view_revisions(branch, start_rev_id, end_rev_id)
 
549
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction,
 
550
                             exclude_common_ancestry=False):
 
551
    result = _linear_view_revisions(
 
552
        branch, start_rev_id, end_rev_id,
 
553
        exclude_common_ancestry=exclude_common_ancestry)
549
554
    # If a start limit was given and it's not obviously an
550
555
    # ancestor of the end limit, check it before outputting anything
551
556
    if direction == 'forward' or (start_rev_id
572
577
    if delayed_graph_generation:
573
578
        try:
574
579
            for rev_id, revno, depth in  _linear_view_revisions(
575
 
                branch, start_rev_id, end_rev_id):
 
580
                branch, start_rev_id, end_rev_id, exclude_common_ancestry):
576
581
                if _has_merges(branch, rev_id):
577
582
                    # The end_rev_id can be nested down somewhere. We need an
578
583
                    # explicit ancestry check. There is an ambiguity here as we
643
648
    return True
644
649
 
645
650
 
646
 
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
 
651
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
 
652
                           exclude_common_ancestry=False):
647
653
    """Calculate a sequence of revisions to view, newest to oldest.
648
654
 
649
655
    :param start_rev_id: the lower revision-id
650
656
    :param end_rev_id: the upper revision-id
 
657
    :param exclude_common_ancestry: Whether the start_rev_id should be part of
 
658
        the iterated revisions.
651
659
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
652
660
    :raises _StartNotLinearAncestor: if a start_rev_id is specified but
653
 
      is not found walking the left-hand history
 
661
        is not found walking the left-hand history
654
662
    """
655
663
    br_revno, br_rev_id = branch.last_revision_info()
656
664
    repo = branch.repository
667
675
            revno = branch.revision_id_to_dotted_revno(revision_id)
668
676
            revno_str = '.'.join(str(n) for n in revno)
669
677
            if not found_start and revision_id == start_rev_id:
670
 
                yield revision_id, revno_str, 0
 
678
                if not exclude_common_ancestry:
 
679
                    yield revision_id, revno_str, 0
671
680
                found_start = True
672
681
                break
673
682
            else:
1993
2002
        lf.log_revision(lr)
1994
2003
 
1995
2004
 
1996
 
def _get_info_for_log_files(revisionspec_list, file_list):
 
2005
def _get_info_for_log_files(revisionspec_list, file_list, add_cleanup):
1997
2006
    """Find file-ids and kinds given a list of files and a revision range.
1998
2007
 
1999
2008
    We search for files at the end of the range. If not found there,
2003
2012
    :param file_list: the list of paths given on the command line;
2004
2013
      the first of these can be a branch location or a file path,
2005
2014
      the remainder must be file paths
 
2015
    :param add_cleanup: When the branch returned is read locked,
 
2016
      an unlock call will be queued to the cleanup.
2006
2017
    :return: (branch, info_list, start_rev_info, end_rev_info) where
2007
2018
      info_list is a list of (relative_path, file_id, kind) tuples where
2008
2019
      kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
2010
2021
    """
2011
2022
    from builtins import _get_revision_range, safe_relpath_files
2012
2023
    tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2013
 
    b.lock_read()
 
2024
    add_cleanup(b.lock_read().unlock)
2014
2025
    # XXX: It's damn messy converting a list of paths to relative paths when
2015
2026
    # those paths might be deleted ones, they might be on a case-insensitive
2016
2027
    # filesystem and/or they might be in silly locations (like another branch).