417
410
Subclasses may wish to override this.
419
return _DefaultLogGenerator(branch, rqst)
412
return _DefaultLogGenerator(branch, **rqst)
415
def _log_revision_iterator_using_per_file_graph(
416
branch, delta_type, match, levels, path, start_rev_id, end_rev_id,
417
direction, exclude_common_ancestry):
418
# Get the base revisions, filtering by the revision range.
419
# Note that we always generate the merge revisions because
420
# filter_revisions_touching_path() requires them ...
421
view_revisions = _calc_view_revisions(
422
branch, start_rev_id, end_rev_id,
423
direction, generate_merge_revisions=True,
424
exclude_common_ancestry=exclude_common_ancestry)
425
if not isinstance(view_revisions, list):
426
view_revisions = list(view_revisions)
427
view_revisions = _filter_revisions_touching_path(
428
branch, path, view_revisions,
429
include_merges=levels != 1)
430
return make_log_rev_iterator(
431
branch, view_revisions, delta_type, match)
434
def _log_revision_iterator_using_delta_matching(
435
branch, delta_type, match, levels, specific_files, start_rev_id, end_rev_id,
436
direction, exclude_common_ancestry, limit):
437
# Get the base revisions, filtering by the revision range
438
generate_merge_revisions = levels != 1
439
delayed_graph_generation = not specific_files and (
440
limit or start_rev_id or end_rev_id)
441
view_revisions = _calc_view_revisions(
442
branch, start_rev_id, end_rev_id,
444
generate_merge_revisions=generate_merge_revisions,
445
delayed_graph_generation=delayed_graph_generation,
446
exclude_common_ancestry=exclude_common_ancestry)
448
# Apply the other filters
449
return make_log_rev_iterator(branch, view_revisions,
451
files=specific_files,
455
def _format_diff(branch, rev, diff_type, files=None):
458
:param branch: Branch object
459
:param rev: Revision object
460
:param diff_type: Type of diff to generate
461
:param files: List of files to generate diff for (or None for all)
463
repo = branch.repository
464
if len(rev.parent_ids) == 0:
465
ancestor_id = _mod_revision.NULL_REVISION
467
ancestor_id = rev.parent_ids[0]
468
tree_1 = repo.revision_tree(ancestor_id)
469
tree_2 = repo.revision_tree(rev.revision_id)
470
if diff_type == 'partial' and files is not None:
471
specific_files = files
473
specific_files = None
475
path_encoding = get_diff_header_encoding()
476
diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
477
new_label='', path_encoding=path_encoding)
422
481
class _StartNotLinearAncestor(Exception):
426
485
class _DefaultLogGenerator(LogGenerator):
427
486
"""The default generator of log revisions."""
429
def __init__(self, branch, rqst):
489
self, branch, levels=None, limit=None, diff_type=None,
490
delta_type=None, show_signature=None, omit_merges=None,
491
generate_tags=None, specific_files=None, match=None,
492
start_revision=None, end_revision=None, direction=None,
493
exclude_common_ancestry=None, _match_using_deltas=None,
430
495
self.branch = branch
432
if rqst.get('generate_tags') and branch.supports_tags():
498
self.diff_type = diff_type
499
self.delta_type = delta_type
500
self.show_signature = signature
501
self.omit_merges = omit_merges
502
self.specific_files = specific_files
504
self.start_revision = start_revision
505
self.end_revision = end_revision
506
self.direction = direction
507
self.exclude_common_ancestry = exclude_common_ancestry
508
self._match_using_deltas = _match_using_deltas
509
if generate_tags and branch.supports_tags():
433
510
self.rev_tag_dict = branch.tags.get_reverse_tag_dict()
435
512
self.rev_tag_dict = {}
440
517
:return: An iterator yielding LogRevision objects.
443
levels = rqst.get('levels')
444
limit = rqst.get('limit')
445
diff_type = rqst.get('diff_type')
446
show_signature = rqst.get('signature')
447
omit_merges = rqst.get('omit_merges')
449
520
revision_iterator = self._create_log_revision_iterator()
450
521
for revs in revision_iterator:
451
522
for (rev_id, revno, merge_depth), rev, delta in revs:
452
523
# 0 levels means show everything; merge_depth counts from 0
453
if (levels != 0 and merge_depth is not None and
454
merge_depth >= levels):
524
if (self.levels != 0 and merge_depth is not None and
525
merge_depth >= self.levels):
456
if omit_merges and len(rev.parent_ids) > 1:
527
if self.omit_merges and len(rev.parent_ids) > 1:
459
530
raise errors.GhostRevisionUnusableHere(rev_id)
460
if diff_type is None:
531
if self.diff_type is None:
463
diff = self._format_diff(rev, rev_id, diff_type)
535
self.branch, rev, self.diff_type,
537
if self.show_signature:
465
538
signature = format_signature_validity(rev_id, self.branch)
468
541
yield LogRevision(
469
542
rev, revno, merge_depth, delta,
470
543
self.rev_tag_dict.get(rev_id), diff, signature)
473
if log_count >= limit:
546
if log_count >= self.limit:
476
def _format_diff(self, rev, rev_id, diff_type):
477
repo = self.branch.repository
478
if len(rev.parent_ids) == 0:
479
ancestor_id = _mod_revision.NULL_REVISION
481
ancestor_id = rev.parent_ids[0]
482
tree_1 = repo.revision_tree(ancestor_id)
483
tree_2 = repo.revision_tree(rev_id)
484
file_ids = self.rqst.get('specific_fileids')
485
if diff_type == 'partial' and file_ids is not None:
486
specific_files = [tree_2.id2path(id) for id in file_ids]
488
specific_files = None
490
path_encoding = get_diff_header_encoding()
491
diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
492
new_label='', path_encoding=path_encoding)
495
549
def _create_log_revision_iterator(self):
496
550
"""Create a revision iterator for log.
498
552
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
501
self.start_rev_id, self.end_rev_id = _get_revision_limits(
502
self.branch, self.rqst.get('start_revision'),
503
self.rqst.get('end_revision'))
504
if self.rqst.get('_match_using_deltas'):
505
return self._log_revision_iterator_using_delta_matching()
555
start_rev_id, end_rev_id = _get_revision_limits(
556
self.branch, self.start_revision, self.end_revision)
557
if self._match_using_deltas:
558
return _log_revision_iterator_using_delta_matching(
560
delta_type=self.delta_type,
563
specific_files=self.specific_files,
564
start_rev_id=start_rev_id, end_rev_id=end_rev_id,
565
direction=self.direction,
566
exclude_common_ancestry=self.exclude_common_ancestry,
507
569
# We're using the per-file-graph algorithm. This scales really
508
570
# well but only makes sense if there is a single file and it's
509
571
# not a directory
510
file_count = len(self.rqst.get('specific_fileids'))
572
file_count = len(self.specific_files)
511
573
if file_count != 1:
512
574
raise errors.BzrError(
513
575
"illegal LogRequest: must match-using-deltas "
514
576
"when logging %d files" % file_count)
515
return self._log_revision_iterator_using_per_file_graph()
517
def _log_revision_iterator_using_delta_matching(self):
518
# Get the base revisions, filtering by the revision range
520
generate_merge_revisions = rqst.get('levels') != 1
521
delayed_graph_generation = not rqst.get('specific_fileids') and (
522
rqst.get('limit') or self.start_rev_id or self.end_rev_id)
523
view_revisions = _calc_view_revisions(
524
self.branch, self.start_rev_id, self.end_rev_id,
525
rqst.get('direction'),
526
generate_merge_revisions=generate_merge_revisions,
527
delayed_graph_generation=delayed_graph_generation,
528
exclude_common_ancestry=rqst.get('exclude_common_ancestry'))
530
# Apply the other filters
531
return make_log_rev_iterator(self.branch, view_revisions,
532
rqst.get('delta_type'), rqst.get('match'),
533
file_ids=rqst.get('specific_fileids'),
534
direction=rqst.get('direction'))
536
def _log_revision_iterator_using_per_file_graph(self):
537
# Get the base revisions, filtering by the revision range.
538
# Note that we always generate the merge revisions because
539
# filter_revisions_touching_file_id() requires them ...
541
view_revisions = _calc_view_revisions(
542
self.branch, self.start_rev_id, self.end_rev_id,
543
rqst.get('direction'), generate_merge_revisions=True,
544
exclude_common_ancestry=rqst.get('exclude_common_ancestry'))
545
if not isinstance(view_revisions, list):
546
view_revisions = list(view_revisions)
547
view_revisions = _filter_revisions_touching_file_id(self.branch,
548
rqst.get('specific_fileids')[
550
include_merges=rqst.get('levels') != 1)
551
return make_log_rev_iterator(self.branch, view_revisions,
552
rqst.get('delta_type'), rqst.get('match'))
577
return _log_revision_iterator_using_per_file_graph(
579
delta_type=self.delta_type,
582
path=self.specific_files[0],
583
start_rev_id=start_rev_id, end_rev_id=end_rev_id,
584
direction=self.direction,
585
exclude_common_ancestry=self.exclude_common_ancestry
555
589
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
944
978
:param search: A user text search string.
945
979
:param log_rev_iterator: An input iterator containing all revisions that
946
980
could be displayed, in lists.
947
:param fileids: If non empty, only revisions matching one or more of
948
the file-ids are to be kept.
981
:param files: If non empty, only revisions matching one or more of
982
the files are to be kept.
949
983
:param direction: the direction in which view_revisions is sorted
950
984
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
953
if not generate_delta and not fileids:
987
if not generate_delta and not files:
954
988
return log_rev_iterator
955
989
return _generate_deltas(branch.repository, log_rev_iterator,
956
generate_delta, fileids, direction)
959
def _generate_deltas(repository, log_rev_iterator, delta_type, fileids,
990
generate_delta, files, direction)
993
def _generate_deltas(repository, log_rev_iterator, delta_type, files,
961
995
"""Create deltas for each batch of revisions in log_rev_iterator.
963
997
If we're only generating deltas for the sake of filtering against
964
file-ids, we stop generating deltas once all file-ids reach the
998
files, we stop generating deltas once all files reach the
965
999
appropriate life-cycle point. If we're receiving data newest to
966
1000
oldest, then that life-cycle point is 'add', otherwise it's 'remove'.
968
check_fileids = fileids is not None and len(fileids) > 0
970
fileid_set = set(fileids)
1002
check_files = files is not None and len(files) > 0
1004
file_set = set(files)
971
1005
if direction == 'reverse':
974
1008
stop_on = 'remove'
977
1011
for revs in log_rev_iterator:
978
# If we were matching against fileids and we've run out,
1012
# If we were matching against files and we've run out,
979
1013
# there's nothing left to do
980
if check_fileids and not fileid_set:
1014
if check_files and not file_set:
982
1016
revisions = [rev[1] for rev in revs]
984
if delta_type == 'full' and not check_fileids:
985
deltas = repository.get_deltas_for_revisions(revisions)
1018
if delta_type == 'full' and not check_files:
1019
deltas = repository.get_revision_deltas(revisions)
986
1020
for rev, delta in zip(revs, deltas):
987
1021
new_revs.append((rev[0], rev[1], delta))
989
deltas = repository.get_deltas_for_revisions(revisions, fileid_set)
1023
deltas = repository.get_revision_deltas(
1024
revisions, specific_files=file_set)
990
1025
for rev, delta in zip(revs, deltas):
992
1027
if delta is None or not delta.has_changed():
995
_update_fileids(delta, fileid_set, stop_on)
1030
_update_files(delta, file_set, stop_on)
996
1031
if delta_type is None:
998
1033
elif delta_type == 'full':
1012
def _update_fileids(delta, fileids, stop_on):
1013
"""Update the set of file-ids to search based on file lifecycle events.
1047
def _update_files(delta, files, stop_on):
1048
"""Update the set of files to search based on file lifecycle events.
1015
:param fileids: a set of fileids to update
1016
:param stop_on: either 'add' or 'remove' - take file-ids out of the
1017
fileids set once their add or remove entry is detected respectively
1050
:param files: a set of files to update
1051
:param stop_on: either 'add' or 'remove' - take files out of the
1052
files set once their add or remove entry is detected respectively
1019
1054
if stop_on == 'add':
1020
for item in delta.added + delta.copied:
1021
if item.file_id in fileids:
1022
fileids.remove(item.file_id)
1055
for item in delta.added:
1056
if item.path[1] in files:
1057
files.remove(item.path[1])
1058
for item in delta.copied + delta.renamed:
1059
if item.path[1] in files:
1060
files.remove(item.path[1])
1061
files.add(item.path[0])
1062
if item.kind[1] == 'directory':
1063
for path in list(files):
1064
if is_inside(item.path[1], path):
1066
files.add(item.path[0] + path[len(item.path[1]):])
1023
1067
elif stop_on == 'delete':
1024
1068
for item in delta.removed:
1025
if item.file_id in fileids:
1026
fileids.remove(item.file_id)
1069
if item.path[0] in files:
1070
files.remove(item.path[0])
1071
for item in delta.copied + delta.renamed:
1072
if item.path[0] in files:
1073
files.remove(item.path[0])
1074
files.add(item.path[1])
1075
if item.kind[0] == 'directory':
1076
for path in list(files):
1077
if is_inside(item.path[0], path):
1079
files.add(item.path[1] + path[len(item.path[0]):])
1029
1082
def _make_revision_objects(branch, generate_delta, search, log_rev_iterator):
2084
2135
tree = b.basis_tree()
2086
2137
for fp in relpaths:
2087
file_id = tree.path2id(fp)
2088
kind = _get_kind_for_file_id(tree, fp, file_id)
2138
kind = _get_kind_for_file(tree, fp)
2090
2140
# go back to when time began
2091
2141
if tree1 is None:
2093
2143
rev1 = b.get_rev_id(1)
2094
2144
except errors.NoSuchRevision:
2095
2145
# No history at all
2099
2148
tree1 = b.repository.revision_tree(rev1)
2101
file_id = tree1.path2id(fp)
2102
kind = _get_kind_for_file_id(tree1, fp, file_id)
2103
info_list.append((fp, file_id, kind))
2150
kind = _get_kind_for_file(tree1, fp)
2151
info_list.append((fp, kind))
2105
2153
elif start_rev_info == end_rev_info:
2106
2154
# One revision given - file must exist in it
2107
2155
tree = b.repository.revision_tree(end_rev_info.rev_id)
2108
2156
for fp in relpaths:
2109
file_id = tree.path2id(fp)
2110
kind = _get_kind_for_file_id(tree, fp, file_id)
2111
info_list.append((fp, file_id, kind))
2157
kind = _get_kind_for_file(tree, fp)
2158
info_list.append((fp, kind))
2114
2161
# Revision range given. Get the file-id from the end tree.
added
removed
breezy/log.py
