229
229
def make_log_request_dict(direction='reverse', specific_fileids=None,
230
230
start_revision=None, end_revision=None, limit=None,
231
message_search=None, levels=1, generate_tags=True,
231
message_search=None, levels=None, generate_tags=True,
233
233
diff_type=None, _match_using_deltas=True,
234
exclude_common_ancestry=False,
234
exclude_common_ancestry=False, match=None,
237
237
"""Convenience function for making a logging request dictionary.
282
283
range operator or as a graph difference.
284
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.
292
# Take care of old style message_search parameter
295
if 'message' in match:
296
match['message'].append(message_search)
298
match['message'] = [message_search]
300
match={ 'message': [message_search] }
287
302
'direction': direction,
288
303
'specific_fileids': specific_fileids,
289
304
'start_revision': start_revision,
290
305
'end_revision': end_revision,
292
'message_search': message_search,
293
307
'levels': levels,
294
308
'generate_tags': generate_tags,
295
309
'delta_type': delta_type,
296
310
'diff_type': diff_type,
297
311
'exclude_common_ancestry': exclude_common_ancestry,
298
312
'signature': signature,
299
314
# Add 'private' attributes for features that may be deprecated
300
315
'_match_using_deltas': _match_using_deltas,
380
395
# Tweak the LogRequest based on what the LogFormatter can handle.
381
396
# (There's no point generating stuff if the formatter can't display it.)
383
rqst['levels'] = lf.get_levels()
398
if rqst['levels'] is None or lf.get_levels() > rqst['levels']:
399
# user didn't specify levels, use whatever the LF can handle:
400
rqst['levels'] = lf.get_levels()
384
402
if not getattr(lf, 'supports_tags', False):
385
403
rqst['generate_tags'] = False
386
404
if not getattr(lf, 'supports_delta', False):
508
526
# Apply the other filters
509
527
return make_log_rev_iterator(self.branch, view_revisions,
510
rqst.get('delta_type'), rqst.get('message_search'),
528
rqst.get('delta_type'), rqst.get('match'),
511
529
file_ids=rqst.get('specific_fileids'),
512
530
direction=rqst.get('direction'))
526
544
rqst.get('specific_fileids')[0], view_revisions,
527
545
include_merges=rqst.get('levels') != 1)
528
546
return make_log_rev_iterator(self.branch, view_revisions,
529
rqst.get('delta_type'), rqst.get('message_search'))
547
rqst.get('delta_type'), rqst.get('match'))
532
550
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
783
801
yield rev_id, '.'.join(map(str, revno)), merge_depth
786
@deprecated_function(deprecated_in((2, 2, 0)))
787
def calculate_view_revisions(branch, start_revision, end_revision, direction,
788
specific_fileid, generate_merge_revisions):
789
"""Calculate the revisions to view.
791
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
792
a list of the same tuples.
794
start_rev_id, end_rev_id = _get_revision_limits(branch, start_revision,
796
view_revisions = list(_calc_view_revisions(branch, start_rev_id, end_rev_id,
797
direction, generate_merge_revisions or specific_fileid))
799
view_revisions = _filter_revisions_touching_file_id(branch,
800
specific_fileid, view_revisions,
801
include_merges=generate_merge_revisions)
802
return _rebase_merge_depth(view_revisions)
805
804
def _rebase_merge_depth(view_revisions):
806
805
"""Adjust depths upwards so the top level is 0."""
807
806
# If either the first or last revision have a merge_depth of 0, we're done
851
850
return log_rev_iterator
854
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):
853
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
855
854
"""Create a filtered iterator of log_rev_iterator matching on a regex.
857
856
:param branch: The branch being logged.
858
857
:param generate_delta: Whether to generate a delta for each revision.
859
:param search: A user text search string.
858
:param match: A dictionary with properties as keys and lists of strings
859
as values. To match, a revision may match any of the supplied strings
860
within a single property but must match at least one string for each
860
862
:param log_rev_iterator: An input iterator containing all revisions that
861
863
could be displayed, in lists.
862
864
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
866
868
return log_rev_iterator
867
searchRE = lazy_regex.lazy_compile(search, re.IGNORECASE)
868
return _filter_message_re(searchRE, log_rev_iterator)
871
def _filter_message_re(searchRE, log_rev_iterator):
869
searchRE = [(k, [re.compile(x, re.IGNORECASE) for x in v])
870
for (k,v) in match.iteritems()]
871
return _filter_re(searchRE, log_rev_iterator)
874
def _filter_re(searchRE, log_rev_iterator):
872
875
for revs in log_rev_iterator:
874
for (rev_id, revno, merge_depth), rev, delta in revs:
875
if searchRE.search(rev.message):
876
new_revs.append(((rev_id, revno, merge_depth), rev, delta))
876
new_revs = [rev for rev in revs if _match_filter(searchRE, rev[1])]
880
def _match_filter(searchRE, rev):
882
'message': (rev.message,),
883
'committer': (rev.committer,),
884
'author': (rev.get_apparent_authors()),
885
'bugs': list(rev.iter_bugs())
887
strings[''] = [item for inner_list in strings.itervalues()
888
for item in inner_list]
889
for (k,v) in searchRE:
890
if k in strings and not _match_any_filter(strings[k], v):
894
def _match_any_filter(strings, res):
895
return any([filter(None, map(re.search, strings)) for re in res])
880
897
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
881
898
fileids=None, direction='reverse'):
1146
1162
return mainline_revs, rev_nos, start_rev_id, end_rev_id
1149
@deprecated_function(deprecated_in((2, 2, 0)))
1150
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
1151
"""Filter view_revisions based on revision ranges.
1153
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1154
tuples to be filtered.
1156
:param start_rev_id: If not NONE specifies the first revision to be logged.
1157
If NONE then all revisions up to the end_rev_id are logged.
1159
:param end_rev_id: If not NONE specifies the last revision to be logged.
1160
If NONE then all revisions up to the end of the log are logged.
1162
:return: The filtered view_revisions.
1164
if start_rev_id or end_rev_id:
1165
revision_ids = [r for r, n, d in view_revisions]
1167
start_index = revision_ids.index(start_rev_id)
1170
if start_rev_id == end_rev_id:
1171
end_index = start_index
1174
end_index = revision_ids.index(end_rev_id)
1176
end_index = len(view_revisions) - 1
1177
# To include the revisions merged into the last revision,
1178
# extend end_rev_id down to, but not including, the next rev
1179
# with the same or lesser merge_depth
1180
end_merge_depth = view_revisions[end_index][2]
1182
for index in xrange(end_index+1, len(view_revisions)+1):
1183
if view_revisions[index][2] <= end_merge_depth:
1184
end_index = index - 1
1187
# if the search falls off the end then log to the end as well
1188
end_index = len(view_revisions) - 1
1189
view_revisions = view_revisions[start_index:end_index+1]
1190
return view_revisions
1193
1165
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1194
1166
include_merges=True):
1195
1167
r"""Return the list of revision ids which touch a given file id.
1277
@deprecated_function(deprecated_in((2, 2, 0)))
1278
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1279
include_merges=True):
1280
"""Produce an iterator of revisions to show
1281
:return: an iterator of (revision_id, revno, merge_depth)
1282
(if there is no revno for a revision, None is supplied)
1284
if not include_merges:
1285
revision_ids = mainline_revs[1:]
1286
if direction == 'reverse':
1287
revision_ids.reverse()
1288
for revision_id in revision_ids:
1289
yield revision_id, str(rev_nos[revision_id]), 0
1291
graph = branch.repository.get_graph()
1292
# This asks for all mainline revisions, which means we only have to spider
1293
# sideways, rather than depth history. That said, its still size-of-history
1294
# and should be addressed.
1295
# mainline_revisions always includes an extra revision at the beginning, so
1297
parent_map = dict(((key, value) for key, value in
1298
graph.iter_ancestry(mainline_revs[1:]) if value is not None))
1299
# filter out ghosts; merge_sort errors on ghosts.
1300
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
1301
merge_sorted_revisions = tsort.merge_sort(
1305
generate_revno=True)
1307
if direction == 'forward':
1308
# forward means oldest first.
1309
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1310
elif direction != 'reverse':
1311
raise ValueError('invalid direction %r' % direction)
1313
for (sequence, rev_id, merge_depth, revno, end_of_merge
1314
) in merge_sorted_revisions:
1315
yield rev_id, '.'.join(map(str, revno)), merge_depth
1318
1249
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1319
1250
"""Reverse revisions by depth.
1417
1348
"""Create a LogFormatter.
1419
1350
:param to_file: the file to output to
1420
:param to_exact_file: if set, gives an output stream to which
1351
:param to_exact_file: if set, gives an output stream to which
1421
1352
non-Unicode diffs are written.
1422
1353
:param show_ids: if True, revision-ids are to be displayed
1423
1354
:param show_timezone: the timezone to use
1659
1590
if revision.delta is not None:
1660
1591
# Use the standard status output to display changes
1661
1592
from bzrlib.delta import report_delta
1662
report_delta(to_file, revision.delta, short_status=False,
1593
report_delta(to_file, revision.delta, short_status=False,
1663
1594
show_ids=self.show_ids, indent=indent)
1664
1595
if revision.diff is not None:
1665
1596
to_file.write(indent + 'diff:\n')
1731
1662
if revision.delta is not None:
1732
1663
# Use the standard status output to display changes
1733
1664
from bzrlib.delta import report_delta
1734
report_delta(to_file, revision.delta,
1735
short_status=self.delta_format==1,
1665
report_delta(to_file, revision.delta,
1666
short_status=self.delta_format==1,
1736
1667
show_ids=self.show_ids, indent=indent + offset)
1737
1668
if revision.diff is not None:
1738
1669
self.show_diff(self.to_exact_file, revision.diff, ' ')
1918
1849
'The committer')
1921
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1922
# deprecated; for compatibility
1923
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
1924
lf.show(revno, rev, delta)
1927
1852
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
1928
1853
log_format='long'):
1929
1854
"""Show the change in revision history comparing the old revision history to the new one.
added
removed
bzrlib/log.py
