220
220
'direction': 'reverse',
222
222
'generate_tags': True,
223
'exclude_common_ancestry': False,
224
223
'_match_using_deltas': True,
228
227
def make_log_request_dict(direction='reverse', specific_fileids=None,
229
start_revision=None, end_revision=None, limit=None,
230
message_search=None, levels=1, generate_tags=True,
232
diff_type=None, _match_using_deltas=True,
233
exclude_common_ancestry=False,
228
start_revision=None, end_revision=None, limit=None,
229
message_search=None, levels=1, generate_tags=True, delta_type=None,
230
diff_type=None, _match_using_deltas=True):
235
231
"""Convenience function for making a logging request dictionary.
237
233
Using this function may make code slightly safer by ensuring
464
455
generate_merge_revisions = rqst.get('levels') != 1
465
456
delayed_graph_generation = not rqst.get('specific_fileids') and (
466
457
rqst.get('limit') or self.start_rev_id or self.end_rev_id)
467
view_revisions = _calc_view_revisions(
468
self.branch, self.start_rev_id, self.end_rev_id,
469
rqst.get('direction'),
470
generate_merge_revisions=generate_merge_revisions,
471
delayed_graph_generation=delayed_graph_generation,
472
exclude_common_ancestry=rqst.get('exclude_common_ancestry'))
458
view_revisions = _calc_view_revisions(self.branch, self.start_rev_id,
459
self.end_rev_id, rqst.get('direction'), generate_merge_revisions,
460
delayed_graph_generation=delayed_graph_generation)
474
462
# Apply the other filters
475
463
return make_log_rev_iterator(self.branch, view_revisions,
482
470
# Note that we always generate the merge revisions because
483
471
# filter_revisions_touching_file_id() requires them ...
485
view_revisions = _calc_view_revisions(
486
self.branch, self.start_rev_id, self.end_rev_id,
487
rqst.get('direction'), generate_merge_revisions=True,
488
exclude_common_ancestry=rqst.get('exclude_common_ancestry'))
473
view_revisions = _calc_view_revisions(self.branch, self.start_rev_id,
474
self.end_rev_id, rqst.get('direction'), True)
489
475
if not isinstance(view_revisions, list):
490
476
view_revisions = list(view_revisions)
491
477
view_revisions = _filter_revisions_touching_file_id(self.branch,
498
484
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
499
generate_merge_revisions,
500
delayed_graph_generation=False,
501
exclude_common_ancestry=False,
485
generate_merge_revisions, delayed_graph_generation=False):
503
486
"""Calculate the revisions to view.
505
488
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
506
489
a list of the same tuples.
508
if (exclude_common_ancestry and start_rev_id == end_rev_id):
509
raise errors.BzrCommandError(
510
'--exclude-common-ancestry requires two different revisions')
511
if direction not in ('reverse', 'forward'):
512
raise ValueError('invalid direction %r' % direction)
513
491
br_revno, br_rev_id = branch.last_revision_info()
514
492
if br_revno == 0:
517
if (end_rev_id and start_rev_id == end_rev_id
518
and (not generate_merge_revisions
519
or not _has_merges(branch, end_rev_id))):
520
# If a single revision is requested, check we can handle it
521
iter_revs = _generate_one_revision(branch, end_rev_id, br_rev_id,
523
elif not generate_merge_revisions:
524
# If we only want to see linear revisions, we can iterate ...
525
iter_revs = _generate_flat_revisions(branch, start_rev_id, end_rev_id,
526
direction, exclude_common_ancestry)
527
if direction == 'forward':
528
iter_revs = reversed(iter_revs)
495
# If a single revision is requested, check we can handle it
496
generate_single_revision = (end_rev_id and start_rev_id == end_rev_id and
497
(not generate_merge_revisions or not _has_merges(branch, end_rev_id)))
498
if generate_single_revision:
499
return _generate_one_revision(branch, end_rev_id, br_rev_id, br_revno)
501
# If we only want to see linear revisions, we can iterate ...
502
if not generate_merge_revisions:
503
return _generate_flat_revisions(branch, start_rev_id, end_rev_id,
530
iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
531
direction, delayed_graph_generation,
532
exclude_common_ancestry)
533
if direction == 'forward':
534
iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
506
return _generate_all_revisions(branch, start_rev_id, end_rev_id,
507
direction, delayed_graph_generation)
538
510
def _generate_one_revision(branch, rev_id, br_rev_id, br_revno):
545
517
return [(rev_id, revno_str, 0)]
548
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction,
549
exclude_common_ancestry=False):
550
result = _linear_view_revisions(
551
branch, start_rev_id, end_rev_id,
552
exclude_common_ancestry=exclude_common_ancestry)
520
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction):
521
result = _linear_view_revisions(branch, start_rev_id, end_rev_id)
553
522
# If a start limit was given and it's not obviously an
554
523
# ancestor of the end limit, check it before outputting anything
555
524
if direction == 'forward' or (start_rev_id
559
528
except _StartNotLinearAncestor:
560
529
raise errors.BzrCommandError('Start revision not found in'
561
530
' left-hand history of end revision.')
531
if direction == 'forward':
532
result = reversed(result)
565
536
def _generate_all_revisions(branch, start_rev_id, end_rev_id, direction,
566
delayed_graph_generation,
567
exclude_common_ancestry=False):
537
delayed_graph_generation):
568
538
# On large trees, generating the merge graph can take 30-60 seconds
569
539
# so we delay doing it until a merge is detected, incrementally
570
540
# returning initial (non-merge) revisions while we can.
572
# The above is only true for old formats (<= 0.92), for newer formats, a
573
# couple of seconds only should be needed to load the whole graph and the
574
# other graph operations needed are even faster than that -- vila 100201
575
541
initial_revisions = []
576
542
if delayed_graph_generation:
578
for rev_id, revno, depth in _linear_view_revisions(
579
branch, start_rev_id, end_rev_id, exclude_common_ancestry):
544
for rev_id, revno, depth in \
545
_linear_view_revisions(branch, start_rev_id, end_rev_id):
580
546
if _has_merges(branch, rev_id):
581
# The end_rev_id can be nested down somewhere. We need an
582
# explicit ancestry check. There is an ambiguity here as we
583
# may not raise _StartNotLinearAncestor for a revision that
584
# is an ancestor but not a *linear* one. But since we have
585
# loaded the graph to do the check (or calculate a dotted
586
# revno), we may as well accept to show the log... We need
587
# the check only if start_rev_id is not None as all
588
# revisions have _mod_revision.NULL_REVISION as an ancestor
590
graph = branch.repository.get_graph()
591
if (start_rev_id is not None
592
and not graph.is_ancestor(start_rev_id, end_rev_id)):
593
raise _StartNotLinearAncestor()
594
# Since we collected the revisions so far, we need to
596
547
end_rev_id = rev_id
599
550
initial_revisions.append((rev_id, revno, depth))
601
552
# No merged revisions found
602
return initial_revisions
553
if direction == 'reverse':
554
return initial_revisions
555
elif direction == 'forward':
556
return reversed(initial_revisions)
558
raise ValueError('invalid direction %r' % direction)
603
559
except _StartNotLinearAncestor:
604
560
# A merge was never detected so the lower revision limit can't
605
561
# be nested down somewhere
606
562
raise errors.BzrCommandError('Start revision not found in'
607
563
' history of end revision.')
609
# We exit the loop above because we encounter a revision with merges, from
610
# this revision, we need to switch to _graph_view_revisions.
612
565
# A log including nested merges is required. If the direction is reverse,
613
566
# we rebase the initial merge depths so that the development line is
614
567
# shown naturally, i.e. just like it is for linear logging. We can easily
616
569
# indented at the end seems slightly nicer in that case.
617
570
view_revisions = chain(iter(initial_revisions),
618
571
_graph_view_revisions(branch, start_rev_id, end_rev_id,
619
rebase_initial_depths=(direction == 'reverse'),
620
exclude_common_ancestry=exclude_common_ancestry))
621
return view_revisions
572
rebase_initial_depths=direction == 'reverse'))
573
if direction == 'reverse':
574
return view_revisions
575
elif direction == 'forward':
576
# Forward means oldest first, adjusting for depth.
577
view_revisions = reverse_by_depth(list(view_revisions))
578
return _rebase_merge_depth(view_revisions)
580
raise ValueError('invalid direction %r' % direction)
624
583
def _has_merges(branch, rev_id):
650
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
651
exclude_common_ancestry=False):
609
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
652
610
"""Calculate a sequence of revisions to view, newest to oldest.
654
612
:param start_rev_id: the lower revision-id
655
613
:param end_rev_id: the upper revision-id
656
:param exclude_common_ancestry: Whether the start_rev_id should be part of
657
the iterated revisions.
658
614
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
659
615
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
660
is not found walking the left-hand history
616
is not found walking the left-hand history
662
618
br_revno, br_rev_id = branch.last_revision_info()
663
619
repo = branch.repository
697
651
revision is found?
698
652
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
700
if exclude_common_ancestry:
701
stop_rule = 'with-merges-without-common-ancestry'
703
stop_rule = 'with-merges'
704
654
view_revisions = branch.iter_merge_sorted_revisions(
705
655
start_revision_id=end_rev_id, stop_revision_id=start_rev_id,
656
stop_rule="with-merges")
707
657
if not rebase_initial_depths:
708
658
for (rev_id, merge_depth, revno, end_of_merge
709
659
) in view_revisions:
1424
1372
def short_author(self, rev):
1425
return self.authors(rev, 'first', short=True, sep=', ')
1427
def authors(self, rev, who, short=False, sep=None):
1428
"""Generate list of authors, taking --authors option into account.
1430
The caller has to specify the name of a author list handler,
1431
as provided by the author list registry, using the ``who``
1432
argument. That name only sets a default, though: when the
1433
user selected a different author list generation using the
1434
``--authors`` command line switch, as represented by the
1435
``author_list_handler`` constructor argument, that value takes
1438
:param rev: The revision for which to generate the list of authors.
1439
:param who: Name of the default handler.
1440
:param short: Whether to shorten names to either name or address.
1441
:param sep: What separator to use for automatic concatenation.
1443
if self._author_list_handler is not None:
1444
# The user did specify --authors, which overrides the default
1445
author_list_handler = self._author_list_handler
1447
# The user didn't specify --authors, so we use the caller's default
1448
author_list_handler = author_list_registry.get(who)
1449
names = author_list_handler(rev)
1451
for i in range(len(names)):
1452
name, address = config.parse_username(names[i])
1458
names = sep.join(names)
1373
name, address = config.parse_username(rev.get_apparent_authors()[0])
1461
1378
def merge_marker(self, revision):
1462
1379
"""Get the merge marker to include in the output or '' if none."""
1587
1503
to_file = self.to_file
1588
1504
to_file.write("%s%s\n" % (indent, ('\n' + indent).join(lines)))
1589
1505
if revision.delta is not None:
1590
# Use the standard status output to display changes
1591
from bzrlib.delta import report_delta
1592
report_delta(to_file, revision.delta, short_status=False,
1593
show_ids=self.show_ids, indent=indent)
1506
# We don't respect delta_format for compatibility
1507
revision.delta.show(to_file, self.show_ids, indent=indent,
1594
1509
if revision.diff is not None:
1595
1510
to_file.write(indent + 'diff:\n')
1596
1511
to_file.flush()
1659
1574
to_file.write(indent + offset + '%s\n' % (l,))
1661
1576
if revision.delta is not None:
1662
# Use the standard status output to display changes
1663
from bzrlib.delta import report_delta
1664
report_delta(to_file, revision.delta,
1665
short_status=self.delta_format==1,
1666
show_ids=self.show_ids, indent=indent + offset)
1577
revision.delta.show(to_file, self.show_ids, indent=indent + offset,
1578
short_status=self.delta_format==1)
1667
1579
if revision.diff is not None:
1668
1580
self.show_diff(self.to_exact_file, revision.diff, ' ')
1669
1581
to_file.write('\n')
1816
1727
raise errors.BzrCommandError("unknown log formatter: %r" % name)
1819
def author_list_all(rev):
1820
return rev.get_apparent_authors()[:]
1823
def author_list_first(rev):
1824
lst = rev.get_apparent_authors()
1831
def author_list_committer(rev):
1832
return [rev.committer]
1835
author_list_registry = registry.Registry()
1837
author_list_registry.register('all', author_list_all,
1840
author_list_registry.register('first', author_list_first,
1843
author_list_registry.register('committer', author_list_committer,
1847
1730
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1848
1731
# deprecated; for compatibility
1849
1732
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
2010
1893
:param file_list: the list of paths given on the command line;
2011
1894
the first of these can be a branch location or a file path,
2012
1895
the remainder must be file paths
2013
:param add_cleanup: When the branch returned is read locked,
2014
an unlock call will be queued to the cleanup.
2015
1896
:return: (branch, info_list, start_rev_info, end_rev_info) where
2016
1897
info_list is a list of (relative_path, file_id, kind) tuples where
2017
1898
kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
added
removed
bzrlib/log.py
