← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-03 13:53:46 UTC
  • mto: This revision was merged to the branch mainline in revision 5826.
  • Revision ID: jelmer@samba.org-20110503135346-l2f6xnenzn3320gv
Kill annotate_file_revision_tree() in favor annotate_file_tree().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
73
73
    repository as _mod_repository,
74
74
    revision as _mod_revision,
75
75
    revisionspec,
76
 
    trace,
77
76
    tsort,
78
77
    )
79
78
""")
84
83
from bzrlib.osutils import (
85
84
    format_date,
86
85
    format_date_with_offset_in_original_timezone,
 
86
    get_diff_header_encoding,
87
87
    get_terminal_encoding,
88
 
    re_compile_checked,
89
88
    terminal_width,
90
89
    )
91
90
from bzrlib.symbol_versioning import (
298
297
 
299
298
def _apply_log_request_defaults(rqst):
300
299
    """Apply default values to a request dictionary."""
301
 
    result = _DEFAULT_REQUEST_PARAMS
 
300
    result = _DEFAULT_REQUEST_PARAMS.copy()
302
301
    if rqst:
303
302
        result.update(rqst)
304
303
    return result
432
431
        else:
433
432
            specific_files = None
434
433
        s = StringIO()
 
434
        path_encoding = get_diff_header_encoding()
435
435
        diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
436
 
            new_label='')
 
436
            new_label='', path_encoding=path_encoding)
437
437
        return s.getvalue()
438
438
 
439
439
    def _create_log_revision_iterator(self):
522
522
    elif not generate_merge_revisions:
523
523
        # If we only want to see linear revisions, we can iterate ...
524
524
        iter_revs = _generate_flat_revisions(branch, start_rev_id, end_rev_id,
525
 
                                             direction)
 
525
                                             direction, exclude_common_ancestry)
526
526
        if direction == 'forward':
527
527
            iter_revs = reversed(iter_revs)
528
528
    else:
539
539
        # It's the tip
540
540
        return [(br_rev_id, br_revno, 0)]
541
541
    else:
542
 
        revno = branch.revision_id_to_dotted_revno(rev_id)
543
 
        revno_str = '.'.join(str(n) for n in revno)
 
542
        revno_str = _compute_revno_str(branch, rev_id)
544
543
        return [(rev_id, revno_str, 0)]
545
544
 
546
545
 
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)
 
546
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction,
 
547
                             exclude_common_ancestry=False):
 
548
    result = _linear_view_revisions(
 
549
        branch, start_rev_id, end_rev_id,
 
550
        exclude_common_ancestry=exclude_common_ancestry)
549
551
    # If a start limit was given and it's not obviously an
550
552
    # ancestor of the end limit, check it before outputting anything
551
553
    if direction == 'forward' or (start_rev_id
572
574
    if delayed_graph_generation:
573
575
        try:
574
576
            for rev_id, revno, depth in  _linear_view_revisions(
575
 
                branch, start_rev_id, end_rev_id):
 
577
                branch, start_rev_id, end_rev_id, exclude_common_ancestry):
576
578
                if _has_merges(branch, rev_id):
577
579
                    # The end_rev_id can be nested down somewhere. We need an
578
580
                    # explicit ancestry check. There is an ambiguity here as we
623
625
    return len(parents) > 1
624
626
 
625
627
 
 
628
def _compute_revno_str(branch, rev_id):
 
629
    """Compute the revno string from a rev_id.
 
630
 
 
631
    :return: The revno string, or None if the revision is not in the supplied
 
632
        branch.
 
633
    """
 
634
    try:
 
635
        revno = branch.revision_id_to_dotted_revno(rev_id)
 
636
    except errors.NoSuchRevision:
 
637
        # The revision must be outside of this branch
 
638
        return None
 
639
    else:
 
640
        return '.'.join(str(n) for n in revno)
 
641
 
 
642
 
626
643
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
627
644
    """Is start_rev_id an obvious ancestor of end_rev_id?"""
628
645
    if start_rev_id and end_rev_id:
629
 
        start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
630
 
        end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
 
646
        try:
 
647
            start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
 
648
            end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
 
649
        except errors.NoSuchRevision:
 
650
            # one or both is not in the branch; not obvious
 
651
            return False
631
652
        if len(start_dotted) == 1 and len(end_dotted) == 1:
632
653
            # both on mainline
633
654
            return start_dotted[0] <= end_dotted[0]
643
664
    return True
644
665
 
645
666
 
646
 
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
 
667
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
 
668
                           exclude_common_ancestry=False):
647
669
    """Calculate a sequence of revisions to view, newest to oldest.
648
670
 
649
671
    :param start_rev_id: the lower revision-id
