49
47
all the changes since the previous revision that touched hello.c.
50
from __future__ import absolute_import
53
from cStringIO import StringIO
54
from itertools import (
60
56
from warnings import (
64
from bzrlib.lazy_import import lazy_import
60
from .lazy_import import lazy_import
65
61
lazy_import(globals(), """
73
69
repository as _mod_repository,
74
70
revision as _mod_revision,
74
from breezy.i18n import gettext, ngettext
84
from bzrlib.osutils import (
81
from .osutils import (
86
83
format_date_with_offset_in_original_timezone,
84
get_diff_header_encoding,
87
85
get_terminal_encoding,
91
from bzrlib.symbol_versioning import (
88
from breezy.sixish import (
111
for revision_id in branch.revision_history():
109
graph = branch.repository.get_graph()
110
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
111
[_mod_revision.NULL_REVISION]))
112
for revision_id in reversed(history):
112
113
this_inv = branch.repository.get_inventory(revision_id)
113
if file_id in this_inv:
114
if this_inv.has_id(file_id):
114
115
this_ie = this_inv[file_id]
115
116
this_path = this_inv.id2path(file_id)
214
210
Logger(branch, rqst).show(lf)
217
# Note: This needs to be kept this in sync with the defaults in
213
# Note: This needs to be kept in sync with the defaults in
218
214
# make_log_request_dict() below
219
215
_DEFAULT_REQUEST_PARAMS = {
220
216
'direction': 'reverse',
222
218
'generate_tags': True,
223
219
'exclude_common_ancestry': False,
224
220
'_match_using_deltas': True,
228
224
def make_log_request_dict(direction='reverse', specific_fileids=None,
229
225
start_revision=None, end_revision=None, limit=None,
230
message_search=None, levels=1, generate_tags=True,
226
message_search=None, levels=None, generate_tags=True,
232
228
diff_type=None, _match_using_deltas=True,
233
exclude_common_ancestry=False,
229
exclude_common_ancestry=False, match=None,
230
signature=False, omit_merges=False,
235
232
"""Convenience function for making a logging request dictionary.
257
254
matching commit messages
259
256
:param levels: the number of levels of revisions to
260
generate; 1 for just the mainline; 0 for all levels.
257
generate; 1 for just the mainline; 0 for all levels, or None for
262
260
:param generate_tags: If True, include tags for matched revisions.
264
262
:param delta_type: Either 'full', 'partial' or None.
265
263
'full' means generate the complete delta - adds/deletes/modifies/etc;
266
264
'partial' means filter the delta using specific_fileids;
274
272
:param _match_using_deltas: a private parameter controlling the
275
273
algorithm used for matching specific_fileids. This parameter
276
may be removed in the future so bzrlib client code should NOT
274
may be removed in the future so breezy client code should NOT
279
277
:param exclude_common_ancestry: Whether -rX..Y should be interpreted as a
280
278
range operator or as a graph difference.
280
:param signature: show digital signature information
282
:param match: Dictionary of list of search strings to use when filtering
283
revisions. Keys can be 'message', 'author', 'committer', 'bugs' or
284
the empty string to match any of the preceding properties.
286
:param omit_merges: If True, commits with more than one parent are
290
# Take care of old style message_search parameter
293
if 'message' in match:
294
match['message'].append(message_search)
296
match['message'] = [message_search]
298
match={ 'message': [message_search] }
283
300
'direction': direction,
284
301
'specific_fileids': specific_fileids,
285
302
'start_revision': start_revision,
286
303
'end_revision': end_revision,
288
'message_search': message_search,
289
305
'levels': levels,
290
306
'generate_tags': generate_tags,
291
307
'delta_type': delta_type,
292
308
'diff_type': diff_type,
293
309
'exclude_common_ancestry': exclude_common_ancestry,
310
'signature': signature,
312
'omit_merges': omit_merges,
294
313
# Add 'private' attributes for features that may be deprecated
295
314
'_match_using_deltas': _match_using_deltas,
299
318
def _apply_log_request_defaults(rqst):
300
319
"""Apply default values to a request dictionary."""
301
result = _DEFAULT_REQUEST_PARAMS
320
result = _DEFAULT_REQUEST_PARAMS.copy()
303
322
result.update(rqst)
326
def format_signature_validity(rev_id, repo):
327
"""get the signature validity
329
:param rev_id: revision id to validate
330
:param repo: repository of revision
331
:return: human readable string to print to log
333
from breezy import gpg
335
gpg_strategy = gpg.GPGStrategy(None)
336
result = repo.verify_revision_signature(rev_id, gpg_strategy)
337
if result[0] == gpg.SIGNATURE_VALID:
338
return u"valid signature from {0}".format(result[1])
339
if result[0] == gpg.SIGNATURE_KEY_MISSING:
340
return "unknown key {0}".format(result[1])
341
if result[0] == gpg.SIGNATURE_NOT_VALID:
342
return "invalid signature!"
343
if result[0] == gpg.SIGNATURE_NOT_SIGNED:
344
return "no signature"
307
347
class LogGenerator(object):
308
348
"""A generator of log revisions."""
354
394
# Tweak the LogRequest based on what the LogFormatter can handle.
355
395
# (There's no point generating stuff if the formatter can't display it.)
357
rqst['levels'] = lf.get_levels()
397
if rqst['levels'] is None or lf.get_levels() > rqst['levels']:
398
# user didn't specify levels, use whatever the LF can handle:
399
rqst['levels'] = lf.get_levels()
358
401
if not getattr(lf, 'supports_tags', False):
359
402
rqst['generate_tags'] = False
360
403
if not getattr(lf, 'supports_delta', False):
361
404
rqst['delta_type'] = None
362
405
if not getattr(lf, 'supports_diff', False):
363
406
rqst['diff_type'] = None
407
if not getattr(lf, 'supports_signatures', False):
408
rqst['signature'] = False
365
410
# Find and print the interesting revisions
366
411
generator = self._generator_factory(self.branch, rqst)
407
454
# 0 levels means show everything; merge_depth counts from 0
408
455
if levels != 0 and merge_depth >= levels:
457
if omit_merges and len(rev.parent_ids) > 1:
410
459
if diff_type is None:
413
462
diff = self._format_diff(rev, rev_id, diff_type)
464
signature = format_signature_validity(rev_id,
465
self.branch.repository)
414
468
yield LogRevision(rev, revno, merge_depth, delta,
415
self.rev_tag_dict.get(rev_id), diff)
469
self.rev_tag_dict.get(rev_id), diff, signature)
418
472
if log_count >= limit:
431
485
specific_files = [tree_2.id2path(id) for id in file_ids]
433
487
specific_files = None
489
path_encoding = get_diff_header_encoding()
435
490
diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
491
new_label='', path_encoding=path_encoding)
437
492
return s.getvalue()
439
494
def _create_log_revision_iterator(self):
473
528
# Apply the other filters
474
529
return make_log_rev_iterator(self.branch, view_revisions,
475
rqst.get('delta_type'), rqst.get('message_search'),
530
rqst.get('delta_type'), rqst.get('match'),
476
531
file_ids=rqst.get('specific_fileids'),
477
532
direction=rqst.get('direction'))
491
546
rqst.get('specific_fileids')[0], view_revisions,
492
547
include_merges=rqst.get('levels') != 1)
493
548
return make_log_rev_iterator(self.branch, view_revisions,
494
rqst.get('delta_type'), rqst.get('message_search'))
549
rqst.get('delta_type'), rqst.get('match'))
497
552
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
505
560
a list of the same tuples.
507
562
if (exclude_common_ancestry and start_rev_id == end_rev_id):
508
raise errors.BzrCommandError(
509
'--exclude-common-ancestry requires two different revisions')
563
raise errors.BzrCommandError(gettext(
564
'--exclude-common-ancestry requires two different revisions'))
510
565
if direction not in ('reverse', 'forward'):
511
raise ValueError('invalid direction %r' % direction)
566
raise ValueError(gettext('invalid direction %r') % direction)
512
567
br_revno, br_rev_id = branch.last_revision_info()
513
568
if br_revno == 0:
517
572
and (not generate_merge_revisions
518
573
or not _has_merges(branch, end_rev_id))):
519
574
# If a single revision is requested, check we can handle it
520
iter_revs = _generate_one_revision(branch, end_rev_id, br_rev_id,
522
elif not generate_merge_revisions:
523
# If we only want to see linear revisions, we can iterate ...
524
iter_revs = _generate_flat_revisions(branch, start_rev_id, end_rev_id,
526
if direction == 'forward':
527
iter_revs = reversed(iter_revs)
529
iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
530
direction, delayed_graph_generation,
531
exclude_common_ancestry)
532
if direction == 'forward':
533
iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
575
return _generate_one_revision(branch, end_rev_id, br_rev_id,
577
if not generate_merge_revisions:
579
# If we only want to see linear revisions, we can iterate ...
580
iter_revs = _linear_view_revisions(
581
branch, start_rev_id, end_rev_id,
582
exclude_common_ancestry=exclude_common_ancestry)
583
# If a start limit was given and it's not obviously an
584
# ancestor of the end limit, check it before outputting anything
585
if (direction == 'forward'
586
or (start_rev_id and not _is_obvious_ancestor(
587
branch, start_rev_id, end_rev_id))):
588
iter_revs = list(iter_revs)
589
if direction == 'forward':
590
iter_revs = reversed(iter_revs)
592
except _StartNotLinearAncestor:
593
# Switch to the slower implementation that may be able to find a
594
# non-obvious ancestor out of the left-hand history.
596
iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
597
direction, delayed_graph_generation,
598
exclude_common_ancestry)
599
if direction == 'forward':
600
iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
540
607
return [(br_rev_id, br_revno, 0)]
542
revno = branch.revision_id_to_dotted_revno(rev_id)
543
revno_str = '.'.join(str(n) for n in revno)
609
revno_str = _compute_revno_str(branch, rev_id)
544
610
return [(rev_id, revno_str, 0)]
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)
549
# If a start limit was given and it's not obviously an
550
# ancestor of the end limit, check it before outputting anything
551
if direction == 'forward' or (start_rev_id
552
and not _is_obvious_ancestor(branch, start_rev_id, end_rev_id)):
554
result = list(result)
555
except _StartNotLinearAncestor:
556
raise errors.BzrCommandError('Start revision not found in'
557
' left-hand history of end revision.')
561
613
def _generate_all_revisions(branch, start_rev_id, end_rev_id, direction,
562
614
delayed_graph_generation,
563
615
exclude_common_ancestry=False):
572
624
if delayed_graph_generation:
574
626
for rev_id, revno, depth in _linear_view_revisions(
575
branch, start_rev_id, end_rev_id):
627
branch, start_rev_id, end_rev_id, exclude_common_ancestry):
576
628
if _has_merges(branch, rev_id):
577
629
# The end_rev_id can be nested down somewhere. We need an
578
630
# explicit ancestry check. There is an ambiguity here as we
599
651
except _StartNotLinearAncestor:
600
652
# A merge was never detected so the lower revision limit can't
601
653
# be nested down somewhere
602
raise errors.BzrCommandError('Start revision not found in'
603
' history of end revision.')
654
raise errors.BzrCommandError(gettext('Start revision not found in'
655
' history of end revision.'))
605
657
# We exit the loop above because we encounter a revision with merges, from
606
658
# this revision, we need to switch to _graph_view_revisions.
610
662
# shown naturally, i.e. just like it is for linear logging. We can easily
611
663
# make forward the exact opposite display, but showing the merge revisions
612
664
# indented at the end seems slightly nicer in that case.
613
view_revisions = chain(iter(initial_revisions),
665
view_revisions = itertools.chain(iter(initial_revisions),
614
666
_graph_view_revisions(branch, start_rev_id, end_rev_id,
615
667
rebase_initial_depths=(direction == 'reverse'),
616
668
exclude_common_ancestry=exclude_common_ancestry))
623
675
return len(parents) > 1
678
def _compute_revno_str(branch, rev_id):
679
"""Compute the revno string from a rev_id.
681
:return: The revno string, or None if the revision is not in the supplied
685
revno = branch.revision_id_to_dotted_revno(rev_id)
686
except errors.NoSuchRevision:
687
# The revision must be outside of this branch
690
return '.'.join(str(n) for n in revno)
626
693
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
627
694
"""Is start_rev_id an obvious ancestor of end_rev_id?"""
628
695
if start_rev_id and end_rev_id:
629
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
630
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
697
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
698
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
699
except errors.NoSuchRevision:
700
# one or both is not in the branch; not obvious
631
702
if len(start_dotted) == 1 and len(end_dotted) == 1:
632
703
# both on mainline
633
704
return start_dotted[0] <= end_dotted[0]
646
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
717
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
718
exclude_common_ancestry=False):
647
719
"""Calculate a sequence of revisions to view, newest to oldest.
649
721
:param start_rev_id: the lower revision-id
650
722
:param end_rev_id: the upper revision-id
723
:param exclude_common_ancestry: Whether the start_rev_id should be part of
724
the iterated revisions.
651
725
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
652
726
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
653
is not found walking the left-hand history
727
is not found walking the left-hand history
655
729
br_revno, br_rev_id = branch.last_revision_info()
656
730
repo = branch.repository
731
graph = repo.get_graph()
657
732
if start_rev_id is None and end_rev_id is None:
658
733
cur_revno = br_revno
659
for revision_id in repo.iter_reverse_revision_history(br_rev_id):
734
for revision_id in graph.iter_lefthand_ancestry(br_rev_id,
735
(_mod_revision.NULL_REVISION,)):
660
736
yield revision_id, str(cur_revno), 0
663
739
if end_rev_id is None:
664
740
end_rev_id = br_rev_id
665
741
found_start = start_rev_id is None
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)
742
for revision_id in graph.iter_lefthand_ancestry(end_rev_id,
743
(_mod_revision.NULL_REVISION,)):
744
revno_str = _compute_revno_str(branch, revision_id)
669
745
if not found_start and revision_id == start_rev_id:
670
yield revision_id, revno_str, 0
746
if not exclude_common_ancestry:
747
yield revision_id, revno_str, 0
671
748
found_start = True
721
798
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)
743
801
def _rebase_merge_depth(view_revisions):
744
802
"""Adjust depths upwards so the top level is 0."""
745
803
# If either the first or last revision have a merge_depth of 0, we're done
768
826
# Convert view_revisions into (view, None, None) groups to fit with
769
827
# the standard interface here.
770
if type(view_revisions) == list:
828
if isinstance(view_revisions, list):
771
829
# A single batch conversion is faster than many incremental ones.
772
830
# As we have all the data, do a batch conversion.
773
831
nones = [None] * len(view_revisions)
774
log_rev_iterator = iter([zip(view_revisions, nones, nones)])
832
log_rev_iterator = iter([list(zip(view_revisions, nones, nones))])
777
835
for view in view_revisions:
789
847
return log_rev_iterator
792
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):
850
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
793
851
"""Create a filtered iterator of log_rev_iterator matching on a regex.
795
853
:param branch: The branch being logged.
796
854
:param generate_delta: Whether to generate a delta for each revision.
797
:param search: A user text search string.
855
:param match: A dictionary with properties as keys and lists of strings
856
as values. To match, a revision may match any of the supplied strings
857
within a single property but must match at least one string for each
798
859
:param log_rev_iterator: An input iterator containing all revisions that
799
860
could be displayed, in lists.
800
861
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
804
865
return 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):
866
searchRE = [(k, [re.compile(x, re.IGNORECASE) for x in v])
867
for k, v in match.items()]
868
return _filter_re(searchRE, log_rev_iterator)
871
def _filter_re(searchRE, log_rev_iterator):
811
872
for revs in log_rev_iterator:
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))
873
new_revs = [rev for rev in revs if _match_filter(searchRE, rev[1])]
877
def _match_filter(searchRE, rev):
879
'message': (rev.message,),
880
'committer': (rev.committer,),
881
'author': (rev.get_apparent_authors()),
882
'bugs': list(rev.iter_bugs())
884
strings[''] = [item for inner_list in strings.values()
885
for item in inner_list]
886
for (k,v) in searchRE:
887
if k in strings and not _match_any_filter(strings[k], v):
891
def _match_any_filter(strings, res):
892
return any(re.search(s) for re in res for s in strings)
819
894
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
820
895
fileids=None, direction='reverse'):
866
941
if delta_type == 'full' and not check_fileids:
867
942
deltas = repository.get_deltas_for_revisions(revisions)
868
for rev, delta in izip(revs, deltas):
943
for rev, delta in zip(revs, deltas):
869
944
new_revs.append((rev[0], rev[1], delta))
871
946
deltas = repository.get_deltas_for_revisions(revisions, fileid_set)
872
for rev, delta in izip(revs, deltas):
947
for rev, delta in zip(revs, deltas):
873
948
if check_fileids:
874
949
if delta is None or not delta.has_changed():
995
1069
if branch_revno != 0:
996
1070
if (start_rev_id == _mod_revision.NULL_REVISION
997
1071
or end_rev_id == _mod_revision.NULL_REVISION):
998
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1072
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
999
1073
if start_revno > end_revno:
1000
raise errors.BzrCommandError("Start revision must be older than "
1001
"the end revision.")
1074
raise errors.BzrCommandError(gettext("Start revision must be "
1075
"older than the end revision."))
1002
1076
return (start_rev_id, end_rev_id)
1054
1128
if ((start_rev_id == _mod_revision.NULL_REVISION)
1055
1129
or (end_rev_id == _mod_revision.NULL_REVISION)):
1056
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1130
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
1057
1131
if start_revno > end_revno:
1058
raise errors.BzrCommandError("Start revision must be older than "
1059
"the end revision.")
1132
raise errors.BzrCommandError(gettext("Start revision must be older "
1133
"than the end revision."))
1061
1135
if end_revno < start_revno:
1062
1136
return None, None, None, None
1063
1137
cur_revno = branch_revno
1065
1139
mainline_revs = []
1066
for revision_id in branch.repository.iter_reverse_revision_history(
1067
branch_last_revision):
1140
graph = branch.repository.get_graph()
1141
for revision_id in graph.iter_lefthand_ancestry(
1142
branch_last_revision, (_mod_revision.NULL_REVISION,)):
1068
1143
if cur_revno < start_revno:
1069
1144
# We have gone far enough, but we always add 1 more revision
1070
1145
rev_nos[revision_id] = cur_revno
1084
1159
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
1131
1162
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1132
1163
include_merges=True):
1133
1164
r"""Return the list of revision ids which touch a given file id.
1177
1211
# indexing layer. We might consider passing in hints as to the known
1178
1212
# access pattern (sparse/clustered, high success rate/low success
1179
1213
# rate). This particular access is clustered with a low success rate.
1180
get_parent_map = branch.repository.texts.get_parent_map
1181
1214
modified_text_revisions = set()
1182
1215
chunk_size = 1000
1183
for start in xrange(0, len(text_keys), chunk_size):
1216
for start in range(0, len(text_keys), chunk_size):
1184
1217
next_keys = text_keys[start:start + chunk_size]
1185
1218
# Only keep the revision_id portion of the key
1186
1219
modified_text_revisions.update(
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
1254
1246
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1255
1247
"""Reverse revisions by depth.
1293
1285
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
1294
tags=None, diff=None):
1286
tags=None, diff=None, signature=None):
1296
self.revno = str(revno)
1291
self.revno = str(revno)
1297
1292
self.merge_depth = merge_depth
1298
1293
self.delta = delta
1299
1294
self.tags = tags
1300
1295
self.diff = diff
1296
self.signature = signature
1303
1299
class LogFormatter(object):
1312
1308
to indicate which LogRevision attributes it supports:
1314
1310
- supports_delta must be True if this log formatter supports delta.
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.
1311
Otherwise the delta attribute may not be populated. The 'delta_format'
1312
attribute describes whether the 'short_status' format (1) or the long
1313
one (2) should be used.
1319
1315
- supports_merge_revisions must be True if this log formatter supports
1320
merge revisions. If not, then only mainline revisions will be passed
1316
merge revisions. If not, then only mainline revisions will be passed
1323
1319
- preferred_levels is the number of levels this formatter defaults to.
1324
The default value is zero meaning display all levels.
1325
This value is only relevant if supports_merge_revisions is True.
1320
The default value is zero meaning display all levels.
1321
This value is only relevant if supports_merge_revisions is True.
1327
1323
- supports_tags must be True if this log formatter supports tags.
1328
Otherwise the tags attribute may not be populated.
1324
Otherwise the tags attribute may not be populated.
1330
1326
- supports_diff must be True if this log formatter supports diffs.
1331
Otherwise the diff attribute may not be populated.
1327
Otherwise the diff attribute may not be populated.
1329
- supports_signatures must be True if this log formatter supports GPG
1333
1332
Plugins can register functions to show custom revision properties using
1334
1333
the properties_handler_registry. The registered function
1335
must respect the following interface description:
1334
must respect the following interface description::
1336
1336
def my_show_properties(properties_dict):
1337
1337
# code that returns a dict {'name':'value'} of the properties
1342
1342
def __init__(self, to_file, show_ids=False, show_timezone='original',
1343
1343
delta_format=None, levels=None, show_advice=False,
1344
to_exact_file=None):
1344
to_exact_file=None, author_list_handler=None):
1345
1345
"""Create a LogFormatter.
1347
1347
:param to_file: the file to output to
1348
: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
1349
1349
non-Unicode diffs are written.
1350
1350
:param show_ids: if True, revision-ids are to be displayed
1351
1351
:param show_timezone: the timezone to use
1414
1417
def short_author(self, rev):
1415
name, address = config.parse_username(rev.get_apparent_authors()[0])
1418
return self.authors(rev, 'first', short=True, sep=', ')
1420
def authors(self, rev, who, short=False, sep=None):
1421
"""Generate list of authors, taking --authors option into account.
1423
The caller has to specify the name of a author list handler,
1424
as provided by the author list registry, using the ``who``
1425
argument. That name only sets a default, though: when the
1426
user selected a different author list generation using the
1427
``--authors`` command line switch, as represented by the
1428
``author_list_handler`` constructor argument, that value takes
1431
:param rev: The revision for which to generate the list of authors.
1432
:param who: Name of the default handler.
1433
:param short: Whether to shorten names to either name or address.
1434
:param sep: What separator to use for automatic concatenation.
1436
if self._author_list_handler is not None:
1437
# The user did specify --authors, which overrides the default
1438
author_list_handler = self._author_list_handler
1440
# The user didn't specify --authors, so we use the caller's default
1441
author_list_handler = author_list_registry.get(who)
1442
names = author_list_handler(rev)
1444
for i in range(len(names)):
1445
name, address = config.parse_username(names[i])
1451
names = sep.join(names)
1420
1454
def merge_marker(self, revision):
1421
1455
"""Get the merge marker to include in the output or '' if none."""
1516
1551
self.merge_marker(revision)))
1517
1552
if revision.tags:
1518
1553
lines.append('tags: %s' % (', '.join(revision.tags)))
1554
if self.show_ids or revision.revno is None:
1520
1555
lines.append('revision-id: %s' % (revision.rev.revision_id,))
1521
1557
for parent_id in revision.rev.parent_ids:
1522
1558
lines.append('parent: %s' % (parent_id,))
1523
1559
lines.extend(self.custom_properties(revision.rev))
1525
1561
committer = revision.rev.committer
1526
authors = revision.rev.get_apparent_authors()
1562
authors = self.authors(revision.rev, 'all')
1527
1563
if authors != [committer]:
1528
1564
lines.append('author: %s' % (", ".join(authors),))
1529
1565
lines.append('committer: %s' % (committer,))
1547
1586
to_file.write("%s%s\n" % (indent, ('\n' + indent).join(lines)))
1548
1587
if revision.delta is not None:
1549
1588
# Use the standard status output to display changes
1550
from bzrlib.delta import report_delta
1551
report_delta(to_file, revision.delta, short_status=False,
1589
from breezy.delta import report_delta
1590
report_delta(to_file, revision.delta, short_status=False,
1552
1591
show_ids=self.show_ids, indent=indent)
1553
1592
if revision.diff is not None:
1554
1593
to_file.write(indent + 'diff:\n')
1600
1639
if revision.tags:
1601
1640
tags = ' {%s}' % (', '.join(revision.tags))
1602
1641
to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1603
revision.revno, self.short_author(revision.rev),
1642
revision.revno or "", self.short_author(revision.rev),
1604
1643
format_date(revision.rev.timestamp,
1605
1644
revision.rev.timezone or 0,
1606
1645
self.show_timezone, date_fmt="%Y-%m-%d",
1607
1646
show_offset=False),
1608
1647
tags, self.merge_marker(revision)))
1609
1648
self.show_properties(revision.rev, indent+offset)
1649
if self.show_ids or revision.revno is None:
1611
1650
to_file.write(indent + offset + 'revision-id:%s\n'
1612
1651
% (revision.rev.revision_id,))
1613
1652
if not revision.rev.message:
1620
1659
if revision.delta is not None:
1621
1660
# Use the standard status output to display changes
1622
from bzrlib.delta import report_delta
1623
report_delta(to_file, revision.delta,
1624
short_status=self.delta_format==1,
1661
from breezy.delta import report_delta
1662
report_delta(to_file, revision.delta,
1663
short_status=self.delta_format==1,
1625
1664
show_ids=self.show_ids, indent=indent + offset)
1626
1665
if revision.diff is not None:
1627
1666
self.show_diff(self.to_exact_file, revision.diff, ' ')
1667
1706
def log_string(self, revno, rev, max_chars, tags=None, prefix=''):
1668
1707
"""Format log info into one string. Truncate tail of 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
1709
:param revno: revision number or None.
1710
Revision numbers counts from 1.
1711
:param rev: revision object
1712
:param max_chars: maximum length of resulting string
1713
:param tags: list of tags or None
1714
:param prefix: string to prefix each line
1715
:return: formatted truncated string
1679
1719
# show revno only when is not None
1680
1720
out.append("%s:" % revno)
1681
out.append(self.truncate(self.short_author(rev), 20))
1721
if max_chars is not None:
1722
out.append(self.truncate(self.short_author(rev), (max_chars+3)/4))
1724
out.append(self.short_author(rev))
1682
1725
out.append(self.date_string(rev))
1683
1726
if len(rev.parent_ids) > 1:
1684
1727
out.append('[merge]')
1703
1746
self.show_timezone,
1704
1747
date_fmt='%Y-%m-%d',
1705
1748
show_offset=False)
1706
committer_str = revision.rev.get_apparent_authors()[0].replace (' <', ' <')
1749
committer_str = self.authors(revision.rev, 'first', sep=', ')
1750
committer_str = committer_str.replace(' <', ' <')
1707
1751
to_file.write('%s %s\n\n' % (date_str,committer_str))
1709
1753
if revision.delta is not None and revision.delta.has_changed():
1742
1786
return self.get(name)(*args, **kwargs)
1744
1788
def get_default(self, branch):
1745
return self.get(branch.get_config().log_format())
1789
c = branch.get_config_stack()
1790
return self.get(c.get('log_format'))
1748
1793
log_formatter_registry = LogFormatterRegistry()
1751
1796
log_formatter_registry.register('short', ShortLogFormatter,
1752
'Moderately short log format')
1797
'Moderately short log format.')
1753
1798
log_formatter_registry.register('long', LongLogFormatter,
1754
'Detailed log format')
1799
'Detailed log format.')
1755
1800
log_formatter_registry.register('line', LineLogFormatter,
1756
'Log format with one line per revision')
1801
'Log format with one line per revision.')
1757
1802
log_formatter_registry.register('gnu-changelog', GnuChangelogLogFormatter,
1758
'Format used by GNU ChangeLog files')
1803
'Format used by GNU ChangeLog files.')
1761
1806
def register_formatter(name, formatter):
1772
1817
return log_formatter_registry.make_formatter(name, *args, **kwargs)
1773
1818
except KeyError:
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)
1819
raise errors.BzrCommandError(gettext("unknown log formatter: %r") % name)
1822
def author_list_all(rev):
1823
return rev.get_apparent_authors()[:]
1826
def author_list_first(rev):
1827
lst = rev.get_apparent_authors()
1834
def author_list_committer(rev):
1835
return [rev.committer]
1838
author_list_registry = registry.Registry()
1840
author_list_registry.register('all', author_list_all,
1843
author_list_registry.register('first', author_list_first,
1846
author_list_registry.register('committer', author_list_committer,
1783
1850
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
1940
2007
:param file_list: the list of paths given on the command line;
1941
2008
the first of these can be a branch location or a file path,
1942
2009
the remainder must be file paths
2010
:param add_cleanup: When the branch returned is read locked,
2011
an unlock call will be queued to the cleanup.
1943
2012
:return: (branch, info_list, start_rev_info, end_rev_info) where
1944
2013
info_list is a list of (relative_path, file_id, kind) tuples where
1945
2014
kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
1946
2015
branch will be read-locked.
1948
from builtins import _get_revision_range, safe_relpath_files
1949
tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
2017
from breezy.builtins import _get_revision_range
2018
tree, b, path = controldir.ControlDir.open_containing_tree_or_branch(
2020
add_cleanup(b.lock_read().unlock)
1951
2021
# XXX: It's damn messy converting a list of paths to relative paths when
1952
2022
# those paths might be deleted ones, they might be on a case-insensitive
1953
2023
# filesystem and/or they might be in silly locations (like another branch).
2035
2105
# Use the properties handlers to print out bug information if available
2036
2106
def _bugs_properties_handler(revision):
2037
if revision.properties.has_key('bugs'):
2107
if 'bugs' in revision.properties:
2038
2108
bug_lines = revision.properties['bugs'].split('\n')
2039
2109
bug_rows = [line.split(' ', 1) for line in bug_lines]
2040
2110
fixed_bug_urls = [row[0] for row in bug_rows if
2041
2111
len(row) > 1 and row[1] == 'fixed']
2043
2113
if fixed_bug_urls:
2044
return {'fixes bug(s)': ' '.join(fixed_bug_urls)}
2114
return {ngettext('fixes bug', 'fixes bugs', len(fixed_bug_urls)):\
2115
' '.join(fixed_bug_urls)}
2047
2118
properties_handler_registry.register('bugs_properties_handler',