151
125
direction='reverse',
152
126
start_revision=None,
153
127
end_revision=None,
158
129
"""Write out human-readable log of commits to this branch.
160
This function is being retained for backwards compatibility but
161
should not be extended with new parameters. Use the new Logger class
162
instead, eg. Logger(branch, rqst).show(lf), adding parameters to the
163
make_log_request_dict function.
165
:param lf: The LogFormatter object showing the output.
167
:param specific_fileid: If not None, list only the commits affecting the
168
specified file, rather than all commits.
170
:param verbose: If True show added/changed/deleted/renamed files.
172
:param direction: 'reverse' (default) is latest to earliest; 'forward' is
175
:param start_revision: If not None, only show revisions >= start_revision
177
:param end_revision: If not None, only show revisions <= end_revision
179
:param search: If not None, only show revisions with matching commit
182
:param limit: If set, shows only 'limit' revisions, all revisions are shown
185
:param show_diff: If True, output a diff after each revision.
187
:param match: Dictionary of search lists to use when matching revision
190
# Convert old-style parameters to new-style parameters
191
if specific_fileid is not None:
192
file_ids = [specific_fileid]
197
delta_type = 'partial'
204
diff_type = 'partial'
210
# Build the request and execute it
211
rqst = make_log_request_dict(direction=direction, specific_fileids=file_ids,
212
start_revision=start_revision, end_revision=end_revision,
213
limit=limit, message_search=search,
214
delta_type=delta_type, diff_type=diff_type)
215
Logger(branch, rqst).show(lf)
218
# Note: This needs to be kept in sync with the defaults in
219
# make_log_request_dict() below
220
_DEFAULT_REQUEST_PARAMS = {
221
'direction': 'reverse',
223
'generate_tags': True,
224
'exclude_common_ancestry': False,
225
'_match_using_deltas': True,
229
def make_log_request_dict(direction='reverse', specific_fileids=None,
230
start_revision=None, end_revision=None, limit=None,
231
message_search=None, levels=None, generate_tags=True,
233
diff_type=None, _match_using_deltas=True,
234
exclude_common_ancestry=False, match=None,
235
signature=False, omit_merges=False,
237
"""Convenience function for making a logging request dictionary.
239
Using this function may make code slightly safer by ensuring
240
parameters have the correct names. It also provides a reference
241
point for documenting the supported parameters.
243
:param direction: 'reverse' (default) is latest to earliest;
244
'forward' is earliest to latest.
246
:param specific_fileids: If not None, only include revisions
247
affecting the specified files, rather than all revisions.
249
:param start_revision: If not None, only generate
250
revisions >= start_revision
252
:param end_revision: If not None, only generate
253
revisions <= end_revision
255
:param limit: If set, generate only 'limit' revisions, all revisions
256
are shown if None or 0.
258
:param message_search: If not None, only include revisions with
259
matching commit messages
261
:param levels: the number of levels of revisions to
262
generate; 1 for just the mainline; 0 for all levels, or None for
265
:param generate_tags: If True, include tags for matched revisions.
267
:param delta_type: Either 'full', 'partial' or None.
268
'full' means generate the complete delta - adds/deletes/modifies/etc;
269
'partial' means filter the delta using specific_fileids;
270
None means do not generate any delta.
272
:param diff_type: Either 'full', 'partial' or None.
273
'full' means generate the complete diff - adds/deletes/modifies/etc;
274
'partial' means filter the diff using specific_fileids;
275
None means do not generate any diff.
277
:param _match_using_deltas: a private parameter controlling the
278
algorithm used for matching specific_fileids. This parameter
279
may be removed in the future so bzrlib client code should NOT
282
:param exclude_common_ancestry: Whether -rX..Y should be interpreted as a
283
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
'direction': direction,
306
'specific_fileids': specific_fileids,
307
'start_revision': start_revision,
308
'end_revision': end_revision,
311
'generate_tags': generate_tags,
312
'delta_type': delta_type,
313
'diff_type': diff_type,
314
'exclude_common_ancestry': exclude_common_ancestry,
315
'signature': signature,
317
'omit_merges': omit_merges,
318
# Add 'private' attributes for features that may be deprecated
319
'_match_using_deltas': _match_using_deltas,
323
def _apply_log_request_defaults(rqst):
324
"""Apply default values to a request dictionary."""
325
result = _DEFAULT_REQUEST_PARAMS.copy()
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
class LogGenerator(object):
353
"""A generator of log revisions."""
355
def iter_log_revisions(self):
356
"""Iterate over LogRevision objects.
358
:return: An iterator yielding LogRevision objects.
360
raise NotImplementedError(self.iter_log_revisions)
363
class Logger(object):
364
"""An object that generates, formats and displays a log."""
366
def __init__(self, branch, rqst):
369
:param branch: the branch to log
370
:param rqst: A dictionary specifying the query parameters.
371
See make_log_request_dict() for supported values.
374
self.rqst = _apply_log_request_defaults(rqst)
379
:param lf: The LogFormatter object to send the output to.
381
if not isinstance(lf, LogFormatter):
382
warn("not a LogFormatter instance: %r" % lf)
384
self.branch.lock_read()
386
if getattr(lf, 'begin_log', None):
389
if getattr(lf, 'end_log', None):
394
def _show_body(self, lf):
395
"""Show the main log output.
397
Subclasses may wish to override this.
399
# Tweak the LogRequest based on what the LogFormatter can handle.
400
# (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()
406
if not getattr(lf, 'supports_tags', False):
407
rqst['generate_tags'] = False
408
if not getattr(lf, 'supports_delta', False):
409
rqst['delta_type'] = None
410
if not getattr(lf, 'supports_diff', False):
411
rqst['diff_type'] = None
412
if not getattr(lf, 'supports_signatures', False):
413
rqst['signature'] = False
415
# Find and print the interesting revisions
416
generator = self._generator_factory(self.branch, rqst)
417
for lr in generator.iter_log_revisions():
421
def _generator_factory(self, branch, rqst):
422
"""Make the LogGenerator object to use.
424
Subclasses may wish to override this.
426
return _DefaultLogGenerator(branch, rqst)
429
class _StartNotLinearAncestor(Exception):
430
"""Raised when a start revision is not found walking left-hand history."""
433
class _DefaultLogGenerator(LogGenerator):
434
"""The default generator of log revisions."""
436
def __init__(self, branch, rqst):
439
if rqst.get('generate_tags') and branch.supports_tags():
440
self.rev_tag_dict = branch.tags.get_reverse_tag_dict()
442
self.rev_tag_dict = {}
444
def iter_log_revisions(self):
445
"""Iterate over LogRevision objects.
447
:return: An iterator yielding LogRevision objects.
450
levels = rqst.get('levels')
451
limit = rqst.get('limit')
452
diff_type = rqst.get('diff_type')
453
show_signature = rqst.get('signature')
454
omit_merges = rqst.get('omit_merges')
456
revision_iterator = self._create_log_revision_iterator()
457
for revs in revision_iterator:
458
for (rev_id, revno, merge_depth), rev, delta in revs:
459
# 0 levels means show everything; merge_depth counts from 0
460
if levels != 0 and merge_depth >= levels:
462
if omit_merges and len(rev.parent_ids) > 1:
464
if diff_type is None:
467
diff = self._format_diff(rev, rev_id, diff_type)
469
signature = format_signature_validity(rev_id,
470
self.branch.repository)
473
yield LogRevision(rev, revno, merge_depth, delta,
474
self.rev_tag_dict.get(rev_id), diff, signature)
477
if log_count >= limit:
480
def _format_diff(self, rev, rev_id, diff_type):
481
repo = self.branch.repository
482
if len(rev.parent_ids) == 0:
483
ancestor_id = _mod_revision.NULL_REVISION
485
ancestor_id = rev.parent_ids[0]
486
tree_1 = repo.revision_tree(ancestor_id)
487
tree_2 = repo.revision_tree(rev_id)
488
file_ids = self.rqst.get('specific_fileids')
489
if diff_type == 'partial' and file_ids is not None:
490
specific_files = [tree_2.id2path(id) for id in file_ids]
492
specific_files = None
494
path_encoding = get_diff_header_encoding()
495
diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
496
new_label='', path_encoding=path_encoding)
499
def _create_log_revision_iterator(self):
500
"""Create a revision iterator for log.
502
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
505
self.start_rev_id, self.end_rev_id = _get_revision_limits(
506
self.branch, self.rqst.get('start_revision'),
507
self.rqst.get('end_revision'))
508
if self.rqst.get('_match_using_deltas'):
509
return self._log_revision_iterator_using_delta_matching()
511
# We're using the per-file-graph algorithm. This scales really
512
# well but only makes sense if there is a single file and it's
514
file_count = len(self.rqst.get('specific_fileids'))
516
raise BzrError("illegal LogRequest: must match-using-deltas "
517
"when logging %d files" % file_count)
518
return self._log_revision_iterator_using_per_file_graph()
520
def _log_revision_iterator_using_delta_matching(self):
521
# Get the base revisions, filtering by the revision range
523
generate_merge_revisions = rqst.get('levels') != 1
524
delayed_graph_generation = not rqst.get('specific_fileids') and (
525
rqst.get('limit') or self.start_rev_id or self.end_rev_id)
526
view_revisions = _calc_view_revisions(
527
self.branch, self.start_rev_id, self.end_rev_id,
528
rqst.get('direction'),
529
generate_merge_revisions=generate_merge_revisions,
530
delayed_graph_generation=delayed_graph_generation,
531
exclude_common_ancestry=rqst.get('exclude_common_ancestry'))
533
# Apply the other filters
534
return make_log_rev_iterator(self.branch, view_revisions,
535
rqst.get('delta_type'), rqst.get('match'),
536
file_ids=rqst.get('specific_fileids'),
537
direction=rqst.get('direction'))
539
def _log_revision_iterator_using_per_file_graph(self):
540
# Get the base revisions, filtering by the revision range.
541
# Note that we always generate the merge revisions because
542
# filter_revisions_touching_file_id() requires them ...
544
view_revisions = _calc_view_revisions(
545
self.branch, self.start_rev_id, self.end_rev_id,
546
rqst.get('direction'), generate_merge_revisions=True,
547
exclude_common_ancestry=rqst.get('exclude_common_ancestry'))
548
if not isinstance(view_revisions, list):
549
view_revisions = list(view_revisions)
550
view_revisions = _filter_revisions_touching_file_id(self.branch,
551
rqst.get('specific_fileids')[0], view_revisions,
552
include_merges=rqst.get('levels') != 1)
553
return make_log_rev_iterator(self.branch, view_revisions,
554
rqst.get('delta_type'), rqst.get('match'))
557
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
558
generate_merge_revisions,
559
delayed_graph_generation=False,
560
exclude_common_ancestry=False,
562
"""Calculate the revisions to view.
564
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
565
a list of the same tuples.
567
if (exclude_common_ancestry and start_rev_id == end_rev_id):
568
raise errors.BzrCommandError(gettext(
569
'--exclude-common-ancestry requires two different revisions'))
570
if direction not in ('reverse', 'forward'):
571
raise ValueError(gettext('invalid direction %r') % direction)
572
br_revno, br_rev_id = branch.last_revision_info()
576
if (end_rev_id and start_rev_id == end_rev_id
577
and (not generate_merge_revisions
578
or not _has_merges(branch, end_rev_id))):
579
# If a single revision is requested, check we can handle it
580
iter_revs = _generate_one_revision(branch, end_rev_id, br_rev_id,
582
elif not generate_merge_revisions:
583
# If we only want to see linear revisions, we can iterate ...
584
iter_revs = _generate_flat_revisions(branch, start_rev_id, end_rev_id,
585
direction, exclude_common_ancestry)
586
if direction == 'forward':
587
iter_revs = reversed(iter_revs)
589
iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
590
direction, delayed_graph_generation,
591
exclude_common_ancestry)
592
if direction == 'forward':
593
iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
597
def _generate_one_revision(branch, rev_id, br_rev_id, br_revno):
598
if rev_id == br_rev_id:
600
return [(br_rev_id, br_revno, 0)]
602
revno_str = _compute_revno_str(branch, rev_id)
603
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)
611
# If a start limit was given and it's not obviously an
612
# ancestor of the end limit, check it before outputting anything
613
if direction == 'forward' or (start_rev_id
614
and not _is_obvious_ancestor(branch, start_rev_id, end_rev_id)):
616
result = list(result)
617
except _StartNotLinearAncestor:
618
raise errors.BzrCommandError(gettext('Start revision not found in'
619
' left-hand history of end revision.'))
623
def _generate_all_revisions(branch, start_rev_id, end_rev_id, direction,
624
delayed_graph_generation,
625
exclude_common_ancestry=False):
626
# On large trees, generating the merge graph can take 30-60 seconds
627
# so we delay doing it until a merge is detected, incrementally
628
# returning initial (non-merge) revisions while we can.
630
# The above is only true for old formats (<= 0.92), for newer formats, a
631
# couple of seconds only should be needed to load the whole graph and the
632
# other graph operations needed are even faster than that -- vila 100201
633
initial_revisions = []
634
if delayed_graph_generation:
636
for rev_id, revno, depth in _linear_view_revisions(
637
branch, start_rev_id, end_rev_id, exclude_common_ancestry):
638
if _has_merges(branch, rev_id):
639
# The end_rev_id can be nested down somewhere. We need an
640
# explicit ancestry check. There is an ambiguity here as we
641
# may not raise _StartNotLinearAncestor for a revision that
642
# is an ancestor but not a *linear* one. But since we have
643
# loaded the graph to do the check (or calculate a dotted
644
# revno), we may as well accept to show the log... We need
645
# the check only if start_rev_id is not None as all
646
# revisions have _mod_revision.NULL_REVISION as an ancestor
648
graph = branch.repository.get_graph()
649
if (start_rev_id is not None
650
and not graph.is_ancestor(start_rev_id, end_rev_id)):
651
raise _StartNotLinearAncestor()
652
# Since we collected the revisions so far, we need to
657
initial_revisions.append((rev_id, revno, depth))
659
# No merged revisions found
660
return initial_revisions
661
except _StartNotLinearAncestor:
662
# A merge was never detected so the lower revision limit can't
663
# be nested down somewhere
664
raise errors.BzrCommandError(gettext('Start revision not found in'
665
' history of end revision.'))
667
# We exit the loop above because we encounter a revision with merges, from
668
# this revision, we need to switch to _graph_view_revisions.
670
# A log including nested merges is required. If the direction is reverse,
671
# we rebase the initial merge depths so that the development line is
672
# shown naturally, i.e. just like it is for linear logging. We can easily
673
# make forward the exact opposite display, but showing the merge revisions
674
# indented at the end seems slightly nicer in that case.
675
view_revisions = chain(iter(initial_revisions),
676
_graph_view_revisions(branch, start_rev_id, end_rev_id,
677
rebase_initial_depths=(direction == 'reverse'),
678
exclude_common_ancestry=exclude_common_ancestry))
679
return view_revisions
682
def _has_merges(branch, rev_id):
683
"""Does a revision have multiple parents or not?"""
684
parents = branch.repository.get_parent_map([rev_id]).get(rev_id, [])
685
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
132
LogFormatter object to show the output.
135
If true, list only the commits affecting the specified
136
file, rather than all commits.
139
If true show added/changed/deleted/renamed files.
142
'reverse' (default) is latest to earliest;
143
'forward' is earliest to latest.
146
If not None, only show revisions >= start_revision
149
If not None, only show revisions <= end_revision
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
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
704
"""Is start_rev_id an obvious ancestor of end_rev_id?"""
705
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
712
if len(start_dotted) == 1 and len(end_dotted) == 1:
714
return start_dotted[0] <= end_dotted[0]
715
elif (len(start_dotted) == 3 and len(end_dotted) == 3 and
716
start_dotted[0:1] == end_dotted[0:1]):
717
# both on same development line
718
return start_dotted[2] <= end_dotted[2]
153
_show_log(branch, lf, specific_fileid, verbose, direction,
154
start_revision, end_revision, search)
158
def _show_log(branch,
160
specific_fileid=None,
166
"""Worker function for show_log - see show_log."""
167
from bzrlib.osutils import format_date
168
from bzrlib.errors import BzrCheckError
170
from warnings import warn
172
if not isinstance(lf, LogFormatter):
173
warn("not a LogFormatter instance: %r" % lf)
176
mutter('get log for file_id %r', specific_fileid)
178
if search is not None:
180
searchRE = re.compile(search, re.IGNORECASE)
184
which_revs = _enumerate_history(branch)
186
if start_revision is None:
189
branch.check_real_revno(start_revision)
191
if end_revision is None:
192
end_revision = len(which_revs)
194
branch.check_real_revno(end_revision)
196
# list indexes are 0-based; revisions are 1-based
197
cut_revs = which_revs[(start_revision-1):(end_revision)]
201
# convert the revision history to a dictionary:
202
rev_nos = dict((k, v) for v, k in cut_revs)
204
# override the mainline to look like the revision history.
205
mainline_revs = [revision_id for index, revision_id in cut_revs]
206
if cut_revs[0][0] == 1:
207
mainline_revs.insert(0, None)
209
mainline_revs.insert(0, which_revs[start_revision-2][1])
210
# how should we show merged revisions ?
211
# old api: show_merge. New api: show_merge_revno
212
show_merge_revno = getattr(lf, 'show_merge_revno', None)
213
show_merge = getattr(lf, 'show_merge', None)
214
if show_merge is None and show_merge_revno is None:
215
# no merged-revno support
216
include_merges = False
218
include_merges = True
219
if show_merge is not None and show_merge_revno is None:
220
# tell developers to update their code
221
symbol_versioning.warn('LogFormatters should provide show_merge_revno '
222
'instead of show_merge since bzr 0.11.',
223
DeprecationWarning, stacklevel=3)
224
view_revisions = list(get_view_revisions(mainline_revs, rev_nos, branch,
225
direction, include_merges=include_merges))
227
def iter_revisions():
228
# r = revision, n = revno, d = merge depth
229
revision_ids = [r for r, n, d in view_revisions]
230
zeros = set(r for r, n, d in view_revisions if d == 0)
232
repository = branch.repository
235
revisions = repository.get_revisions(revision_ids[:num])
236
if verbose or specific_fileid:
237
delta_revisions = [r for r in revisions if
238
r.revision_id in zeros]
239
deltas = repository.get_deltas_for_revisions(delta_revisions)
240
cur_deltas = dict(izip((r.revision_id for r in
241
delta_revisions), deltas))
242
for revision in revisions:
243
# The delta value will be None unless
244
# 1. verbose or specific_fileid is specified, and
245
# 2. the revision is a mainline revision
246
yield revision, cur_deltas.get(revision.revision_id)
247
revision_ids = revision_ids[num:]
250
# now we just print all the revisions
251
for ((rev_id, revno, merge_depth), (rev, delta)) in \
252
izip(view_revisions, iter_revisions()):
255
if not searchRE.search(rev.message):
259
# a mainline revision.
262
if not delta.touches_file_id(specific_fileid):
266
# although we calculated it, throw it away without display
269
lf.show(revno, rev, delta)
722
# if either start or end is not specified then we use either the first or
723
# the last revision and *they* are obvious ancestors.
727
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
728
exclude_common_ancestry=False):
729
"""Calculate a sequence of revisions to view, newest to oldest.
731
:param start_rev_id: the lower revision-id
732
: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
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
736
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
737
is not found walking the left-hand history
739
br_revno, br_rev_id = branch.last_revision_info()
740
repo = branch.repository
741
graph = repo.get_graph()
742
if start_rev_id is None and end_rev_id is None:
744
for revision_id in graph.iter_lefthand_ancestry(br_rev_id,
745
(_mod_revision.NULL_REVISION,)):
746
yield revision_id, str(cur_revno), 0
749
if end_rev_id is None:
750
end_rev_id = br_rev_id
751
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)
755
if not found_start and revision_id == start_rev_id:
756
if not exclude_common_ancestry:
757
yield revision_id, revno_str, 0
271
if show_merge_revno is None:
272
lf.show_merge(rev, merge_depth)
761
yield revision_id, revno_str, 0
764
raise _StartNotLinearAncestor()
767
def _graph_view_revisions(branch, start_rev_id, end_rev_id,
768
rebase_initial_depths=True,
769
exclude_common_ancestry=False):
770
"""Calculate revisions to view including merges, newest to oldest.
772
:param branch: the branch
773
:param start_rev_id: the lower revision-id
774
:param end_rev_id: the upper revision-id
775
:param rebase_initial_depth: should depths be rebased until a mainline
777
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
779
if exclude_common_ancestry:
780
stop_rule = 'with-merges-without-common-ancestry'
782
stop_rule = 'with-merges'
783
view_revisions = branch.iter_merge_sorted_revisions(
784
start_revision_id=end_rev_id, stop_revision_id=start_rev_id,
786
if not rebase_initial_depths:
787
for (rev_id, merge_depth, revno, end_of_merge
789
yield rev_id, '.'.join(map(str, revno)), merge_depth
791
# We're following a development line starting at a merged revision.
792
# We need to adjust depths down by the initial depth until we find
793
# a depth less than it. Then we use that depth as the adjustment.
794
# If and when we reach the mainline, depth adjustment ends.
795
depth_adjustment = None
796
for (rev_id, merge_depth, revno, end_of_merge
798
if depth_adjustment is None:
799
depth_adjustment = merge_depth
801
if merge_depth < depth_adjustment:
802
# From now on we reduce the depth adjustement, this can be
803
# surprising for users. The alternative requires two passes
804
# which breaks the fast display of the first revision
806
depth_adjustment = merge_depth
807
merge_depth -= depth_adjustment
808
yield rev_id, '.'.join(map(str, revno)), merge_depth
811
def _rebase_merge_depth(view_revisions):
812
"""Adjust depths upwards so the top level is 0."""
813
# If either the first or last revision have a merge_depth of 0, we're done
814
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
815
min_depth = min([d for r,n,d in view_revisions])
817
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
818
return view_revisions
821
def make_log_rev_iterator(branch, view_revisions, generate_delta, search,
822
file_ids=None, direction='reverse'):
823
"""Create a revision iterator for log.
825
:param branch: The branch being logged.
826
:param view_revisions: The revisions being viewed.
827
:param generate_delta: Whether to generate a delta for each revision.
828
Permitted values are None, 'full' and 'partial'.
829
:param search: A user text search string.
830
:param file_ids: If non empty, only revisions matching one or more of
831
the file-ids are to be kept.
832
:param direction: the direction in which view_revisions is sorted
833
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
836
# Convert view_revisions into (view, None, None) groups to fit with
837
# the standard interface here.
838
if type(view_revisions) == list:
839
# A single batch conversion is faster than many incremental ones.
840
# As we have all the data, do a batch conversion.
841
nones = [None] * len(view_revisions)
842
log_rev_iterator = iter([zip(view_revisions, nones, nones)])
845
for view in view_revisions:
846
yield (view, None, None)
847
log_rev_iterator = iter([_convert()])
848
for adapter in log_adapters:
849
# It would be nicer if log adapters were first class objects
850
# with custom parameters. This will do for now. IGC 20090127
851
if adapter == _make_delta_filter:
852
log_rev_iterator = adapter(branch, generate_delta,
853
search, log_rev_iterator, file_ids, direction)
855
log_rev_iterator = adapter(branch, generate_delta,
856
search, log_rev_iterator)
857
return log_rev_iterator
860
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
861
"""Create a filtered iterator of log_rev_iterator matching on a regex.
863
:param branch: The branch being logged.
864
: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
869
:param log_rev_iterator: An input iterator containing all revisions that
870
could be displayed, in lists.
871
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
875
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):
882
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])
904
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
905
fileids=None, direction='reverse'):
906
"""Add revision deltas to a log iterator if needed.
908
:param branch: The branch being logged.
909
:param generate_delta: Whether to generate a delta for each revision.
910
Permitted values are None, 'full' and 'partial'.
911
:param search: A user text search string.
912
:param log_rev_iterator: An input iterator containing all revisions that
913
could be displayed, in lists.
914
:param fileids: If non empty, only revisions matching one or more of
915
the file-ids are to be kept.
916
:param direction: the direction in which view_revisions is sorted
917
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
920
if not generate_delta and not fileids:
921
return log_rev_iterator
922
return _generate_deltas(branch.repository, log_rev_iterator,
923
generate_delta, fileids, direction)
926
def _generate_deltas(repository, log_rev_iterator, delta_type, fileids,
928
"""Create deltas for each batch of revisions in log_rev_iterator.
930
If we're only generating deltas for the sake of filtering against
931
file-ids, we stop generating deltas once all file-ids reach the
932
appropriate life-cycle point. If we're receiving data newest to
933
oldest, then that life-cycle point is 'add', otherwise it's 'remove'.
935
check_fileids = fileids is not None and len(fileids) > 0
937
fileid_set = set(fileids)
274
lf.show_merge_revno(rev, merge_depth, revno)
277
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
278
include_merges=True):
279
"""Produce an iterator of revisions to show
280
:return: an iterator of (revision_id, revno, merge_depth)
281
(if there is no revno for a revision, None is supplied)
283
if include_merges is False:
284
revision_ids = mainline_revs[1:]
938
285
if direction == 'reverse':
944
for revs in log_rev_iterator:
945
# If we were matching against fileids and we've run out,
946
# there's nothing left to do
947
if check_fileids and not fileid_set:
949
revisions = [rev[1] for rev in revs]
951
if delta_type == 'full' and not check_fileids:
952
deltas = repository.get_deltas_for_revisions(revisions)
953
for rev, delta in izip(revs, deltas):
954
new_revs.append((rev[0], rev[1], delta))
956
deltas = repository.get_deltas_for_revisions(revisions, fileid_set)
957
for rev, delta in izip(revs, deltas):
959
if delta is None or not delta.has_changed():
962
_update_fileids(delta, fileid_set, stop_on)
963
if delta_type is None:
965
elif delta_type == 'full':
966
# If the file matches all the time, rebuilding
967
# a full delta like this in addition to a partial
968
# one could be slow. However, it's likely that
969
# most revisions won't get this far, making it
970
# faster to filter on the partial deltas and
971
# build the occasional full delta than always
972
# building full deltas and filtering those.
974
delta = repository.get_revision_delta(rev_id)
975
new_revs.append((rev[0], rev[1], delta))
979
def _update_fileids(delta, fileids, stop_on):
980
"""Update the set of file-ids to search based on file lifecycle events.
982
:param fileids: a set of fileids to update
983
:param stop_on: either 'add' or 'remove' - take file-ids out of the
984
fileids set once their add or remove entry is detected respectively
987
for item in delta.added:
988
if item[1] in fileids:
989
fileids.remove(item[1])
990
elif stop_on == 'delete':
991
for item in delta.removed:
992
if item[1] in fileids:
993
fileids.remove(item[1])
996
def _make_revision_objects(branch, generate_delta, search, log_rev_iterator):
997
"""Extract revision objects from the repository
999
:param branch: The branch being logged.
1000
:param generate_delta: Whether to generate a delta for each revision.
1001
:param search: A user text search string.
1002
:param log_rev_iterator: An input iterator containing all revisions that
1003
could be displayed, in lists.
1004
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
1007
repository = branch.repository
1008
for revs in log_rev_iterator:
1009
# r = revision_id, n = revno, d = merge depth
1010
revision_ids = [view[0] for view, _, _ in revs]
1011
revisions = repository.get_revisions(revision_ids)
1012
revs = [(rev[0], revision, rev[2]) for rev, revision in
1013
izip(revs, revisions)]
1017
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):
1018
"""Group up a single large batch into smaller ones.
1020
:param branch: The branch being logged.
1021
:param generate_delta: Whether to generate a delta for each revision.
1022
:param search: A user text search string.
1023
:param log_rev_iterator: An input iterator containing all revisions that
1024
could be displayed, in lists.
1025
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
1029
for batch in log_rev_iterator:
1032
step = [detail for _, detail in zip(range(num), batch)]
1036
num = min(int(num * 1.5), 200)
1039
def _get_revision_limits(branch, start_revision, end_revision):
1040
"""Get and check revision limits.
1042
:param branch: The branch containing the revisions.
1044
:param start_revision: The first revision to be logged.
1045
For backwards compatibility this may be a mainline integer revno,
1046
but for merge revision support a RevisionInfo is expected.
1048
:param end_revision: The last revision to be logged.
1049
For backwards compatibility this may be a mainline integer revno,
1050
but for merge revision support a RevisionInfo is expected.
1052
:return: (start_rev_id, end_rev_id) tuple.
1054
branch_revno, branch_rev_id = branch.last_revision_info()
1056
if start_revision is None:
1059
if isinstance(start_revision, revisionspec.RevisionInfo):
1060
start_rev_id = start_revision.rev_id
1061
start_revno = start_revision.revno or 1
1063
branch.check_real_revno(start_revision)
1064
start_revno = start_revision
1065
start_rev_id = branch.get_rev_id(start_revno)
1068
if end_revision is None:
1069
end_revno = branch_revno
1071
if isinstance(end_revision, revisionspec.RevisionInfo):
1072
end_rev_id = end_revision.rev_id
1073
end_revno = end_revision.revno or branch_revno
1075
branch.check_real_revno(end_revision)
1076
end_revno = end_revision
1077
end_rev_id = branch.get_rev_id(end_revno)
1079
if branch_revno != 0:
1080
if (start_rev_id == _mod_revision.NULL_REVISION
1081
or end_rev_id == _mod_revision.NULL_REVISION):
1082
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
1083
if start_revno > end_revno:
1084
raise errors.BzrCommandError(gettext("Start revision must be "
1085
"older than the end revision."))
1086
return (start_rev_id, end_rev_id)
1089
def _get_mainline_revs(branch, start_revision, end_revision):
1090
"""Get the mainline revisions from the branch.
1092
Generates the list of mainline revisions for the branch.
1094
:param branch: The branch containing the revisions.
1096
:param start_revision: The first revision to be logged.
1097
For backwards compatibility this may be a mainline integer revno,
1098
but for merge revision support a RevisionInfo is expected.
1100
:param end_revision: The last revision to be logged.
1101
For backwards compatibility this may be a mainline integer revno,
1102
but for merge revision support a RevisionInfo is expected.
1104
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
1106
branch_revno, branch_last_revision = branch.last_revision_info()
1107
if branch_revno == 0:
1108
return None, None, None, None
1110
# For mainline generation, map start_revision and end_revision to
1111
# mainline revnos. If the revision is not on the mainline choose the
1112
# appropriate extreme of the mainline instead - the extra will be
1114
# Also map the revisions to rev_ids, to be used in the later filtering
1117
if start_revision is None:
1120
if isinstance(start_revision, revisionspec.RevisionInfo):
1121
start_rev_id = start_revision.rev_id
1122
start_revno = start_revision.revno or 1
1124
branch.check_real_revno(start_revision)
1125
start_revno = start_revision
1128
if end_revision is None:
1129
end_revno = branch_revno
1131
if isinstance(end_revision, revisionspec.RevisionInfo):
1132
end_rev_id = end_revision.rev_id
1133
end_revno = end_revision.revno or branch_revno
1135
branch.check_real_revno(end_revision)
1136
end_revno = end_revision
1138
if ((start_rev_id == _mod_revision.NULL_REVISION)
1139
or (end_rev_id == _mod_revision.NULL_REVISION)):
1140
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
1141
if start_revno > end_revno:
1142
raise errors.BzrCommandError(gettext("Start revision must be older "
1143
"than the end revision."))
1145
if end_revno < start_revno:
1146
return None, None, None, None
1147
cur_revno = branch_revno
1150
graph = branch.repository.get_graph()
1151
for revision_id in graph.iter_lefthand_ancestry(
1152
branch_last_revision, (_mod_revision.NULL_REVISION,)):
1153
if cur_revno < start_revno:
1154
# We have gone far enough, but we always add 1 more revision
1155
rev_nos[revision_id] = cur_revno
1156
mainline_revs.append(revision_id)
1158
if cur_revno <= end_revno:
1159
rev_nos[revision_id] = cur_revno
1160
mainline_revs.append(revision_id)
1163
# We walked off the edge of all revisions, so we add a 'None' marker
1164
mainline_revs.append(None)
1166
mainline_revs.reverse()
1168
# override the mainline to look like the revision history.
1169
return mainline_revs, rev_nos, start_rev_id, end_rev_id
1172
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1173
include_merges=True):
1174
r"""Return the list of revision ids which touch a given file id.
1176
The function filters view_revisions and returns a subset.
1177
This includes the revisions which directly change the file id,
1178
and the revisions which merge these changes. So if the
1191
And 'C' changes a file, then both C and D will be returned. F will not be
1192
returned even though it brings the changes to C into the branch starting
1193
with E. (Note that if we were using F as the tip instead of G, then we
1196
This will also be restricted based on a subset of the mainline.
1198
:param branch: The branch where we can get text revision information.
1200
:param file_id: Filter out revisions that do not touch file_id.
1202
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1203
tuples. This is the list of revisions which will be filtered. It is
1204
assumed that view_revisions is in merge_sort order (i.e. newest
1207
:param include_merges: include merge revisions in the result or not
1209
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
1211
# Lookup all possible text keys to determine which ones actually modified
1213
graph = branch.repository.get_file_graph()
1214
get_parent_map = graph.get_parent_map
1215
text_keys = [(file_id, rev_id) for rev_id, revno, depth in view_revisions]
1217
# Looking up keys in batches of 1000 can cut the time in half, as well as
1218
# memory consumption. GraphIndex *does* like to look for a few keys in
1219
# parallel, it just doesn't like looking for *lots* of keys in parallel.
1220
# TODO: This code needs to be re-evaluated periodically as we tune the
1221
# indexing layer. We might consider passing in hints as to the known
1222
# access pattern (sparse/clustered, high success rate/low success
1223
# rate). This particular access is clustered with a low success rate.
1224
modified_text_revisions = set()
1226
for start in xrange(0, len(text_keys), chunk_size):
1227
next_keys = text_keys[start:start + chunk_size]
1228
# Only keep the revision_id portion of the key
1229
modified_text_revisions.update(
1230
[k[1] for k in get_parent_map(next_keys)])
1231
del text_keys, next_keys
1234
# Track what revisions will merge the current revision, replace entries
1235
# with 'None' when they have been added to result
1236
current_merge_stack = [None]
1237
for info in view_revisions:
1238
rev_id, revno, depth = info
1239
if depth == len(current_merge_stack):
1240
current_merge_stack.append(info)
1242
del current_merge_stack[depth + 1:]
1243
current_merge_stack[-1] = info
1245
if rev_id in modified_text_revisions:
1246
# This needs to be logged, along with the extra revisions
1247
for idx in xrange(len(current_merge_stack)):
1248
node = current_merge_stack[idx]
1249
if node is not None:
1250
if include_merges or node[2] == 0:
1252
current_merge_stack[idx] = None
286
revision_ids.reverse()
287
for revision_id in revision_ids:
288
yield revision_id, str(rev_nos[revision_id]), 0
290
merge_sorted_revisions = merge_sort(
291
branch.repository.get_revision_graph(mainline_revs[-1]),
296
if direction == 'forward':
297
# forward means oldest first.
298
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
299
elif direction != 'reverse':
300
raise ValueError('invalid direction %r' % direction)
302
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
303
yield rev_id, '.'.join(map(str, revno)), merge_depth
1256
306
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1260
310
revision of that depth. There may be no topological justification for this,
1261
311
but it looks much nicer.
1263
# Add a fake revision at start so that we can always attach sub revisions
1264
merge_sorted_revisions = [(None, None, _depth)] + merge_sorted_revisions
1265
313
zd_revisions = []
1266
314
for val in merge_sorted_revisions:
1267
315
if val[2] == _depth:
1268
# Each revision at the current depth becomes a chunk grouping all
1269
# higher depth revisions.
1270
316
zd_revisions.append([val])
318
assert val[2] > _depth
1272
319
zd_revisions[-1].append(val)
1273
320
for revisions in zd_revisions:
1274
321
if len(revisions) > 1:
1275
# We have higher depth revisions, let reverse them locally
1276
322
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1277
323
zd_revisions.reverse()
1279
325
for chunk in zd_revisions:
1280
326
result.extend(chunk)
1282
# Top level call, get rid of the fake revisions that have been added
1283
result = [r for r in result if r[0] is not None and r[1] is not None]
1287
class LogRevision(object):
1288
"""A revision to be logged (by LogFormatter.log_revision).
1290
A simple wrapper for the attributes of a revision to be logged.
1291
The attributes may or may not be populated, as determined by the
1292
logging options and the log formatter capabilities.
1295
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
1296
tags=None, diff=None, signature=None):
1301
self.revno = str(revno)
1302
self.merge_depth = merge_depth
1306
self.signature = signature
1309
330
class LogFormatter(object):
1310
"""Abstract class to display log messages.
1312
At a minimum, a derived class must implement the log_revision method.
1314
If the LogFormatter needs to be informed of the beginning or end of
1315
a log it should implement the begin_log and/or end_log hook methods.
1317
A LogFormatter should define the following supports_XXX flags
1318
to indicate which LogRevision attributes it supports:
1320
- 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.
1325
- supports_merge_revisions must be True if this log formatter supports
1326
merge revisions. If not, then only mainline revisions will be passed
1329
- 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.
1333
- supports_tags must be True if this log formatter supports tags.
1334
Otherwise the tags attribute may not be populated.
1336
- 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
1342
Plugins can register functions to show custom revision properties using
1343
the properties_handler_registry. The registered function
1344
must respect the following interface description::
1346
def my_show_properties(properties_dict):
1347
# code that returns a dict {'name':'value'} of the properties
1350
preferred_levels = 0
1352
def __init__(self, to_file, show_ids=False, show_timezone='original',
1353
delta_format=None, levels=None, show_advice=False,
1354
to_exact_file=None, author_list_handler=None):
1355
"""Create a LogFormatter.
1357
:param to_file: the file to output to
1358
:param to_exact_file: if set, gives an output stream to which
1359
non-Unicode diffs are written.
1360
:param show_ids: if True, revision-ids are to be displayed
1361
:param show_timezone: the timezone to use
1362
:param delta_format: the level of delta information to display
1363
or None to leave it to the formatter to decide
1364
:param levels: the number of levels to display; None or -1 to
1365
let the log formatter decide.
1366
:param show_advice: whether to show advice at the end of the
1368
:param author_list_handler: callable generating a list of
1369
authors to display for a given revision
331
"""Abstract class to display log messages."""
333
def __init__(self, to_file, show_ids=False, show_timezone='original'):
1371
334
self.to_file = to_file
1372
# 'exact' stream used to show diff, it should print content 'as is'
1373
# and should not try to decode/encode it to unicode to avoid bug #328007
1374
if to_exact_file is not None:
1375
self.to_exact_file = to_exact_file
1377
# XXX: somewhat hacky; this assumes it's a codec writer; it's better
1378
# for code that expects to get diffs to pass in the exact file
1380
self.to_exact_file = getattr(to_file, 'stream', to_file)
1381
335
self.show_ids = show_ids
1382
336
self.show_timezone = show_timezone
1383
if delta_format is None:
1384
# Ensures backward compatibility
1385
delta_format = 2 # long format
1386
self.delta_format = delta_format
1387
self.levels = levels
1388
self._show_advice = show_advice
1389
self._merge_count = 0
1390
self._author_list_handler = author_list_handler
1392
def get_levels(self):
1393
"""Get the number of levels to display or 0 for all."""
1394
if getattr(self, 'supports_merge_revisions', False):
1395
if self.levels is None or self.levels == -1:
1396
self.levels = self.preferred_levels
1401
def log_revision(self, revision):
1404
:param revision: The LogRevision to be logged.
338
def show(self, revno, rev, delta):
1406
339
raise NotImplementedError('not implemented in abstract base')
1408
def show_advice(self):
1409
"""Output user advice, if any, when the log is completed."""
1410
if self._show_advice and self.levels == 1 and self._merge_count > 0:
1411
advice_sep = self.get_advice_separator()
1413
self.to_file.write(advice_sep)
1415
"Use --include-merged or -n0 to see merged revisions.\n")
1417
def get_advice_separator(self):
1418
"""Get the text separating the log from the closing advice."""
1421
341
def short_committer(self, rev):
1422
name, address = config.parse_username(rev.committer)
1427
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)
1464
def merge_marker(self, revision):
1465
"""Get the merge marker to include in the output or '' if none."""
1466
if len(revision.rev.parent_ids) > 1:
1467
self._merge_count += 1
1472
def show_properties(self, revision, indent):
1473
"""Displays the custom properties returned by each registered handler.
1475
If a registered handler raises an error it is propagated.
1477
for line in self.custom_properties(revision):
1478
self.to_file.write("%s%s\n" % (indent, line))
1480
def custom_properties(self, revision):
1481
"""Format the custom properties returned by each registered handler.
1483
If a registered handler raises an error it is propagated.
1485
:return: a list of formatted lines (excluding trailing newlines)
1487
lines = self._foreign_info_properties(revision)
1488
for key, handler in properties_handler_registry.iteritems():
1489
lines.extend(self._format_properties(handler(revision)))
1492
def _foreign_info_properties(self, rev):
1493
"""Custom log displayer for foreign revision identifiers.
1495
:param rev: Revision object.
1497
# Revision comes directly from a foreign repository
1498
if isinstance(rev, foreign.ForeignRevision):
1499
return self._format_properties(
1500
rev.mapping.vcs.show_foreign_revid(rev.foreign_revid))
1502
# Imported foreign revision revision ids always contain :
1503
if not ":" in rev.revision_id:
1506
# Revision was once imported from a foreign repository
1508
foreign_revid, mapping = \
1509
foreign.foreign_vcs_registry.parse_revision_id(rev.revision_id)
1510
except errors.InvalidRevisionId:
1513
return self._format_properties(
1514
mapping.vcs.show_foreign_revid(foreign_revid))
1516
def _format_properties(self, properties):
1518
for key, value in properties.items():
1519
lines.append(key + ': ' + value)
1522
def show_diff(self, to_file, diff, indent):
1523
for l in diff.rstrip().split('\n'):
1524
to_file.write(indent + '%s\n' % (l,))
1527
# Separator between revisions in long format
1528
_LONG_SEP = '-' * 60
342
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
1531
345
class LongLogFormatter(LogFormatter):
1533
supports_merge_revisions = True
1534
preferred_levels = 1
1535
supports_delta = True
1536
supports_tags = True
1537
supports_diff = True
1538
supports_signatures = True
1540
def __init__(self, *args, **kwargs):
1541
super(LongLogFormatter, self).__init__(*args, **kwargs)
1542
if self.show_timezone == 'original':
1543
self.date_string = self._date_string_original_timezone
1545
self.date_string = self._date_string_with_timezone
1547
def _date_string_with_timezone(self, rev):
1548
return format_date(rev.timestamp, rev.timezone or 0,
1551
def _date_string_original_timezone(self, rev):
1552
return format_date_with_offset_in_original_timezone(rev.timestamp,
1555
def log_revision(self, revision):
1556
"""Log a revision, either merged or not."""
1557
indent = ' ' * revision.merge_depth
1559
if revision.revno is not None:
1560
lines.append('revno: %s%s' % (revision.revno,
1561
self.merge_marker(revision)))
1563
lines.append('tags: %s' % (', '.join(revision.tags)))
1564
if self.show_ids or revision.revno is None:
1565
lines.append('revision-id: %s' % (revision.rev.revision_id,))
346
def show(self, revno, rev, delta):
347
return self._show_helper(revno=revno, rev=rev, delta=delta)
349
@deprecated_method(zero_eleven)
350
def show_merge(self, rev, merge_depth):
351
return self._show_helper(rev=rev, indent=' '*merge_depth, merged=True, delta=None)
353
def show_merge_revno(self, rev, merge_depth, revno):
354
"""Show a merged revision rev, with merge_depth and a revno."""
355
return self._show_helper(rev=rev, revno=revno,
356
indent=' '*merge_depth, merged=True, delta=None)
358
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
359
"""Show a revision, either merged or not."""
360
from bzrlib.osutils import format_date
361
to_file = self.to_file
362
print >>to_file, indent+'-' * 60
363
if revno is not None:
364
print >>to_file, indent+'revno:', revno
366
print >>to_file, indent+'merged:', rev.revision_id
368
print >>to_file, indent+'revision-id:', rev.revision_id
1566
369
if self.show_ids:
1567
for parent_id in revision.rev.parent_ids:
1568
lines.append('parent: %s' % (parent_id,))
1569
lines.extend(self.custom_properties(revision.rev))
1571
committer = revision.rev.committer
1572
authors = self.authors(revision.rev, 'all')
1573
if authors != [committer]:
1574
lines.append('author: %s' % (", ".join(authors),))
1575
lines.append('committer: %s' % (committer,))
1577
branch_nick = revision.rev.properties.get('branch-nick', None)
1578
if branch_nick is not None:
1579
lines.append('branch nick: %s' % (branch_nick,))
1581
lines.append('timestamp: %s' % (self.date_string(revision.rev),))
1583
if revision.signature is not None:
1584
lines.append('signature: ' + revision.signature)
1586
lines.append('message:')
1587
if not revision.rev.message:
1588
lines.append(' (no message)')
370
for parent_id in rev.parent_ids:
371
print >>to_file, indent+'parent:', parent_id
372
print >>to_file, indent+'committer:', rev.committer
374
print >>to_file, indent+'branch nick: %s' % \
375
rev.properties['branch-nick']
378
date_str = format_date(rev.timestamp,
381
print >>to_file, indent+'timestamp: %s' % date_str
383
print >>to_file, indent+'message:'
385
print >>to_file, indent+' (no message)'
1590
message = revision.rev.message.rstrip('\r\n')
387
message = rev.message.rstrip('\r\n')
1591
388
for l in message.split('\n'):
1592
lines.append(' %s' % (l,))
1594
# Dump the output, appending the delta and diff if requested
1595
to_file = self.to_file
1596
to_file.write("%s%s\n" % (indent, ('\n' + indent).join(lines)))
1597
if revision.delta is not None:
1598
# Use the standard status output to display changes
1599
from bzrlib.delta import report_delta
1600
report_delta(to_file, revision.delta, short_status=False,
1601
show_ids=self.show_ids, indent=indent)
1602
if revision.diff is not None:
1603
to_file.write(indent + 'diff:\n')
1605
# Note: we explicitly don't indent the diff (relative to the
1606
# revision information) so that the output can be fed to patch -p0
1607
self.show_diff(self.to_exact_file, revision.diff, indent)
1608
self.to_exact_file.flush()
1610
def get_advice_separator(self):
1611
"""Get the text separating the log from the closing advice."""
1612
return '-' * 60 + '\n'
389
print >>to_file, indent+' ' + l
390
if delta is not None:
391
delta.show(to_file, self.show_ids)
1615
394
class ShortLogFormatter(LogFormatter):
1617
supports_merge_revisions = True
1618
preferred_levels = 1
1619
supports_delta = True
1620
supports_tags = True
1621
supports_diff = True
1623
def __init__(self, *args, **kwargs):
1624
super(ShortLogFormatter, self).__init__(*args, **kwargs)
1625
self.revno_width_by_depth = {}
1627
def log_revision(self, revision):
1628
# We need two indents: one per depth and one for the information
1629
# relative to that indent. Most mainline revnos are 5 chars or
1630
# less while dotted revnos are typically 11 chars or less. Once
1631
# calculated, we need to remember the offset for a given depth
1632
# as we might be starting from a dotted revno in the first column
1633
# and we want subsequent mainline revisions to line up.
1634
depth = revision.merge_depth
1635
indent = ' ' * depth
1636
revno_width = self.revno_width_by_depth.get(depth)
1637
if revno_width is None:
1638
if revision.revno is None or revision.revno.find('.') == -1:
1639
# mainline revno, e.g. 12345
1642
# dotted revno, e.g. 12345.10.55
1644
self.revno_width_by_depth[depth] = revno_width
1645
offset = ' ' * (revno_width + 1)
395
def show(self, revno, rev, delta):
396
from bzrlib.osutils import format_date
1647
398
to_file = self.to_file
1650
tags = ' {%s}' % (', '.join(revision.tags))
1651
to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1652
revision.revno or "", self.short_author(revision.rev),
1653
format_date(revision.rev.timestamp,
1654
revision.rev.timezone or 0,
399
date_str = format_date(rev.timestamp, rev.timezone or 0,
401
print >>to_file, "%5s %s\t%s" % (revno, self.short_committer(rev),
402
format_date(rev.timestamp, rev.timezone or 0,
1655
403
self.show_timezone, date_fmt="%Y-%m-%d",
1657
tags, self.merge_marker(revision)))
1658
self.show_properties(revision.rev, indent+offset)
1659
if self.show_ids or revision.revno is None:
1660
to_file.write(indent + offset + 'revision-id:%s\n'
1661
% (revision.rev.revision_id,))
1662
if not revision.rev.message:
1663
to_file.write(indent + offset + '(no message)\n')
406
print >>to_file, ' revision-id:', rev.revision_id
408
print >>to_file, ' (no message)'
1665
message = revision.rev.message.rstrip('\r\n')
410
message = rev.message.rstrip('\r\n')
1666
411
for l in message.split('\n'):
1667
to_file.write(indent + offset + '%s\n' % (l,))
412
print >>to_file, ' ' + l
1669
if revision.delta is not None:
1670
# Use the standard status output to display changes
1671
from bzrlib.delta import report_delta
1672
report_delta(to_file, revision.delta,
1673
short_status=self.delta_format==1,
1674
show_ids=self.show_ids, indent=indent + offset)
1675
if revision.diff is not None:
1676
self.show_diff(self.to_exact_file, revision.diff, ' ')
414
# TODO: Why not show the modified files in a shorter form as
415
# well? rewrap them single lines of appropriate length
416
if delta is not None:
417
delta.show(to_file, self.show_ids)
1680
421
class LineLogFormatter(LogFormatter):
1682
supports_merge_revisions = True
1683
preferred_levels = 1
1684
supports_tags = True
1686
def __init__(self, *args, **kwargs):
1687
super(LineLogFormatter, self).__init__(*args, **kwargs)
1688
width = terminal_width()
1689
if width is not None:
1690
# we need one extra space for terminals that wrap on last char
1692
self._max_chars = width
1694
422
def truncate(self, str, max_len):
1695
if max_len is None or len(str) <= max_len:
423
if len(str) <= max_len:
1697
return str[:max_len-3] + '...'
425
return str[:max_len-3]+'...'
1699
427
def date_string(self, rev):
1700
return format_date(rev.timestamp, rev.timezone or 0,
428
from bzrlib.osutils import format_date
429
return format_date(rev.timestamp, rev.timezone or 0,
1701
430
self.show_timezone, date_fmt="%Y-%m-%d",
1702
431
show_offset=False)
added
removed
bzrlib/log.py
