1
# Copyright (C) 2005-2011 Canonical Ltd
1
# Copyright (C) 2005-2010 Canonical Ltd
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
83
84
from bzrlib.osutils import (
85
86
format_date_with_offset_in_original_timezone,
86
get_diff_header_encoding,
87
87
get_terminal_encoding,
90
91
from bzrlib.symbol_versioning import (
432
433
specific_files = None
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='', path_encoding=path_encoding)
437
437
return s.getvalue()
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, exclude_common_ancestry)
526
526
if direction == 'forward':
527
527
iter_revs = reversed(iter_revs)
540
540
return [(br_rev_id, br_revno, 0)]
542
revno_str = _compute_revno_str(branch, rev_id)
542
revno = branch.revision_id_to_dotted_revno(rev_id)
543
revno_str = '.'.join(str(n) for n in revno)
543
544
return [(rev_id, revno_str, 0)]
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)
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)
551
549
# If a start limit was given and it's not obviously an
552
550
# ancestor of the end limit, check it before outputting anything
553
551
if direction == 'forward' or (start_rev_id
574
572
if delayed_graph_generation:
576
574
for rev_id, revno, depth in _linear_view_revisions(
577
branch, start_rev_id, end_rev_id, exclude_common_ancestry):
575
branch, start_rev_id, end_rev_id):
578
576
if _has_merges(branch, rev_id):
579
577
# The end_rev_id can be nested down somewhere. We need an
580
578
# explicit ancestry check. There is an ambiguity here as we
625
623
return len(parents) > 1
628
def _compute_revno_str(branch, rev_id):
629
"""Compute the revno string from a rev_id.
631
:return: The revno string, or None if the revision is not in the supplied
635
revno = branch.revision_id_to_dotted_revno(rev_id)
636
except errors.NoSuchRevision:
637
# The revision must be outside of this branch
640
return '.'.join(str(n) for n in revno)
643
626
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
644
627
"""Is start_rev_id an obvious ancestor of end_rev_id?"""
645
628
if start_rev_id and end_rev_id:
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
629
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
630
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
652
631
if len(start_dotted) == 1 and len(end_dotted) == 1:
653
632
# both on mainline
654
633
return start_dotted[0] <= end_dotted[0]
667
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
668
exclude_common_ancestry=False):
646
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
669
647
"""Calculate a sequence of revisions to view, newest to oldest.
671
649
:param start_rev_id: the lower revision-id
672
650
: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.
675
651
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
676
652
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
677
is not found walking the left-hand history
653
is not found walking the left-hand history
679
655
br_revno, br_rev_id = branch.last_revision_info()
680
656
repo = branch.repository
688
664
end_rev_id = br_rev_id
689
665
found_start = start_rev_id is None
690
666
for revision_id in repo.iter_reverse_revision_history(end_rev_id):
691
revno_str = _compute_revno_str(branch, revision_id)
667
revno = branch.revision_id_to_dotted_revno(revision_id)
668
revno_str = '.'.join(str(n) for n in revno)
692
669
if not found_start and revision_id == start_rev_id:
693
if not exclude_common_ancestry:
694
yield revision_id, revno_str, 0
670
yield revision_id, revno_str, 0
695
671
found_start = True
827
803
if search is None:
828
804
return log_rev_iterator
829
searchRE = re.compile(search, re.IGNORECASE)
805
searchRE = re_compile_checked(search, re.IGNORECASE,
806
'log message filter')
830
807
return _filter_message_re(searchRE, log_rev_iterator)
1368
1342
def __init__(self, to_file, show_ids=False, show_timezone='original',
1369
1343
delta_format=None, levels=None, show_advice=False,
1370
to_exact_file=None, author_list_handler=None):
1344
to_exact_file=None):
1371
1345
"""Create a LogFormatter.
1373
1347
:param to_file: the file to output to
1381
1355
let the log formatter decide.
1382
1356
:param show_advice: whether to show advice at the end of the
1384
:param author_list_handler: callable generating a list of
1385
authors to display for a given revision
1387
1359
self.to_file = to_file
1388
1360
# 'exact' stream used to show diff, it should print content 'as is'
1443
1414
def short_author(self, rev):
1444
return self.authors(rev, 'first', short=True, sep=', ')
1446
def authors(self, rev, who, short=False, sep=None):
1447
"""Generate list of authors, taking --authors option into account.
1449
The caller has to specify the name of a author list handler,
1450
as provided by the author list registry, using the ``who``
1451
argument. That name only sets a default, though: when the
1452
user selected a different author list generation using the
1453
``--authors`` command line switch, as represented by the
1454
``author_list_handler`` constructor argument, that value takes
1457
:param rev: The revision for which to generate the list of authors.
1458
:param who: Name of the default handler.
1459
:param short: Whether to shorten names to either name or address.
1460
:param sep: What separator to use for automatic concatenation.
1462
if self._author_list_handler is not None:
1463
# The user did specify --authors, which overrides the default
1464
author_list_handler = self._author_list_handler
1466
# The user didn't specify --authors, so we use the caller's default
1467
author_list_handler = author_list_registry.get(who)
1468
names = author_list_handler(rev)
1470
for i in range(len(names)):
1471
name, address = config.parse_username(names[i])
1477
names = sep.join(names)
1415
name, address = config.parse_username(rev.get_apparent_authors()[0])
1480
1420
def merge_marker(self, revision):
1481
1421
"""Get the merge marker to include in the output or '' if none."""
1576
1516
self.merge_marker(revision)))
1577
1517
if revision.tags:
1578
1518
lines.append('tags: %s' % (', '.join(revision.tags)))
1579
if self.show_ids or revision.revno is None:
1580
1520
lines.append('revision-id: %s' % (revision.rev.revision_id,))
1582
1521
for parent_id in revision.rev.parent_ids:
1583
1522
lines.append('parent: %s' % (parent_id,))
1584
1523
lines.extend(self.custom_properties(revision.rev))
1586
1525
committer = revision.rev.committer
1587
authors = self.authors(revision.rev, 'all')
1526
authors = revision.rev.get_apparent_authors()
1588
1527
if authors != [committer]:
1589
1528
lines.append('author: %s' % (", ".join(authors),))
1590
1529
lines.append('committer: %s' % (committer,))
1647
1586
indent = ' ' * depth
1648
1587
revno_width = self.revno_width_by_depth.get(depth)
1649
1588
if revno_width is None:
1650
if revision.revno is None or revision.revno.find('.') == -1:
1589
if revision.revno.find('.') == -1:
1651
1590
# mainline revno, e.g. 12345
1652
1591
revno_width = 5
1661
1600
if revision.tags:
1662
1601
tags = ' {%s}' % (', '.join(revision.tags))
1663
1602
to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1664
revision.revno or "", self.short_author(revision.rev),
1603
revision.revno, self.short_author(revision.rev),
1665
1604
format_date(revision.rev.timestamp,
1666
1605
revision.rev.timezone or 0,
1667
1606
self.show_timezone, date_fmt="%Y-%m-%d",
1668
1607
show_offset=False),
1669
1608
tags, self.merge_marker(revision)))
1670
1609
self.show_properties(revision.rev, indent+offset)
1671
if self.show_ids or revision.revno is None:
1672
1611
to_file.write(indent + offset + 'revision-id:%s\n'
1673
1612
% (revision.rev.revision_id,))
1674
1613
if not revision.rev.message:
1764
1703
self.show_timezone,
1765
1704
date_fmt='%Y-%m-%d',
1766
1705
show_offset=False)
1767
committer_str = self.authors(revision.rev, 'first', sep=', ')
1768
committer_str = committer_str.replace(' <', ' <')
1706
committer_str = revision.rev.get_apparent_authors()[0].replace (' <', ' <')
1769
1707
to_file.write('%s %s\n\n' % (date_str,committer_str))
1771
1709
if revision.delta is not None and revision.delta.has_changed():
1836
1774
raise errors.BzrCommandError("unknown log formatter: %r" % name)
1839
def author_list_all(rev):
1840
return rev.get_apparent_authors()[:]
1843
def author_list_first(rev):
1844
lst = rev.get_apparent_authors()
1851
def author_list_committer(rev):
1852
return [rev.committer]
1855
author_list_registry = registry.Registry()
1857
author_list_registry.register('all', author_list_all,
1860
author_list_registry.register('first', author_list_first,
1863
author_list_registry.register('committer', author_list_committer,
1867
1777
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1868
1778
# deprecated; for compatibility
1869
1779
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
2020
1930
lf.log_revision(lr)
2023
def _get_info_for_log_files(revisionspec_list, file_list, add_cleanup):
1933
def _get_info_for_log_files(revisionspec_list, file_list):
2024
1934
"""Find file-ids and kinds given a list of files and a revision range.
2026
1936
We search for files at the end of the range. If not found there,
2030
1940
:param file_list: the list of paths given on the command line;
2031
1941
the first of these can be a branch location or a file path,
2032
1942
the remainder must be file paths
2033
:param add_cleanup: When the branch returned is read locked,
2034
an unlock call will be queued to the cleanup.
2035
1943
:return: (branch, info_list, start_rev_info, end_rev_info) where
2036
1944
info_list is a list of (relative_path, file_id, kind) tuples where
2037
1945
kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
2038
1946
branch will be read-locked.
2040
from builtins import _get_revision_range
1948
from builtins import _get_revision_range, safe_relpath_files
2041
1949
tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2042
add_cleanup(b.lock_read().unlock)
2043
1951
# XXX: It's damn messy converting a list of paths to relative paths when
2044
1952
# those paths might be deleted ones, they might be on a case-insensitive
2045
1953
# filesystem and/or they might be in silly locations (like another branch).
2049
1957
# case of running log in a nested directory, assuming paths beyond the
2050
1958
# first one haven't been deleted ...
2052
relpaths = [path] + tree.safe_relpath_files(file_list[1:])
1960
relpaths = [path] + safe_relpath_files(tree, file_list[1:])
2054
1962
relpaths = [path] + file_list[1:]
added
removed
bzrlib/log.py
