73
73
repository as _mod_repository,
74
74
revision as _mod_revision,
78
from bzrlib.i18n import gettext, ngettext
81
81
from bzrlib import (
85
84
from bzrlib.osutils import (
87
86
format_date_with_offset_in_original_timezone,
88
get_diff_header_encoding,
89
87
get_terminal_encoding,
91
from bzrlib.symbol_versioning import (
94
97
def find_touching_revisions(branch, file_id):
215
214
Logger(branch, rqst).show(lf)
218
# Note: This needs to be kept in sync with the defaults in
217
# Note: This needs to be kept this in sync with the defaults in
219
218
# make_log_request_dict() below
220
219
_DEFAULT_REQUEST_PARAMS = {
221
220
'direction': 'reverse',
223
222
'generate_tags': True,
224
223
'exclude_common_ancestry': False,
225
224
'_match_using_deltas': True,
229
228
def make_log_request_dict(direction='reverse', specific_fileids=None,
230
229
start_revision=None, end_revision=None, limit=None,
231
message_search=None, levels=None, generate_tags=True,
230
message_search=None, levels=1, generate_tags=True,
233
232
diff_type=None, _match_using_deltas=True,
234
exclude_common_ancestry=False, match=None,
235
signature=False, omit_merges=False,
233
exclude_common_ancestry=False,
237
235
"""Convenience function for making a logging request dictionary.
259
257
matching commit messages
261
259
:param levels: the number of levels of revisions to
262
generate; 1 for just the mainline; 0 for all levels, or None for
260
generate; 1 for just the mainline; 0 for all levels.
265
262
:param generate_tags: If True, include tags for matched revisions.
267
264
:param delta_type: Either 'full', 'partial' or None.
268
265
'full' means generate the complete delta - adds/deletes/modifies/etc;
269
266
'partial' means filter the delta using specific_fileids;
282
279
:param exclude_common_ancestry: Whether -rX..Y should be interpreted as a
283
280
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
283
'direction': direction,
306
284
'specific_fileids': specific_fileids,
307
285
'start_revision': start_revision,
308
286
'end_revision': end_revision,
288
'message_search': message_search,
310
289
'levels': levels,
311
290
'generate_tags': generate_tags,
312
291
'delta_type': delta_type,
313
292
'diff_type': diff_type,
314
293
'exclude_common_ancestry': exclude_common_ancestry,
315
'signature': signature,
317
'omit_merges': omit_merges,
318
294
# Add 'private' attributes for features that may be deprecated
319
295
'_match_using_deltas': _match_using_deltas,
323
299
def _apply_log_request_defaults(rqst):
324
300
"""Apply default values to a request dictionary."""
325
result = _DEFAULT_REQUEST_PARAMS.copy()
301
result = _DEFAULT_REQUEST_PARAMS
327
303
result.update(rqst)
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
307
class LogGenerator(object):
353
308
"""A generator of log revisions."""
399
354
# Tweak the LogRequest based on what the LogFormatter can handle.
400
355
# (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()
357
rqst['levels'] = lf.get_levels()
406
358
if not getattr(lf, 'supports_tags', False):
407
359
rqst['generate_tags'] = False
408
360
if not getattr(lf, 'supports_delta', False):
409
361
rqst['delta_type'] = None
410
362
if not getattr(lf, 'supports_diff', False):
411
363
rqst['diff_type'] = None
412
if not getattr(lf, 'supports_signatures', False):
413
rqst['signature'] = False
415
365
# Find and print the interesting revisions
416
366
generator = self._generator_factory(self.branch, rqst)
459
407
# 0 levels means show everything; merge_depth counts from 0
460
408
if levels != 0 and merge_depth >= levels:
462
if omit_merges and len(rev.parent_ids) > 1:
464
410
if diff_type is None:
467
413
diff = self._format_diff(rev, rev_id, diff_type)
469
signature = format_signature_validity(rev_id,
470
self.branch.repository)
473
414
yield LogRevision(rev, revno, merge_depth, delta,
474
self.rev_tag_dict.get(rev_id), diff, signature)
415
self.rev_tag_dict.get(rev_id), diff)
477
418
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:
582
522
elif not generate_merge_revisions:
583
523
# If we only want to see linear revisions, we can iterate ...
584
524
iter_revs = _generate_flat_revisions(branch, start_rev_id, end_rev_id,
585
direction, exclude_common_ancestry)
586
526
if direction == 'forward':
587
527
iter_revs = reversed(iter_revs)
600
540
return [(br_rev_id, br_revno, 0)]
602
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)
603
544
return [(rev_id, revno_str, 0)]
606
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction,
607
exclude_common_ancestry=False):
608
result = _linear_view_revisions(
609
branch, start_rev_id, end_rev_id,
610
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)
611
549
# If a start limit was given and it's not obviously an
612
550
# ancestor of the end limit, check it before outputting anything
613
551
if direction == 'forward' or (start_rev_id
634
572
if delayed_graph_generation:
636
574
for rev_id, revno, depth in _linear_view_revisions(
637
branch, start_rev_id, end_rev_id, exclude_common_ancestry):
575
branch, start_rev_id, end_rev_id):
638
576
if _has_merges(branch, rev_id):
639
577
# The end_rev_id can be nested down somewhere. We need an
640
578
# explicit ancestry check. There is an ambiguity here as we
661
599
except _StartNotLinearAncestor:
662
600
# A merge was never detected so the lower revision limit can't
663
601
# be nested down somewhere
664
raise errors.BzrCommandError(gettext('Start revision not found in'
665
' history of end revision.'))
602
raise errors.BzrCommandError('Start revision not found in'
603
' history of end revision.')
667
605
# We exit the loop above because we encounter a revision with merges, from
668
606
# this revision, we need to switch to _graph_view_revisions.
685
623
return len(parents) > 1
688
def _compute_revno_str(branch, rev_id):
689
"""Compute the revno string from a rev_id.
691
:return: The revno string, or None if the revision is not in the supplied
695
revno = branch.revision_id_to_dotted_revno(rev_id)
696
except errors.NoSuchRevision:
697
# The revision must be outside of this branch
700
return '.'.join(str(n) for n in revno)
703
626
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
704
627
"""Is start_rev_id an obvious ancestor of end_rev_id?"""
705
628
if start_rev_id and end_rev_id:
707
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
708
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
709
except errors.NoSuchRevision:
710
# 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)
712
631
if len(start_dotted) == 1 and len(end_dotted) == 1:
713
632
# both on mainline
714
633
return start_dotted[0] <= end_dotted[0]
727
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
728
exclude_common_ancestry=False):
646
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
729
647
"""Calculate a sequence of revisions to view, newest to oldest.
731
649
:param start_rev_id: the lower revision-id
732
650
:param end_rev_id: the upper revision-id
733
:param exclude_common_ancestry: Whether the start_rev_id should be part of
734
the iterated revisions.
735
651
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
736
652
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
737
is not found walking the left-hand history
653
is not found walking the left-hand history
739
655
br_revno, br_rev_id = branch.last_revision_info()
740
656
repo = branch.repository
741
graph = repo.get_graph()
742
657
if start_rev_id is None and end_rev_id is None:
743
658
cur_revno = br_revno
744
for revision_id in graph.iter_lefthand_ancestry(br_rev_id,
745
(_mod_revision.NULL_REVISION,)):
659
for revision_id in repo.iter_reverse_revision_history(br_rev_id):
746
660
yield revision_id, str(cur_revno), 0
749
663
if end_rev_id is None:
750
664
end_rev_id = br_rev_id
751
665
found_start = start_rev_id is None
752
for revision_id in graph.iter_lefthand_ancestry(end_rev_id,
753
(_mod_revision.NULL_REVISION,)):
754
revno_str = _compute_revno_str(branch, revision_id)
666
for revision_id in repo.iter_reverse_revision_history(end_rev_id):
667
revno = branch.revision_id_to_dotted_revno(revision_id)
668
revno_str = '.'.join(str(n) for n in revno)
755
669
if not found_start and revision_id == start_rev_id:
756
if not exclude_common_ancestry:
757
yield revision_id, revno_str, 0
670
yield revision_id, revno_str, 0
758
671
found_start = True
808
721
yield rev_id, '.'.join(map(str, revno)), merge_depth
724
@deprecated_function(deprecated_in((2, 2, 0)))
725
def calculate_view_revisions(branch, start_revision, end_revision, direction,
726
specific_fileid, generate_merge_revisions):
727
"""Calculate the revisions to view.
729
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
730
a list of the same tuples.
732
start_rev_id, end_rev_id = _get_revision_limits(branch, start_revision,
734
view_revisions = list(_calc_view_revisions(branch, start_rev_id, end_rev_id,
735
direction, generate_merge_revisions or specific_fileid))
737
view_revisions = _filter_revisions_touching_file_id(branch,
738
specific_fileid, view_revisions,
739
include_merges=generate_merge_revisions)
740
return _rebase_merge_depth(view_revisions)
811
743
def _rebase_merge_depth(view_revisions):
812
744
"""Adjust depths upwards so the top level is 0."""
813
745
# If either the first or last revision have a merge_depth of 0, we're done
857
789
return log_rev_iterator
860
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
792
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):
861
793
"""Create a filtered iterator of log_rev_iterator matching on a regex.
863
795
:param branch: The branch being logged.
864
796
: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
797
:param search: A user text search string.
869
798
:param log_rev_iterator: An input iterator containing all revisions that
870
799
could be displayed, in lists.
871
800
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
875
804
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):
805
searchRE = re_compile_checked(search, re.IGNORECASE,
806
'log message filter')
807
return _filter_message_re(searchRE, log_rev_iterator)
810
def _filter_message_re(searchRE, log_rev_iterator):
882
811
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])
813
for (rev_id, revno, merge_depth), rev, delta in revs:
814
if searchRE.search(rev.message):
815
new_revs.append(((rev_id, revno, merge_depth), rev, delta))
904
819
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
905
820
fileids=None, direction='reverse'):
1079
995
if branch_revno != 0:
1080
996
if (start_rev_id == _mod_revision.NULL_REVISION
1081
997
or end_rev_id == _mod_revision.NULL_REVISION):
1082
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
998
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1083
999
if start_revno > end_revno:
1084
raise errors.BzrCommandError(gettext("Start revision must be "
1085
"older than the end revision."))
1000
raise errors.BzrCommandError("Start revision must be older than "
1001
"the end revision.")
1086
1002
return (start_rev_id, end_rev_id)
1138
1054
if ((start_rev_id == _mod_revision.NULL_REVISION)
1139
1055
or (end_rev_id == _mod_revision.NULL_REVISION)):
1140
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
1056
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1141
1057
if start_revno > end_revno:
1142
raise errors.BzrCommandError(gettext("Start revision must be older "
1143
"than the end revision."))
1058
raise errors.BzrCommandError("Start revision must be older than "
1059
"the end revision.")
1145
1061
if end_revno < start_revno:
1146
1062
return None, None, None, None
1147
1063
cur_revno = branch_revno
1149
1065
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,)):
1066
for revision_id in branch.repository.iter_reverse_revision_history(
1067
branch_last_revision):
1153
1068
if cur_revno < start_revno:
1154
1069
# We have gone far enough, but we always add 1 more revision
1155
1070
rev_nos[revision_id] = cur_revno
1169
1084
return mainline_revs, rev_nos, start_rev_id, end_rev_id
1087
@deprecated_function(deprecated_in((2, 2, 0)))
1088
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
1089
"""Filter view_revisions based on revision ranges.
1091
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1092
tuples to be filtered.
1094
:param start_rev_id: If not NONE specifies the first revision to be logged.
1095
If NONE then all revisions up to the end_rev_id are logged.
1097
:param end_rev_id: If not NONE specifies the last revision to be logged.
1098
If NONE then all revisions up to the end of the log are logged.
1100
:return: The filtered view_revisions.
1102
if start_rev_id or end_rev_id:
1103
revision_ids = [r for r, n, d in view_revisions]
1105
start_index = revision_ids.index(start_rev_id)
1108
if start_rev_id == end_rev_id:
1109
end_index = start_index
1112
end_index = revision_ids.index(end_rev_id)
1114
end_index = len(view_revisions) - 1
1115
# To include the revisions merged into the last revision,
1116
# extend end_rev_id down to, but not including, the next rev
1117
# with the same or lesser merge_depth
1118
end_merge_depth = view_revisions[end_index][2]
1120
for index in xrange(end_index+1, len(view_revisions)+1):
1121
if view_revisions[index][2] <= end_merge_depth:
1122
end_index = index - 1
1125
# if the search falls off the end then log to the end as well
1126
end_index = len(view_revisions) - 1
1127
view_revisions = view_revisions[start_index:end_index+1]
1128
return view_revisions
1172
1131
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1173
1132
include_merges=True):
1174
1133
r"""Return the list of revision ids which touch a given file id.
1213
@deprecated_function(deprecated_in((2, 2, 0)))
1214
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1215
include_merges=True):
1216
"""Produce an iterator of revisions to show
1217
:return: an iterator of (revision_id, revno, merge_depth)
1218
(if there is no revno for a revision, None is supplied)
1220
if not include_merges:
1221
revision_ids = mainline_revs[1:]
1222
if direction == 'reverse':
1223
revision_ids.reverse()
1224
for revision_id in revision_ids:
1225
yield revision_id, str(rev_nos[revision_id]), 0
1227
graph = branch.repository.get_graph()
1228
# This asks for all mainline revisions, which means we only have to spider
1229
# sideways, rather than depth history. That said, its still size-of-history
1230
# and should be addressed.
1231
# mainline_revisions always includes an extra revision at the beginning, so
1233
parent_map = dict(((key, value) for key, value in
1234
graph.iter_ancestry(mainline_revs[1:]) if value is not None))
1235
# filter out ghosts; merge_sort errors on ghosts.
1236
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
1237
merge_sorted_revisions = tsort.merge_sort(
1241
generate_revno=True)
1243
if direction == 'forward':
1244
# forward means oldest first.
1245
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1246
elif direction != 'reverse':
1247
raise ValueError('invalid direction %r' % direction)
1249
for (sequence, rev_id, merge_depth, revno, end_of_merge
1250
) in merge_sorted_revisions:
1251
yield rev_id, '.'.join(map(str, revno)), merge_depth
1256
1254
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1257
1255
"""Reverse revisions by depth.
1295
1293
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
1296
tags=None, diff=None, signature=None):
1294
tags=None, diff=None):
1301
self.revno = str(revno)
1296
self.revno = str(revno)
1302
1297
self.merge_depth = merge_depth
1303
1298
self.delta = delta
1304
1299
self.tags = tags
1305
1300
self.diff = diff
1306
self.signature = signature
1309
1303
class LogFormatter(object):
1318
1312
to indicate which LogRevision attributes it supports:
1320
1314
- supports_delta must be True if this log formatter supports delta.
1321
Otherwise the delta attribute may not be populated. The 'delta_format'
1322
attribute describes whether the 'short_status' format (1) or the long
1323
one (2) should be used.
1315
Otherwise the delta attribute may not be populated. The 'delta_format'
1316
attribute describes whether the 'short_status' format (1) or the long
1317
one (2) should be used.
1325
1319
- supports_merge_revisions must be True if this log formatter supports
1326
merge revisions. If not, then only mainline revisions will be passed
1320
merge revisions. If not, then only mainline revisions will be passed
1329
1323
- preferred_levels is the number of levels this formatter defaults to.
1330
The default value is zero meaning display all levels.
1331
This value is only relevant if supports_merge_revisions is True.
1324
The default value is zero meaning display all levels.
1325
This value is only relevant if supports_merge_revisions is True.
1333
1327
- supports_tags must be True if this log formatter supports tags.
1334
Otherwise the tags attribute may not be populated.
1328
Otherwise the tags attribute may not be populated.
1336
1330
- supports_diff must be True if this log formatter supports diffs.
1337
Otherwise the diff attribute may not be populated.
1339
- supports_signatures must be True if this log formatter supports GPG
1331
Otherwise the diff attribute may not be populated.
1342
1333
Plugins can register functions to show custom revision properties using
1343
1334
the properties_handler_registry. The registered function
1344
must respect the following interface description::
1335
must respect the following interface description:
1346
1336
def my_show_properties(properties_dict):
1347
1337
# code that returns a dict {'name':'value'} of the properties
1352
1342
def __init__(self, to_file, show_ids=False, show_timezone='original',
1353
1343
delta_format=None, levels=None, show_advice=False,
1354
to_exact_file=None, author_list_handler=None):
1344
to_exact_file=None):
1355
1345
"""Create a LogFormatter.
1357
1347
:param to_file: the file to output to
1358
:param to_exact_file: if set, gives an output stream to which
1348
:param to_exact_file: if set, gives an output stream to which
1359
1349
non-Unicode diffs are written.
1360
1350
:param show_ids: if True, revision-ids are to be displayed
1361
1351
:param show_timezone: the timezone to use
1427
1414
def short_author(self, rev):
1428
return self.authors(rev, 'first', short=True, sep=', ')
1430
def authors(self, rev, who, short=False, sep=None):
1431
"""Generate list of authors, taking --authors option into account.
1433
The caller has to specify the name of a author list handler,
1434
as provided by the author list registry, using the ``who``
1435
argument. That name only sets a default, though: when the
1436
user selected a different author list generation using the
1437
``--authors`` command line switch, as represented by the
1438
``author_list_handler`` constructor argument, that value takes
1441
:param rev: The revision for which to generate the list of authors.
1442
:param who: Name of the default handler.
1443
:param short: Whether to shorten names to either name or address.
1444
:param sep: What separator to use for automatic concatenation.
1446
if self._author_list_handler is not None:
1447
# The user did specify --authors, which overrides the default
1448
author_list_handler = self._author_list_handler
1450
# The user didn't specify --authors, so we use the caller's default
1451
author_list_handler = author_list_registry.get(who)
1452
names = author_list_handler(rev)
1454
for i in range(len(names)):
1455
name, address = config.parse_username(names[i])
1461
names = sep.join(names)
1415
name, address = config.parse_username(rev.get_apparent_authors()[0])
1464
1420
def merge_marker(self, revision):
1465
1421
"""Get the merge marker to include in the output or '' if none."""
1561
1516
self.merge_marker(revision)))
1562
1517
if revision.tags:
1563
1518
lines.append('tags: %s' % (', '.join(revision.tags)))
1564
if self.show_ids or revision.revno is None:
1565
1520
lines.append('revision-id: %s' % (revision.rev.revision_id,))
1567
1521
for parent_id in revision.rev.parent_ids:
1568
1522
lines.append('parent: %s' % (parent_id,))
1569
1523
lines.extend(self.custom_properties(revision.rev))
1571
1525
committer = revision.rev.committer
1572
authors = self.authors(revision.rev, 'all')
1526
authors = revision.rev.get_apparent_authors()
1573
1527
if authors != [committer]:
1574
1528
lines.append('author: %s' % (", ".join(authors),))
1575
1529
lines.append('committer: %s' % (committer,))
1597
1548
if revision.delta is not None:
1598
1549
# Use the standard status output to display changes
1599
1550
from bzrlib.delta import report_delta
1600
report_delta(to_file, revision.delta, short_status=False,
1551
report_delta(to_file, revision.delta, short_status=False,
1601
1552
show_ids=self.show_ids, indent=indent)
1602
1553
if revision.diff is not None:
1603
1554
to_file.write(indent + 'diff:\n')
1649
1600
if revision.tags:
1650
1601
tags = ' {%s}' % (', '.join(revision.tags))
1651
1602
to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1652
revision.revno or "", self.short_author(revision.rev),
1603
revision.revno, self.short_author(revision.rev),
1653
1604
format_date(revision.rev.timestamp,
1654
1605
revision.rev.timezone or 0,
1655
1606
self.show_timezone, date_fmt="%Y-%m-%d",
1656
1607
show_offset=False),
1657
1608
tags, self.merge_marker(revision)))
1658
1609
self.show_properties(revision.rev, indent+offset)
1659
if self.show_ids or revision.revno is None:
1660
1611
to_file.write(indent + offset + 'revision-id:%s\n'
1661
1612
% (revision.rev.revision_id,))
1662
1613
if not revision.rev.message:
1669
1620
if revision.delta is not None:
1670
1621
# Use the standard status output to display changes
1671
1622
from bzrlib.delta import report_delta
1672
report_delta(to_file, revision.delta,
1673
short_status=self.delta_format==1,
1623
report_delta(to_file, revision.delta,
1624
short_status=self.delta_format==1,
1674
1625
show_ids=self.show_ids, indent=indent + offset)
1675
1626
if revision.diff is not None:
1676
1627
self.show_diff(self.to_exact_file, revision.diff, ' ')
1716
1667
def log_string(self, revno, rev, max_chars, tags=None, prefix=''):
1717
1668
"""Format log info into one string. Truncate tail of string
1719
:param revno: revision number or None.
1720
Revision numbers counts from 1.
1721
:param rev: revision object
1722
:param max_chars: maximum length of resulting string
1723
:param tags: list of tags or None
1724
:param prefix: string to prefix each line
1725
:return: formatted truncated string
1669
:param revno: revision number or None.
1670
Revision numbers counts from 1.
1671
:param rev: revision object
1672
:param max_chars: maximum length of resulting string
1673
:param tags: list of tags or None
1674
:param prefix: string to prefix each line
1675
:return: formatted truncated string
1729
1679
# show revno only when is not None
1730
1680
out.append("%s:" % revno)
1731
if max_chars is not None:
1732
out.append(self.truncate(self.short_author(rev), (max_chars+3)/4))
1734
out.append(self.short_author(rev))
1681
out.append(self.truncate(self.short_author(rev), 20))
1735
1682
out.append(self.date_string(rev))
1736
1683
if len(rev.parent_ids) > 1:
1737
1684
out.append('[merge]')
1756
1703
self.show_timezone,
1757
1704
date_fmt='%Y-%m-%d',
1758
1705
show_offset=False)
1759
committer_str = self.authors(revision.rev, 'first', sep=', ')
1760
committer_str = committer_str.replace(' <', ' <')
1706
committer_str = revision.rev.get_apparent_authors()[0].replace (' <', ' <')
1761
1707
to_file.write('%s %s\n\n' % (date_str,committer_str))
1763
1709
if revision.delta is not None and revision.delta.has_changed():
1826
1772
return log_formatter_registry.make_formatter(name, *args, **kwargs)
1827
1773
except KeyError:
1828
raise errors.BzrCommandError(gettext("unknown log formatter: %r") % name)
1831
def author_list_all(rev):
1832
return rev.get_apparent_authors()[:]
1835
def author_list_first(rev):
1836
lst = rev.get_apparent_authors()
1843
def author_list_committer(rev):
1844
return [rev.committer]
1847
author_list_registry = registry.Registry()
1849
author_list_registry.register('all', author_list_all,
1852
author_list_registry.register('first', author_list_first,
1855
author_list_registry.register('committer', author_list_committer,
1774
raise errors.BzrCommandError("unknown log formatter: %r" % name)
1777
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1778
# deprecated; for compatibility
1779
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
1780
lf.show(revno, rev, delta)
1859
1783
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
2017
1940
:param file_list: the list of paths given on the command line;
2018
1941
the first of these can be a branch location or a file path,
2019
1942
the remainder must be file paths
2020
:param add_cleanup: When the branch returned is read locked,
2021
an unlock call will be queued to the cleanup.
2022
1943
:return: (branch, info_list, start_rev_info, end_rev_info) where
2023
1944
info_list is a list of (relative_path, file_id, kind) tuples where
2024
1945
kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
2025
1946
branch will be read-locked.
2027
from builtins import _get_revision_range
1948
from builtins import _get_revision_range, safe_relpath_files
2028
1949
tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2029
add_cleanup(b.lock_read().unlock)
2030
1951
# XXX: It's damn messy converting a list of paths to relative paths when
2031
1952
# those paths might be deleted ones, they might be on a case-insensitive
2032
1953
# filesystem and/or they might be in silly locations (like another branch).
added
removed
bzrlib/log.py