650
672
    :param end_rev_id: the upper revision-id
 
673
    :param exclude_common_ancestry: Whether the start_rev_id should be part of
 
674
        the iterated revisions.
651
675
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
652
676
    :raises _StartNotLinearAncestor: if a start_rev_id is specified but
653
 
      is not found walking the left-hand history
 
677
        is not found walking the left-hand history
654
678
    """
655
679
    br_revno, br_rev_id = branch.last_revision_info()
656
680
    repo = branch.repository
664
688
            end_rev_id = br_rev_id
665
689
        found_start = start_rev_id is None
666
690
        for revision_id in repo.iter_reverse_revision_history(end_rev_id):
667
 
            revno = branch.revision_id_to_dotted_revno(revision_id)
668
 
            revno_str = '.'.join(str(n) for n in revno)
 
691
            revno_str = _compute_revno_str(branch, revision_id)
669
692
            if not found_start and revision_id == start_rev_id:
670
 
                yield revision_id, revno_str, 0
 
693
                if not exclude_common_ancestry:
 
694
                    yield revision_id, revno_str, 0
671
695
                found_start = True
672
696
                break
673
697
            else:
802
826
    """
803
827
    if search is None:
804
828
        return log_rev_iterator
805
 
    searchRE = re_compile_checked(search, re.IGNORECASE,
806
 
            'log message filter')
 
829
    searchRE = re.compile(search, re.IGNORECASE)
807
830
    return _filter_message_re(searchRE, log_rev_iterator)
808
831
 
809
832
 
1293
1316
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
1294
1317
                 tags=None, diff=None):
1295
1318
        self.rev = rev
1296
 
        self.revno = str(revno)
 
1319
        if revno is None:
 
1320
            self.revno = None
 
1321
        else:
 
1322
            self.revno = str(revno)
1297
1323
        self.merge_depth = merge_depth
1298
1324
        self.delta = delta
1299
1325
        self.tags = tags
1550
1576
                self.merge_marker(revision)))
1551
1577
        if revision.tags:
1552
1578
            lines.append('tags: %s' % (', '.join(revision.tags)))
1553
 
        if self.show_ids:
 
1579
        if self.show_ids or revision.revno is None:
1554
1580
            lines.append('revision-id: %s' % (revision.rev.revision_id,))
 
1581
        if self.show_ids:
1555
1582
            for parent_id in revision.rev.parent_ids:
1556
1583
                lines.append('parent: %s' % (parent_id,))
1557
1584
        lines.extend(self.custom_properties(revision.rev))
1620
1647
        indent = '    ' * depth
1621
1648
        revno_width = self.revno_width_by_depth.get(depth)
1622
1649
        if revno_width is None:
1623
 
            if revision.revno.find('.') == -1:
 
1650
            if revision.revno is None or revision.revno.find('.') == -1:
1624
1651
                # mainline revno, e.g. 12345
1625
1652
                revno_width = 5
1626
1653
            else:
1634
1661
        if revision.tags:
1635
1662
            tags = ' {%s}' % (', '.join(revision.tags))
1636
1663
        to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1637
 
                revision.revno, self.short_author(revision.rev),
 
1664
                revision.revno or "", self.short_author(revision.rev),
1638
1665
                format_date(revision.rev.timestamp,
1639
1666
                            revision.rev.timezone or 0,
1640
1667
                            self.show_timezone, date_fmt="%Y-%m-%d",
1641
1668
                            show_offset=False),
1642
1669
                tags, self.merge_marker(revision)))
1643
1670
        self.show_properties(revision.rev, indent+offset)
1644
 
        if self.show_ids:
 
1671
        if self.show_ids or revision.revno is None:
1645
1672
            to_file.write(indent + offset + 'revision-id:%s\n'
1646
1673
                          % (revision.rev.revision_id,))
1647
1674
        if not revision.rev.message:
2010
2037
      kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
2011
2038
      branch will be read-locked.
2012
2039
    """
2013
 
    from builtins import _get_revision_range, safe_relpath_files
 
2040
    from builtins import _get_revision_range
2014
2041
    tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2015
2042
    add_cleanup(b.lock_read().unlock)
2016
2043
    # XXX: It's damn messy converting a list of paths to relative paths when
2022
2049
    # case of running log in a nested directory, assuming paths beyond the
2023
2050
    # first one haven't been deleted ...
2024
2051
    if tree:
2025
 
        relpaths = [path] + safe_relpath_files(tree, file_list[1:])
 
2052
        relpaths = [path] + tree.safe_relpath_files(file_list[1:])
2026
2053
    else:
2027
2054
        relpaths = [path] + file_list[1:]
2028
2055
    info_list = []