215
213
Logger(branch, rqst).show(lf)
218
# Note: This needs to be kept in sync with the defaults in
216
# Note: This needs to be kept this in sync with the defaults in
219
217
# make_log_request_dict() below
220
218
_DEFAULT_REQUEST_PARAMS = {
221
219
'direction': 'reverse',
223
221
'generate_tags': True,
224
222
'exclude_common_ancestry': False,
225
223
'_match_using_deltas': True,
229
227
def make_log_request_dict(direction='reverse', specific_fileids=None,
230
228
start_revision=None, end_revision=None, limit=None,
231
message_search=None, levels=None, generate_tags=True,
229
message_search=None, levels=1, generate_tags=True,
233
231
diff_type=None, _match_using_deltas=True,
234
exclude_common_ancestry=False, match=None,
235
signature=False, omit_merges=False,
232
exclude_common_ancestry=False,
237
234
"""Convenience function for making a logging request dictionary.
259
256
matching commit messages
261
258
:param levels: the number of levels of revisions to
262
generate; 1 for just the mainline; 0 for all levels, or None for
259
generate; 1 for just the mainline; 0 for all levels.
265
261
:param generate_tags: If True, include tags for matched revisions.
267
263
:param delta_type: Either 'full', 'partial' or None.
268
264
'full' means generate the complete delta - adds/deletes/modifies/etc;
269
265
'partial' means filter the delta using specific_fileids;
282
278
:param exclude_common_ancestry: Whether -rX..Y should be interpreted as a
283
279
range operator or as a graph difference.
285
:param signature: show digital signature information
287
:param match: Dictionary of list of search strings to use when filtering
288
revisions. Keys can be 'message', 'author', 'committer', 'bugs' or
289
the empty string to match any of the preceding properties.
291
:param omit_merges: If True, commits with more than one parent are
295
# Take care of old style message_search parameter
298
if 'message' in match:
299
match['message'].append(message_search)
301
match['message'] = [message_search]
303
match={ 'message': [message_search] }
305
282
'direction': direction,
306
283
'specific_fileids': specific_fileids,
307
284
'start_revision': start_revision,
308
285
'end_revision': end_revision,
287
'message_search': message_search,
310
288
'levels': levels,
311
289
'generate_tags': generate_tags,
312
290
'delta_type': delta_type,
313
291
'diff_type': diff_type,
314
292
'exclude_common_ancestry': exclude_common_ancestry,
315
'signature': signature,
317
'omit_merges': omit_merges,
318
293
# Add 'private' attributes for features that may be deprecated
319
294
'_match_using_deltas': _match_using_deltas,
331
def format_signature_validity(rev_id, repo):
332
"""get the signature validity
334
:param rev_id: revision id to validate
335
:param repo: repository of revision
336
:return: human readable string to print to log
338
from bzrlib import gpg
340
gpg_strategy = gpg.GPGStrategy(None)
341
result = repo.verify_revision(rev_id, gpg_strategy)
342
if result[0] == gpg.SIGNATURE_VALID:
343
return "valid signature from {0}".format(result[1])
344
if result[0] == gpg.SIGNATURE_KEY_MISSING:
345
return "unknown key {0}".format(result[1])
346
if result[0] == gpg.SIGNATURE_NOT_VALID:
347
return "invalid signature!"
348
if result[0] == gpg.SIGNATURE_NOT_SIGNED:
349
return "no signature"
352
306
class LogGenerator(object):
353
307
"""A generator of log revisions."""
399
353
# Tweak the LogRequest based on what the LogFormatter can handle.
400
354
# (There's no point generating stuff if the formatter can't display it.)
402
if rqst['levels'] is None or lf.get_levels() > rqst['levels']:
403
# user didn't specify levels, use whatever the LF can handle:
404
rqst['levels'] = lf.get_levels()
356
rqst['levels'] = lf.get_levels()
406
357
if not getattr(lf, 'supports_tags', False):
407
358
rqst['generate_tags'] = False
408
359
if not getattr(lf, 'supports_delta', False):
409
360
rqst['delta_type'] = None
410
361
if not getattr(lf, 'supports_diff', False):
411
362
rqst['diff_type'] = None
412
if not getattr(lf, 'supports_signatures', False):
413
rqst['signature'] = False
415
364
# Find and print the interesting revisions
416
365
generator = self._generator_factory(self.branch, rqst)
459
406
# 0 levels means show everything; merge_depth counts from 0
460
407
if levels != 0 and merge_depth >= levels:
462
if omit_merges and len(rev.parent_ids) > 1:
464
409
if diff_type is None:
467
412
diff = self._format_diff(rev, rev_id, diff_type)
469
signature = format_signature_validity(rev_id,
470
self.branch.repository)
473
413
yield LogRevision(rev, revno, merge_depth, delta,
474
self.rev_tag_dict.get(rev_id), diff, signature)
414
self.rev_tag_dict.get(rev_id), diff)
477
417
if log_count >= limit:
533
473
# Apply the other filters
534
474
return make_log_rev_iterator(self.branch, view_revisions,
535
rqst.get('delta_type'), rqst.get('match'),
475
rqst.get('delta_type'), rqst.get('message_search'),
536
476
file_ids=rqst.get('specific_fileids'),
537
477
direction=rqst.get('direction'))
551
491
rqst.get('specific_fileids')[0], view_revisions,
552
492
include_merges=rqst.get('levels') != 1)
553
493
return make_log_rev_iterator(self.branch, view_revisions,
554
rqst.get('delta_type'), rqst.get('match'))
494
rqst.get('delta_type'), rqst.get('message_search'))
557
497
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
565
505
a list of the same tuples.
567
507
if (exclude_common_ancestry and start_rev_id == end_rev_id):
568
raise errors.BzrCommandError(gettext(
569
'--exclude-common-ancestry requires two different revisions'))
508
raise errors.BzrCommandError(
509
'--exclude-common-ancestry requires two different revisions')
570
510
if direction not in ('reverse', 'forward'):
571
raise ValueError(gettext('invalid direction %r') % direction)
511
raise ValueError('invalid direction %r' % direction)
572
512
br_revno, br_rev_id = branch.last_revision_info()
573
513
if br_revno == 0:
661
601
except _StartNotLinearAncestor:
662
602
# A merge was never detected so the lower revision limit can't
663
603
# be nested down somewhere
664
raise errors.BzrCommandError(gettext('Start revision not found in'
665
' history of end revision.'))
604
raise errors.BzrCommandError('Start revision not found in'
605
' history of end revision.')
667
607
# We exit the loop above because we encounter a revision with merges, from
668
608
# this revision, we need to switch to _graph_view_revisions.
739
679
br_revno, br_rev_id = branch.last_revision_info()
740
680
repo = branch.repository
741
graph = repo.get_graph()
742
681
if start_rev_id is None and end_rev_id is None:
743
682
cur_revno = br_revno
744
for revision_id in graph.iter_lefthand_ancestry(br_rev_id,
745
(_mod_revision.NULL_REVISION,)):
683
for revision_id in repo.iter_reverse_revision_history(br_rev_id):
746
684
yield revision_id, str(cur_revno), 0
749
687
if end_rev_id is None:
750
688
end_rev_id = br_rev_id
751
689
found_start = start_rev_id is None
752
for revision_id in graph.iter_lefthand_ancestry(end_rev_id,
753
(_mod_revision.NULL_REVISION,)):
690
for revision_id in repo.iter_reverse_revision_history(end_rev_id):
754
691
revno_str = _compute_revno_str(branch, revision_id)
755
692
if not found_start and revision_id == start_rev_id:
756
693
if not exclude_common_ancestry:
808
745
yield rev_id, '.'.join(map(str, revno)), merge_depth
748
@deprecated_function(deprecated_in((2, 2, 0)))
749
def calculate_view_revisions(branch, start_revision, end_revision, direction,
750
specific_fileid, generate_merge_revisions):
751
"""Calculate the revisions to view.
753
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
754
a list of the same tuples.
756
start_rev_id, end_rev_id = _get_revision_limits(branch, start_revision,
758
view_revisions = list(_calc_view_revisions(branch, start_rev_id, end_rev_id,
759
direction, generate_merge_revisions or specific_fileid))
761
view_revisions = _filter_revisions_touching_file_id(branch,
762
specific_fileid, view_revisions,
763
include_merges=generate_merge_revisions)
764
return _rebase_merge_depth(view_revisions)
811
767
def _rebase_merge_depth(view_revisions):
812
768
"""Adjust depths upwards so the top level is 0."""
813
769
# If either the first or last revision have a merge_depth of 0, we're done
857
813
return log_rev_iterator
860
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
816
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):
861
817
"""Create a filtered iterator of log_rev_iterator matching on a regex.
863
819
:param branch: The branch being logged.
864
820
:param generate_delta: Whether to generate a delta for each revision.
865
:param match: A dictionary with properties as keys and lists of strings
866
as values. To match, a revision may match any of the supplied strings
867
within a single property but must match at least one string for each
821
:param search: A user text search string.
869
822
:param log_rev_iterator: An input iterator containing all revisions that
870
823
could be displayed, in lists.
871
824
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
875
828
return log_rev_iterator
876
searchRE = [(k, [re.compile(x, re.IGNORECASE) for x in v])
877
for (k,v) in match.iteritems()]
878
return _filter_re(searchRE, log_rev_iterator)
881
def _filter_re(searchRE, log_rev_iterator):
829
searchRE = re.compile(search, re.IGNORECASE)
830
return _filter_message_re(searchRE, log_rev_iterator)
833
def _filter_message_re(searchRE, log_rev_iterator):
882
834
for revs in log_rev_iterator:
883
new_revs = [rev for rev in revs if _match_filter(searchRE, rev[1])]
887
def _match_filter(searchRE, rev):
889
'message': (rev.message,),
890
'committer': (rev.committer,),
891
'author': (rev.get_apparent_authors()),
892
'bugs': list(rev.iter_bugs())
894
strings[''] = [item for inner_list in strings.itervalues()
895
for item in inner_list]
896
for (k,v) in searchRE:
897
if k in strings and not _match_any_filter(strings[k], v):
901
def _match_any_filter(strings, res):
902
return any([filter(None, map(re.search, strings)) for re in res])
836
for (rev_id, revno, merge_depth), rev, delta in revs:
837
if searchRE.search(rev.message):
838
new_revs.append(((rev_id, revno, merge_depth), rev, delta))
904
842
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
905
843
fileids=None, direction='reverse'):
1079
1018
if branch_revno != 0:
1080
1019
if (start_rev_id == _mod_revision.NULL_REVISION
1081
1020
or end_rev_id == _mod_revision.NULL_REVISION):
1082
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
1021
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1083
1022
if start_revno > end_revno:
1084
raise errors.BzrCommandError(gettext("Start revision must be "
1085
"older than the end revision."))
1023
raise errors.BzrCommandError("Start revision must be older than "
1024
"the end revision.")
1086
1025
return (start_rev_id, end_rev_id)
1138
1077
if ((start_rev_id == _mod_revision.NULL_REVISION)
1139
1078
or (end_rev_id == _mod_revision.NULL_REVISION)):
1140
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
1079
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1141
1080
if start_revno > end_revno:
1142
raise errors.BzrCommandError(gettext("Start revision must be older "
1143
"than the end revision."))
1081
raise errors.BzrCommandError("Start revision must be older than "
1082
"the end revision.")
1145
1084
if end_revno < start_revno:
1146
1085
return None, None, None, None
1147
1086
cur_revno = branch_revno
1149
1088
mainline_revs = []
1150
graph = branch.repository.get_graph()
1151
for revision_id in graph.iter_lefthand_ancestry(
1152
branch_last_revision, (_mod_revision.NULL_REVISION,)):
1089
for revision_id in branch.repository.iter_reverse_revision_history(
1090
branch_last_revision):
1153
1091
if cur_revno < start_revno:
1154
1092
# We have gone far enough, but we always add 1 more revision
1155
1093
rev_nos[revision_id] = cur_revno
1169
1107
return mainline_revs, rev_nos, start_rev_id, end_rev_id
1110
@deprecated_function(deprecated_in((2, 2, 0)))
1111
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
1112
"""Filter view_revisions based on revision ranges.
1114
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1115
tuples to be filtered.
1117
:param start_rev_id: If not NONE specifies the first revision to be logged.
1118
If NONE then all revisions up to the end_rev_id are logged.
1120
:param end_rev_id: If not NONE specifies the last revision to be logged.
1121
If NONE then all revisions up to the end of the log are logged.
1123
:return: The filtered view_revisions.
1125
if start_rev_id or end_rev_id:
1126
revision_ids = [r for r, n, d in view_revisions]
1128
start_index = revision_ids.index(start_rev_id)
1131
if start_rev_id == end_rev_id:
1132
end_index = start_index
1135
end_index = revision_ids.index(end_rev_id)
1137
end_index = len(view_revisions) - 1
1138
# To include the revisions merged into the last revision,
1139
# extend end_rev_id down to, but not including, the next rev
1140
# with the same or lesser merge_depth
1141
end_merge_depth = view_revisions[end_index][2]
1143
for index in xrange(end_index+1, len(view_revisions)+1):
1144
if view_revisions[index][2] <= end_merge_depth:
1145
end_index = index - 1
1148
# if the search falls off the end then log to the end as well
1149
end_index = len(view_revisions) - 1
1150
view_revisions = view_revisions[start_index:end_index+1]
1151
return view_revisions
1172
1154
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1173
1155
include_merges=True):
1174
1156
r"""Return the list of revision ids which touch a given file id.
1238
@deprecated_function(deprecated_in((2, 2, 0)))
1239
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1240
include_merges=True):
1241
"""Produce an iterator of revisions to show
1242
:return: an iterator of (revision_id, revno, merge_depth)
1243
(if there is no revno for a revision, None is supplied)
1245
if not include_merges:
1246
revision_ids = mainline_revs[1:]
1247
if direction == 'reverse':
1248
revision_ids.reverse()
1249
for revision_id in revision_ids:
1250
yield revision_id, str(rev_nos[revision_id]), 0
1252
graph = branch.repository.get_graph()
1253
# This asks for all mainline revisions, which means we only have to spider
1254
# sideways, rather than depth history. That said, its still size-of-history
1255
# and should be addressed.
1256
# mainline_revisions always includes an extra revision at the beginning, so
1258
parent_map = dict(((key, value) for key, value in
1259
graph.iter_ancestry(mainline_revs[1:]) if value is not None))
1260
# filter out ghosts; merge_sort errors on ghosts.
1261
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
1262
merge_sorted_revisions = tsort.merge_sort(
1266
generate_revno=True)
1268
if direction == 'forward':
1269
# forward means oldest first.
1270
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1271
elif direction != 'reverse':
1272
raise ValueError('invalid direction %r' % direction)
1274
for (sequence, rev_id, merge_depth, revno, end_of_merge
1275
) in merge_sorted_revisions:
1276
yield rev_id, '.'.join(map(str, revno)), merge_depth
1256
1279
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1257
1280
"""Reverse revisions by depth.
1355
1374
"""Create a LogFormatter.
1357
1376
:param to_file: the file to output to
1358
:param to_exact_file: if set, gives an output stream to which
1377
:param to_exact_file: if set, gives an output stream to which
1359
1378
non-Unicode diffs are written.
1360
1379
:param show_ids: if True, revision-ids are to be displayed
1361
1380
:param show_timezone: the timezone to use
1597
1612
if revision.delta is not None:
1598
1613
# Use the standard status output to display changes
1599
1614
from bzrlib.delta import report_delta
1600
report_delta(to_file, revision.delta, short_status=False,
1615
report_delta(to_file, revision.delta, short_status=False,
1601
1616
show_ids=self.show_ids, indent=indent)
1602
1617
if revision.diff is not None:
1603
1618
to_file.write(indent + 'diff:\n')
1669
1684
if revision.delta is not None:
1670
1685
# Use the standard status output to display changes
1671
1686
from bzrlib.delta import report_delta
1672
report_delta(to_file, revision.delta,
1673
short_status=self.delta_format==1,
1687
report_delta(to_file, revision.delta,
1688
short_status=self.delta_format==1,
1674
1689
show_ids=self.show_ids, indent=indent + offset)
1675
1690
if revision.diff is not None:
1676
1691
self.show_diff(self.to_exact_file, revision.diff, ' ')
1856
1871
'The committer')
1874
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1875
# deprecated; for compatibility
1876
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
1877
lf.show(revno, rev, delta)
1859
1880
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
1860
1881
log_format='long'):
1861
1882
"""Show the change in revision history comparing the old revision history to the new one.
added
removed
bzrlib/log.py
