153
120
direction='reverse',
154
121
start_revision=None,
155
122
end_revision=None,
159
124
"""Write out human-readable log of commits to this branch.
161
This function is being retained for backwards compatibility but
162
should not be extended with new parameters. Use the new Logger class
163
instead, eg. Logger(branch, rqst).show(lf), adding parameters to the
164
make_log_request_dict function.
166
:param lf: The LogFormatter object showing the output.
168
:param specific_fileid: If not None, list only the commits affecting the
169
specified file, rather than all commits.
171
:param verbose: If True show added/changed/deleted/renamed files.
173
:param direction: 'reverse' (default) is latest to earliest; 'forward' is
176
:param start_revision: If not None, only show revisions >= start_revision
178
:param end_revision: If not None, only show revisions <= end_revision
180
:param search: If not None, only show revisions with matching commit
183
:param limit: If set, shows only 'limit' revisions, all revisions are shown
186
:param show_diff: If True, output a diff after each revision.
188
# Convert old-style parameters to new-style parameters
189
if specific_fileid is not None:
190
file_ids = [specific_fileid]
195
delta_type = 'partial'
202
diff_type = 'partial'
208
# Build the request and execute it
209
rqst = make_log_request_dict(direction=direction, specific_fileids=file_ids,
210
start_revision=start_revision, end_revision=end_revision,
211
limit=limit, message_search=search,
212
delta_type=delta_type, diff_type=diff_type)
213
Logger(branch, rqst).show(lf)
216
# Note: This needs to be kept this in sync with the defaults in
217
# make_log_request_dict() below
218
_DEFAULT_REQUEST_PARAMS = {
219
'direction': 'reverse',
221
'generate_tags': True,
222
'exclude_common_ancestry': False,
223
'_match_using_deltas': True,
227
def make_log_request_dict(direction='reverse', specific_fileids=None,
228
start_revision=None, end_revision=None, limit=None,
229
message_search=None, levels=1, generate_tags=True,
231
diff_type=None, _match_using_deltas=True,
232
exclude_common_ancestry=False,
234
"""Convenience function for making a logging request dictionary.
236
Using this function may make code slightly safer by ensuring
237
parameters have the correct names. It also provides a reference
238
point for documenting the supported parameters.
240
:param direction: 'reverse' (default) is latest to earliest;
241
'forward' is earliest to latest.
243
:param specific_fileids: If not None, only include revisions
244
affecting the specified files, rather than all revisions.
246
:param start_revision: If not None, only generate
247
revisions >= start_revision
249
:param end_revision: If not None, only generate
250
revisions <= end_revision
252
:param limit: If set, generate only 'limit' revisions, all revisions
253
are shown if None or 0.
255
:param message_search: If not None, only include revisions with
256
matching commit messages
258
:param levels: the number of levels of revisions to
259
generate; 1 for just the mainline; 0 for all levels.
261
:param generate_tags: If True, include tags for matched revisions.
263
:param delta_type: Either 'full', 'partial' or None.
264
'full' means generate the complete delta - adds/deletes/modifies/etc;
265
'partial' means filter the delta using specific_fileids;
266
None means do not generate any delta.
268
:param diff_type: Either 'full', 'partial' or None.
269
'full' means generate the complete diff - adds/deletes/modifies/etc;
270
'partial' means filter the diff using specific_fileids;
271
None means do not generate any diff.
273
:param _match_using_deltas: a private parameter controlling the
274
algorithm used for matching specific_fileids. This parameter
275
may be removed in the future so bzrlib client code should NOT
278
:param exclude_common_ancestry: Whether -rX..Y should be interpreted as a
279
range operator or as a graph difference.
282
'direction': direction,
283
'specific_fileids': specific_fileids,
284
'start_revision': start_revision,
285
'end_revision': end_revision,
287
'message_search': message_search,
289
'generate_tags': generate_tags,
290
'delta_type': delta_type,
291
'diff_type': diff_type,
292
'exclude_common_ancestry': exclude_common_ancestry,
293
# Add 'private' attributes for features that may be deprecated
294
'_match_using_deltas': _match_using_deltas,
298
def _apply_log_request_defaults(rqst):
299
"""Apply default values to a request dictionary."""
300
result = _DEFAULT_REQUEST_PARAMS.copy()
306
class LogGenerator(object):
307
"""A generator of log revisions."""
309
def iter_log_revisions(self):
310
"""Iterate over LogRevision objects.
312
:return: An iterator yielding LogRevision objects.
314
raise NotImplementedError(self.iter_log_revisions)
317
class Logger(object):
318
"""An object that generates, formats and displays a log."""
320
def __init__(self, branch, rqst):
323
:param branch: the branch to log
324
:param rqst: A dictionary specifying the query parameters.
325
See make_log_request_dict() for supported values.
328
self.rqst = _apply_log_request_defaults(rqst)
333
:param lf: The LogFormatter object to send the output to.
335
if not isinstance(lf, LogFormatter):
336
warn("not a LogFormatter instance: %r" % lf)
338
self.branch.lock_read()
340
if getattr(lf, 'begin_log', None):
343
if getattr(lf, 'end_log', None):
348
def _show_body(self, lf):
349
"""Show the main log output.
351
Subclasses may wish to override this.
353
# Tweak the LogRequest based on what the LogFormatter can handle.
354
# (There's no point generating stuff if the formatter can't display it.)
356
rqst['levels'] = lf.get_levels()
357
if not getattr(lf, 'supports_tags', False):
358
rqst['generate_tags'] = False
359
if not getattr(lf, 'supports_delta', False):
360
rqst['delta_type'] = None
361
if not getattr(lf, 'supports_diff', False):
362
rqst['diff_type'] = None
364
# Find and print the interesting revisions
365
generator = self._generator_factory(self.branch, rqst)
366
for lr in generator.iter_log_revisions():
370
def _generator_factory(self, branch, rqst):
371
"""Make the LogGenerator object to use.
373
Subclasses may wish to override this.
375
return _DefaultLogGenerator(branch, rqst)
378
class _StartNotLinearAncestor(Exception):
379
"""Raised when a start revision is not found walking left-hand history."""
382
class _DefaultLogGenerator(LogGenerator):
383
"""The default generator of log revisions."""
385
def __init__(self, branch, rqst):
388
if rqst.get('generate_tags') and branch.supports_tags():
389
self.rev_tag_dict = branch.tags.get_reverse_tag_dict()
391
self.rev_tag_dict = {}
393
def iter_log_revisions(self):
394
"""Iterate over LogRevision objects.
396
:return: An iterator yielding LogRevision objects.
399
levels = rqst.get('levels')
400
limit = rqst.get('limit')
401
diff_type = rqst.get('diff_type')
403
revision_iterator = self._create_log_revision_iterator()
404
for revs in revision_iterator:
405
for (rev_id, revno, merge_depth), rev, delta in revs:
406
# 0 levels means show everything; merge_depth counts from 0
407
if levels != 0 and merge_depth >= levels:
409
if diff_type is None:
412
diff = self._format_diff(rev, rev_id, diff_type)
413
yield LogRevision(rev, revno, merge_depth, delta,
414
self.rev_tag_dict.get(rev_id), diff)
417
if log_count >= limit:
420
def _format_diff(self, rev, rev_id, diff_type):
421
repo = self.branch.repository
422
if len(rev.parent_ids) == 0:
423
ancestor_id = _mod_revision.NULL_REVISION
425
ancestor_id = rev.parent_ids[0]
426
tree_1 = repo.revision_tree(ancestor_id)
427
tree_2 = repo.revision_tree(rev_id)
428
file_ids = self.rqst.get('specific_fileids')
429
if diff_type == 'partial' and file_ids is not None:
430
specific_files = [tree_2.id2path(id) for id in file_ids]
432
specific_files = None
434
path_encoding = get_diff_header_encoding()
435
diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
436
new_label='', path_encoding=path_encoding)
439
def _create_log_revision_iterator(self):
440
"""Create a revision iterator for log.
442
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
445
self.start_rev_id, self.end_rev_id = _get_revision_limits(
446
self.branch, self.rqst.get('start_revision'),
447
self.rqst.get('end_revision'))
448
if self.rqst.get('_match_using_deltas'):
449
return self._log_revision_iterator_using_delta_matching()
451
# We're using the per-file-graph algorithm. This scales really
452
# well but only makes sense if there is a single file and it's
454
file_count = len(self.rqst.get('specific_fileids'))
456
raise BzrError("illegal LogRequest: must match-using-deltas "
457
"when logging %d files" % file_count)
458
return self._log_revision_iterator_using_per_file_graph()
460
def _log_revision_iterator_using_delta_matching(self):
461
# Get the base revisions, filtering by the revision range
463
generate_merge_revisions = rqst.get('levels') != 1
464
delayed_graph_generation = not rqst.get('specific_fileids') and (
465
rqst.get('limit') or self.start_rev_id or self.end_rev_id)
466
view_revisions = _calc_view_revisions(
467
self.branch, self.start_rev_id, self.end_rev_id,
468
rqst.get('direction'),
469
generate_merge_revisions=generate_merge_revisions,
470
delayed_graph_generation=delayed_graph_generation,
471
exclude_common_ancestry=rqst.get('exclude_common_ancestry'))
473
# Apply the other filters
474
return make_log_rev_iterator(self.branch, view_revisions,
475
rqst.get('delta_type'), rqst.get('message_search'),
476
file_ids=rqst.get('specific_fileids'),
477
direction=rqst.get('direction'))
479
def _log_revision_iterator_using_per_file_graph(self):
480
# Get the base revisions, filtering by the revision range.
481
# Note that we always generate the merge revisions because
482
# filter_revisions_touching_file_id() requires them ...
484
view_revisions = _calc_view_revisions(
485
self.branch, self.start_rev_id, self.end_rev_id,
486
rqst.get('direction'), generate_merge_revisions=True,
487
exclude_common_ancestry=rqst.get('exclude_common_ancestry'))
488
if not isinstance(view_revisions, list):
489
view_revisions = list(view_revisions)
490
view_revisions = _filter_revisions_touching_file_id(self.branch,
491
rqst.get('specific_fileids')[0], view_revisions,
492
include_merges=rqst.get('levels') != 1)
493
return make_log_rev_iterator(self.branch, view_revisions,
494
rqst.get('delta_type'), rqst.get('message_search'))
497
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
498
generate_merge_revisions,
499
delayed_graph_generation=False,
500
exclude_common_ancestry=False,
502
"""Calculate the revisions to view.
504
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
505
a list of the same tuples.
507
if (exclude_common_ancestry and start_rev_id == end_rev_id):
508
raise errors.BzrCommandError(
509
'--exclude-common-ancestry requires two different revisions')
510
if direction not in ('reverse', 'forward'):
511
raise ValueError('invalid direction %r' % direction)
512
br_revno, br_rev_id = branch.last_revision_info()
516
if (end_rev_id and start_rev_id == end_rev_id
517
and (not generate_merge_revisions
518
or not _has_merges(branch, end_rev_id))):
519
# 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,
525
direction, exclude_common_ancestry)
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)))
537
def _generate_one_revision(branch, rev_id, br_rev_id, br_revno):
538
if rev_id == br_rev_id:
540
return [(br_rev_id, br_revno, 0)]
542
revno_str = _compute_revno_str(branch, rev_id)
543
return [(rev_id, revno_str, 0)]
546
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction,
547
exclude_common_ancestry=False):
548
result = _linear_view_revisions(
549
branch, start_rev_id, end_rev_id,
550
exclude_common_ancestry=exclude_common_ancestry)
551
# If a start limit was given and it's not obviously an
552
# ancestor of the end limit, check it before outputting anything
553
if direction == 'forward' or (start_rev_id
554
and not _is_obvious_ancestor(branch, start_rev_id, end_rev_id)):
556
result = list(result)
557
except _StartNotLinearAncestor:
558
raise errors.BzrCommandError('Start revision not found in'
559
' left-hand history of end revision.')
563
def _generate_all_revisions(branch, start_rev_id, end_rev_id, direction,
564
delayed_graph_generation,
565
exclude_common_ancestry=False):
566
# On large trees, generating the merge graph can take 30-60 seconds
567
# so we delay doing it until a merge is detected, incrementally
568
# returning initial (non-merge) revisions while we can.
570
# The above is only true for old formats (<= 0.92), for newer formats, a
571
# couple of seconds only should be needed to load the whole graph and the
572
# other graph operations needed are even faster than that -- vila 100201
573
initial_revisions = []
574
if delayed_graph_generation:
576
for rev_id, revno, depth in _linear_view_revisions(
577
branch, start_rev_id, end_rev_id, exclude_common_ancestry):
578
if _has_merges(branch, rev_id):
579
# The end_rev_id can be nested down somewhere. We need an
580
# explicit ancestry check. There is an ambiguity here as we
581
# may not raise _StartNotLinearAncestor for a revision that
582
# is an ancestor but not a *linear* one. But since we have
583
# loaded the graph to do the check (or calculate a dotted
584
# revno), we may as well accept to show the log... We need
585
# the check only if start_rev_id is not None as all
586
# revisions have _mod_revision.NULL_REVISION as an ancestor
588
graph = branch.repository.get_graph()
589
if (start_rev_id is not None
590
and not graph.is_ancestor(start_rev_id, end_rev_id)):
591
raise _StartNotLinearAncestor()
592
# Since we collected the revisions so far, we need to
597
initial_revisions.append((rev_id, revno, depth))
599
# No merged revisions found
600
return initial_revisions
601
except _StartNotLinearAncestor:
602
# A merge was never detected so the lower revision limit can't
603
# be nested down somewhere
604
raise errors.BzrCommandError('Start revision not found in'
605
' history of end revision.')
607
# We exit the loop above because we encounter a revision with merges, from
608
# this revision, we need to switch to _graph_view_revisions.
610
# A log including nested merges is required. If the direction is reverse,
611
# we rebase the initial merge depths so that the development line is
612
# shown naturally, i.e. just like it is for linear logging. We can easily
613
# make forward the exact opposite display, but showing the merge revisions
614
# indented at the end seems slightly nicer in that case.
615
view_revisions = chain(iter(initial_revisions),
616
_graph_view_revisions(branch, start_rev_id, end_rev_id,
617
rebase_initial_depths=(direction == 'reverse'),
618
exclude_common_ancestry=exclude_common_ancestry))
619
return view_revisions
622
def _has_merges(branch, rev_id):
623
"""Does a revision have multiple parents or not?"""
624
parents = branch.repository.get_parent_map([rev_id]).get(rev_id, [])
625
return len(parents) > 1
628
def _compute_revno_str(branch, rev_id):
629
"""Compute the revno string from a rev_id.
631
:return: The revno string, or None if the revision is not in the supplied
127
LogFormatter object to show the output.
130
If true, list only the commits affecting the specified
131
file, rather than all commits.
134
If true show added/changed/deleted/renamed files.
137
'reverse' (default) is latest to earliest;
138
'forward' is earliest to latest.
141
If not None, only show revisions >= start_revision
144
If not None, only show revisions <= end_revision
635
revno = branch.revision_id_to_dotted_revno(rev_id)
636
except errors.NoSuchRevision:
637
# The revision must be outside of this branch
640
return '.'.join(str(n) for n in revno)
643
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
644
"""Is start_rev_id an obvious ancestor of end_rev_id?"""
645
if start_rev_id and end_rev_id:
647
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
648
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
649
except errors.NoSuchRevision:
650
# one or both is not in the branch; not obvious
652
if len(start_dotted) == 1 and len(end_dotted) == 1:
654
return start_dotted[0] <= end_dotted[0]
655
elif (len(start_dotted) == 3 and len(end_dotted) == 3 and
656
start_dotted[0:1] == end_dotted[0:1]):
657
# both on same development line
658
return start_dotted[2] <= end_dotted[2]
662
# if either start or end is not specified then we use either the first or
663
# the last revision and *they* are obvious ancestors.
667
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
668
exclude_common_ancestry=False):
669
"""Calculate a sequence of revisions to view, newest to oldest.
671
:param start_rev_id: the lower revision-id
672
:param end_rev_id: the upper revision-id
673
:param exclude_common_ancestry: Whether the start_rev_id should be part of
674
the iterated revisions.
675
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
676
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
677
is not found walking the left-hand history
679
br_revno, br_rev_id = branch.last_revision_info()
680
repo = branch.repository
681
if start_rev_id is None and end_rev_id is None:
683
for revision_id in repo.iter_reverse_revision_history(br_rev_id):
684
yield revision_id, str(cur_revno), 0
687
if end_rev_id is None:
688
end_rev_id = br_rev_id
689
found_start = start_rev_id is None
690
for revision_id in repo.iter_reverse_revision_history(end_rev_id):
691
revno_str = _compute_revno_str(branch, revision_id)
692
if not found_start and revision_id == start_rev_id:
693
if not exclude_common_ancestry:
694
yield revision_id, revno_str, 0
698
yield revision_id, revno_str, 0
701
raise _StartNotLinearAncestor()
704
def _graph_view_revisions(branch, start_rev_id, end_rev_id,
705
rebase_initial_depths=True,
706
exclude_common_ancestry=False):
707
"""Calculate revisions to view including merges, newest to oldest.
709
:param branch: the branch
710
:param start_rev_id: the lower revision-id
711
:param end_rev_id: the upper revision-id
712
:param rebase_initial_depth: should depths be rebased until a mainline
714
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
716
if exclude_common_ancestry:
717
stop_rule = 'with-merges-without-common-ancestry'
719
stop_rule = 'with-merges'
720
view_revisions = branch.iter_merge_sorted_revisions(
721
start_revision_id=end_rev_id, stop_revision_id=start_rev_id,
723
if not rebase_initial_depths:
724
for (rev_id, merge_depth, revno, end_of_merge
726
yield rev_id, '.'.join(map(str, revno)), merge_depth
728
# We're following a development line starting at a merged revision.
729
# We need to adjust depths down by the initial depth until we find
730
# a depth less than it. Then we use that depth as the adjustment.
731
# If and when we reach the mainline, depth adjustment ends.
732
depth_adjustment = None
733
for (rev_id, merge_depth, revno, end_of_merge
735
if depth_adjustment is None:
736
depth_adjustment = merge_depth
738
if merge_depth < depth_adjustment:
739
# From now on we reduce the depth adjustement, this can be
740
# surprising for users. The alternative requires two passes
741
# which breaks the fast display of the first revision
743
depth_adjustment = merge_depth
744
merge_depth -= depth_adjustment
745
yield rev_id, '.'.join(map(str, revno)), merge_depth
748
@deprecated_function(deprecated_in((2, 2, 0)))
749
def calculate_view_revisions(branch, start_revision, end_revision, direction,
750
specific_fileid, generate_merge_revisions):
751
"""Calculate the revisions to view.
753
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
754
a list of the same tuples.
756
start_rev_id, end_rev_id = _get_revision_limits(branch, start_revision,
758
view_revisions = list(_calc_view_revisions(branch, start_rev_id, end_rev_id,
759
direction, generate_merge_revisions or specific_fileid))
148
_show_log(branch, lf, specific_fileid, verbose, direction,
149
start_revision, end_revision, search)
153
def _show_log(branch,
155
specific_fileid=None,
161
"""Worker function for show_log - see show_log."""
162
from bzrlib.osutils import format_date
163
from bzrlib.errors import BzrCheckError
165
from warnings import warn
167
if not isinstance(lf, LogFormatter):
168
warn("not a LogFormatter instance: %r" % lf)
760
170
if specific_fileid:
761
view_revisions = _filter_revisions_touching_file_id(branch,
762
specific_fileid, view_revisions,
763
include_merges=generate_merge_revisions)
764
return _rebase_merge_depth(view_revisions)
767
def _rebase_merge_depth(view_revisions):
768
"""Adjust depths upwards so the top level is 0."""
769
# If either the first or last revision have a merge_depth of 0, we're done
770
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
771
min_depth = min([d for r,n,d in view_revisions])
773
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
774
return view_revisions
777
def make_log_rev_iterator(branch, view_revisions, generate_delta, search,
778
file_ids=None, direction='reverse'):
779
"""Create a revision iterator for log.
781
:param branch: The branch being logged.
782
:param view_revisions: The revisions being viewed.
783
:param generate_delta: Whether to generate a delta for each revision.
784
Permitted values are None, 'full' and 'partial'.
785
:param search: A user text search string.
786
:param file_ids: If non empty, only revisions matching one or more of
787
the file-ids are to be kept.
788
:param direction: the direction in which view_revisions is sorted
789
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
792
# Convert view_revisions into (view, None, None) groups to fit with
793
# the standard interface here.
794
if type(view_revisions) == list:
795
# A single batch conversion is faster than many incremental ones.
796
# As we have all the data, do a batch conversion.
797
nones = [None] * len(view_revisions)
798
log_rev_iterator = iter([zip(view_revisions, nones, nones)])
801
for view in view_revisions:
802
yield (view, None, None)
803
log_rev_iterator = iter([_convert()])
804
for adapter in log_adapters:
805
# It would be nicer if log adapters were first class objects
806
# with custom parameters. This will do for now. IGC 20090127
807
if adapter == _make_delta_filter:
808
log_rev_iterator = adapter(branch, generate_delta,
809
search, log_rev_iterator, file_ids, direction)
811
log_rev_iterator = adapter(branch, generate_delta,
812
search, log_rev_iterator)
813
return log_rev_iterator
816
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):
817
"""Create a filtered iterator of log_rev_iterator matching on a regex.
819
:param branch: The branch being logged.
820
:param generate_delta: Whether to generate a delta for each revision.
821
:param search: A user text search string.
822
:param log_rev_iterator: An input iterator containing all revisions that
823
could be displayed, in lists.
824
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
828
return log_rev_iterator
829
searchRE = re.compile(search, re.IGNORECASE)
830
return _filter_message_re(searchRE, log_rev_iterator)
833
def _filter_message_re(searchRE, log_rev_iterator):
834
for revs in log_rev_iterator:
836
for (rev_id, revno, merge_depth), rev, delta in revs:
837
if searchRE.search(rev.message):
838
new_revs.append(((rev_id, revno, merge_depth), rev, delta))
842
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
843
fileids=None, direction='reverse'):
844
"""Add revision deltas to a log iterator if needed.
846
:param branch: The branch being logged.
847
:param generate_delta: Whether to generate a delta for each revision.
848
Permitted values are None, 'full' and 'partial'.
849
:param search: A user text search string.
850
:param log_rev_iterator: An input iterator containing all revisions that
851
could be displayed, in lists.
852
:param fileids: If non empty, only revisions matching one or more of
853
the file-ids are to be kept.
854
:param direction: the direction in which view_revisions is sorted
855
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
858
if not generate_delta and not fileids:
859
return log_rev_iterator
860
return _generate_deltas(branch.repository, log_rev_iterator,
861
generate_delta, fileids, direction)
864
def _generate_deltas(repository, log_rev_iterator, delta_type, fileids,
866
"""Create deltas for each batch of revisions in log_rev_iterator.
868
If we're only generating deltas for the sake of filtering against
869
file-ids, we stop generating deltas once all file-ids reach the
870
appropriate life-cycle point. If we're receiving data newest to
871
oldest, then that life-cycle point is 'add', otherwise it's 'remove'.
873
check_fileids = fileids is not None and len(fileids) > 0
875
fileid_set = set(fileids)
876
if direction == 'reverse':
882
for revs in log_rev_iterator:
883
# If we were matching against fileids and we've run out,
884
# there's nothing left to do
885
if check_fileids and not fileid_set:
887
revisions = [rev[1] for rev in revs]
889
if delta_type == 'full' and not check_fileids:
890
deltas = repository.get_deltas_for_revisions(revisions)
891
for rev, delta in izip(revs, deltas):
892
new_revs.append((rev[0], rev[1], delta))
894
deltas = repository.get_deltas_for_revisions(revisions, fileid_set)
895
for rev, delta in izip(revs, deltas):
897
if delta is None or not delta.has_changed():
900
_update_fileids(delta, fileid_set, stop_on)
901
if delta_type is None:
903
elif delta_type == 'full':
904
# If the file matches all the time, rebuilding
905
# a full delta like this in addition to a partial
906
# one could be slow. However, it's likely that
907
# most revisions won't get this far, making it
908
# faster to filter on the partial deltas and
909
# build the occasional full delta than always
910
# building full deltas and filtering those.
912
delta = repository.get_revision_delta(rev_id)
913
new_revs.append((rev[0], rev[1], delta))
917
def _update_fileids(delta, fileids, stop_on):
918
"""Update the set of file-ids to search based on file lifecycle events.
920
:param fileids: a set of fileids to update
921
:param stop_on: either 'add' or 'remove' - take file-ids out of the
922
fileids set once their add or remove entry is detected respectively
925
for item in delta.added:
926
if item[1] in fileids:
927
fileids.remove(item[1])
928
elif stop_on == 'delete':
929
for item in delta.removed:
930
if item[1] in fileids:
931
fileids.remove(item[1])
934
def _make_revision_objects(branch, generate_delta, search, log_rev_iterator):
935
"""Extract revision objects from the repository
937
:param branch: The branch being logged.
938
:param generate_delta: Whether to generate a delta for each revision.
939
:param search: A user text search string.
940
:param log_rev_iterator: An input iterator containing all revisions that
941
could be displayed, in lists.
942
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
945
repository = branch.repository
946
for revs in log_rev_iterator:
947
# r = revision_id, n = revno, d = merge depth
948
revision_ids = [view[0] for view, _, _ in revs]
949
revisions = repository.get_revisions(revision_ids)
950
revs = [(rev[0], revision, rev[2]) for rev, revision in
951
izip(revs, revisions)]
955
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):
956
"""Group up a single large batch into smaller ones.
958
:param branch: The branch being logged.
959
:param generate_delta: Whether to generate a delta for each revision.
960
:param search: A user text search string.
961
:param log_rev_iterator: An input iterator containing all revisions that
962
could be displayed, in lists.
963
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
966
repository = branch.repository
968
for batch in log_rev_iterator:
971
step = [detail for _, detail in zip(range(num), batch)]
975
num = min(int(num * 1.5), 200)
978
def _get_revision_limits(branch, start_revision, end_revision):
979
"""Get and check revision limits.
981
:param branch: The branch containing the revisions.
983
:param start_revision: The first revision to be logged.
984
For backwards compatibility this may be a mainline integer revno,
985
but for merge revision support a RevisionInfo is expected.
987
:param end_revision: The last revision to be logged.
988
For backwards compatibility this may be a mainline integer revno,
989
but for merge revision support a RevisionInfo is expected.
991
:return: (start_rev_id, end_rev_id) tuple.
993
branch_revno, branch_rev_id = branch.last_revision_info()
995
if start_revision is None:
998
if isinstance(start_revision, revisionspec.RevisionInfo):
999
start_rev_id = start_revision.rev_id
1000
start_revno = start_revision.revno or 1
1002
branch.check_real_revno(start_revision)
1003
start_revno = start_revision
1004
start_rev_id = branch.get_rev_id(start_revno)
1007
if end_revision is None:
1008
end_revno = branch_revno
1010
if isinstance(end_revision, revisionspec.RevisionInfo):
1011
end_rev_id = end_revision.rev_id
1012
end_revno = end_revision.revno or branch_revno
1014
branch.check_real_revno(end_revision)
1015
end_revno = end_revision
1016
end_rev_id = branch.get_rev_id(end_revno)
1018
if branch_revno != 0:
1019
if (start_rev_id == _mod_revision.NULL_REVISION
1020
or end_rev_id == _mod_revision.NULL_REVISION):
1021
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1022
if start_revno > end_revno:
1023
raise errors.BzrCommandError("Start revision must be older than "
1024
"the end revision.")
1025
return (start_rev_id, end_rev_id)
1028
def _get_mainline_revs(branch, start_revision, end_revision):
1029
"""Get the mainline revisions from the branch.
1031
Generates the list of mainline revisions for the branch.
1033
:param branch: The branch containing the revisions.
1035
:param start_revision: The first revision to be logged.
1036
For backwards compatibility this may be a mainline integer revno,
1037
but for merge revision support a RevisionInfo is expected.
1039
:param end_revision: The last revision to be logged.
1040
For backwards compatibility this may be a mainline integer revno,
1041
but for merge revision support a RevisionInfo is expected.
1043
:return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
1045
branch_revno, branch_last_revision = branch.last_revision_info()
1046
if branch_revno == 0:
1047
return None, None, None, None
1049
# For mainline generation, map start_revision and end_revision to
1050
# mainline revnos. If the revision is not on the mainline choose the
1051
# appropriate extreme of the mainline instead - the extra will be
1053
# Also map the revisions to rev_ids, to be used in the later filtering
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
1067
if end_revision is None:
1068
end_revno = branch_revno
1070
if isinstance(end_revision, revisionspec.RevisionInfo):
1071
end_rev_id = end_revision.rev_id
1072
end_revno = end_revision.revno or branch_revno
1074
branch.check_real_revno(end_revision)
1075
end_revno = end_revision
1077
if ((start_rev_id == _mod_revision.NULL_REVISION)
1078
or (end_rev_id == _mod_revision.NULL_REVISION)):
1079
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1080
if start_revno > end_revno:
1081
raise errors.BzrCommandError("Start revision must be older than "
1082
"the end revision.")
1084
if end_revno < start_revno:
1085
return None, None, None, None
1086
cur_revno = branch_revno
1089
for revision_id in branch.repository.iter_reverse_revision_history(
1090
branch_last_revision):
1091
if cur_revno < start_revno:
1092
# We have gone far enough, but we always add 1 more revision
1093
rev_nos[revision_id] = cur_revno
1094
mainline_revs.append(revision_id)
1096
if cur_revno <= end_revno:
1097
rev_nos[revision_id] = cur_revno
1098
mainline_revs.append(revision_id)
1101
# We walked off the edge of all revisions, so we add a 'None' marker
1102
mainline_revs.append(None)
1104
mainline_revs.reverse()
171
mutter('get log for file_id %r', specific_fileid)
173
if search is not None:
175
searchRE = re.compile(search, re.IGNORECASE)
179
which_revs = _enumerate_history(branch)
181
if start_revision is None:
184
branch.check_real_revno(start_revision)
186
if end_revision is None:
187
end_revision = len(which_revs)
189
branch.check_real_revno(end_revision)
191
# list indexes are 0-based; revisions are 1-based
192
cut_revs = which_revs[(start_revision-1):(end_revision)]
196
# convert the revision history to a dictionary:
197
rev_nos = dict((k, v) for v, k in cut_revs)
1106
199
# override the mainline to look like the revision history.
1107
return mainline_revs, rev_nos, start_rev_id, end_rev_id
1110
@deprecated_function(deprecated_in((2, 2, 0)))
1111
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
1112
"""Filter view_revisions based on revision ranges.
1114
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1115
tuples to be filtered.
1117
:param start_rev_id: If not NONE specifies the first revision to be logged.
1118
If NONE then all revisions up to the end_rev_id are logged.
1120
:param end_rev_id: If not NONE specifies the last revision to be logged.
1121
If NONE then all revisions up to the end of the log are logged.
1123
:return: The filtered view_revisions.
1125
if start_rev_id or end_rev_id:
200
mainline_revs = [revision_id for index, revision_id in cut_revs]
201
if cut_revs[0][0] == 1:
202
mainline_revs.insert(0, None)
204
mainline_revs.insert(0, which_revs[start_revision-2][1])
205
if getattr(lf, 'show_merge', None) is not None:
206
include_merges = True
208
include_merges = False
209
view_revisions = list(get_view_revisions(mainline_revs, rev_nos, branch,
210
direction, include_merges=include_merges))
212
def iter_revisions():
213
# r = revision, n = revno, d = merge depth
1126
214
revision_ids = [r for r, n, d in view_revisions]
1128
start_index = revision_ids.index(start_rev_id)
1131
if start_rev_id == end_rev_id:
1132
end_index = start_index
1135
end_index = revision_ids.index(end_rev_id)
1137
end_index = len(view_revisions) - 1
1138
# To include the revisions merged into the last revision,
1139
# extend end_rev_id down to, but not including, the next rev
1140
# with the same or lesser merge_depth
1141
end_merge_depth = view_revisions[end_index][2]
1143
for index in xrange(end_index+1, len(view_revisions)+1):
1144
if view_revisions[index][2] <= end_merge_depth:
1145
end_index = index - 1
1148
# if the search falls off the end then log to the end as well
1149
end_index = len(view_revisions) - 1
1150
view_revisions = view_revisions[start_index:end_index+1]
1151
return view_revisions
1154
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1155
include_merges=True):
1156
r"""Return the list of revision ids which touch a given file id.
1158
The function filters view_revisions and returns a subset.
1159
This includes the revisions which directly change the file id,
1160
and the revisions which merge these changes. So if the
1172
And 'C' changes a file, then both C and D will be returned. F will not be
1173
returned even though it brings the changes to C into the branch starting
1174
with E. (Note that if we were using F as the tip instead of G, then we
1177
This will also be restricted based on a subset of the mainline.
1179
:param branch: The branch where we can get text revision information.
1181
:param file_id: Filter out revisions that do not touch file_id.
1183
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1184
tuples. This is the list of revisions which will be filtered. It is
1185
assumed that view_revisions is in merge_sort order (i.e. newest
1188
:param include_merges: include merge revisions in the result or not
1190
:return: A list of (revision_id, dotted_revno, merge_depth) tuples.
1192
# Lookup all possible text keys to determine which ones actually modified
1194
text_keys = [(file_id, rev_id) for rev_id, revno, depth in view_revisions]
1196
# Looking up keys in batches of 1000 can cut the time in half, as well as
1197
# memory consumption. GraphIndex *does* like to look for a few keys in
1198
# parallel, it just doesn't like looking for *lots* of keys in parallel.
1199
# TODO: This code needs to be re-evaluated periodically as we tune the
1200
# indexing layer. We might consider passing in hints as to the known
1201
# access pattern (sparse/clustered, high success rate/low success
1202
# rate). This particular access is clustered with a low success rate.
1203
get_parent_map = branch.repository.texts.get_parent_map
1204
modified_text_revisions = set()
1206
for start in xrange(0, len(text_keys), chunk_size):
1207
next_keys = text_keys[start:start + chunk_size]
1208
# Only keep the revision_id portion of the key
1209
modified_text_revisions.update(
1210
[k[1] for k in get_parent_map(next_keys)])
1211
del text_keys, next_keys
1214
# Track what revisions will merge the current revision, replace entries
1215
# with 'None' when they have been added to result
1216
current_merge_stack = [None]
1217
for info in view_revisions:
1218
rev_id, revno, depth = info
1219
if depth == len(current_merge_stack):
1220
current_merge_stack.append(info)
1222
del current_merge_stack[depth + 1:]
1223
current_merge_stack[-1] = info
1225
if rev_id in modified_text_revisions:
1226
# This needs to be logged, along with the extra revisions
1227
for idx in xrange(len(current_merge_stack)):
1228
node = current_merge_stack[idx]
1229
if node is not None:
1230
if include_merges or node[2] == 0:
1232
current_merge_stack[idx] = None
1236
@deprecated_function(deprecated_in((2, 2, 0)))
215
zeros = set(r for r, n, d in view_revisions if d == 0)
217
repository = branch.repository
220
revisions = repository.get_revisions(revision_ids[:num])
221
if verbose or specific_fileid:
222
delta_revisions = [r for r in revisions if
223
r.revision_id in zeros]
224
deltas = repository.get_deltas_for_revisions(delta_revisions)
225
cur_deltas = dict(izip((r.revision_id for r in
226
delta_revisions), deltas))
227
for revision in revisions:
228
# The delta value will be None unless
229
# 1. verbose or specific_fileid is specified, and
230
# 2. the revision is a mainline revision
231
yield revision, cur_deltas.get(revision.revision_id)
232
revision_ids = revision_ids[num:]
235
# now we just print all the revisions
236
for ((rev_id, revno, merge_depth), (rev, delta)) in \
237
izip(view_revisions, iter_revisions()):
240
if not searchRE.search(rev.message):
244
# a mainline revision.
247
if not delta.touches_file_id(specific_fileid):
251
# although we calculated it, throw it away without display
254
lf.show(revno, rev, delta)
256
lf.show_merge(rev, merge_depth)
1237
259
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1238
260
include_merges=True):
1239
261
"""Produce an iterator of revisions to show
1240
262
:return: an iterator of (revision_id, revno, merge_depth)
1241
263
(if there is no revno for a revision, None is supplied)
1243
if not include_merges:
265
if include_merges is False:
1244
266
revision_ids = mainline_revs[1:]
1245
267
if direction == 'reverse':
1246
268
revision_ids.reverse()
1247
269
for revision_id in revision_ids:
1248
yield revision_id, str(rev_nos[revision_id]), 0
270
yield revision_id, rev_nos[revision_id], 0
1250
graph = branch.repository.get_graph()
1251
# This asks for all mainline revisions, which means we only have to spider
1252
# sideways, rather than depth history. That said, its still size-of-history
1253
# and should be addressed.
1254
# mainline_revisions always includes an extra revision at the beginning, so
1256
parent_map = dict(((key, value) for key, value in
1257
graph.iter_ancestry(mainline_revs[1:]) if value is not None))
1258
# filter out ghosts; merge_sort errors on ghosts.
1259
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
1260
merge_sorted_revisions = tsort.merge_sort(
272
merge_sorted_revisions = merge_sort(
273
branch.repository.get_revision_graph(mainline_revs[-1]),
1262
274
mainline_revs[-1],
1264
generate_revno=True)
1266
277
if direction == 'forward':
1267
278
# forward means oldest first.
1281
293
revision of that depth. There may be no topological justification for this,
1282
294
but it looks much nicer.
1284
# Add a fake revision at start so that we can always attach sub revisions
1285
merge_sorted_revisions = [(None, None, _depth)] + merge_sorted_revisions
1286
296
zd_revisions = []
1287
297
for val in merge_sorted_revisions:
1288
298
if val[2] == _depth:
1289
# Each revision at the current depth becomes a chunk grouping all
1290
# higher depth revisions.
1291
299
zd_revisions.append([val])
301
assert val[2] > _depth
1293
302
zd_revisions[-1].append(val)
1294
303
for revisions in zd_revisions:
1295
304
if len(revisions) > 1:
1296
# We have higher depth revisions, let reverse them locally
1297
305
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1298
306
zd_revisions.reverse()
1300
308
for chunk in zd_revisions:
1301
309
result.extend(chunk)
1303
# Top level call, get rid of the fake revisions that have been added
1304
result = [r for r in result if r[0] is not None and r[1] is not None]
1308
class LogRevision(object):
1309
"""A revision to be logged (by LogFormatter.log_revision).
1311
A simple wrapper for the attributes of a revision to be logged.
1312
The attributes may or may not be populated, as determined by the
1313
logging options and the log formatter capabilities.
1316
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
1317
tags=None, diff=None):
1322
self.revno = str(revno)
1323
self.merge_depth = merge_depth
1329
313
class LogFormatter(object):
1330
"""Abstract class to display log messages.
1332
At a minimum, a derived class must implement the log_revision method.
1334
If the LogFormatter needs to be informed of the beginning or end of
1335
a log it should implement the begin_log and/or end_log hook methods.
1337
A LogFormatter should define the following supports_XXX flags
1338
to indicate which LogRevision attributes it supports:
1340
- supports_delta must be True if this log formatter supports delta.
1341
Otherwise the delta attribute may not be populated. The 'delta_format'
1342
attribute describes whether the 'short_status' format (1) or the long
1343
one (2) should be used.
1345
- supports_merge_revisions must be True if this log formatter supports
1346
merge revisions. If not, then only mainline revisions will be passed
1349
- preferred_levels is the number of levels this formatter defaults to.
1350
The default value is zero meaning display all levels.
1351
This value is only relevant if supports_merge_revisions is True.
1353
- supports_tags must be True if this log formatter supports tags.
1354
Otherwise the tags attribute may not be populated.
1356
- supports_diff must be True if this log formatter supports diffs.
1357
Otherwise the diff attribute may not be populated.
1359
Plugins can register functions to show custom revision properties using
1360
the properties_handler_registry. The registered function
1361
must respect the following interface description:
1362
def my_show_properties(properties_dict):
1363
# code that returns a dict {'name':'value'} of the properties
1366
preferred_levels = 0
1368
def __init__(self, to_file, show_ids=False, show_timezone='original',
1369
delta_format=None, levels=None, show_advice=False,
1370
to_exact_file=None, author_list_handler=None):
1371
"""Create a LogFormatter.
1373
:param to_file: the file to output to
1374
:param to_exact_file: if set, gives an output stream to which
1375
non-Unicode diffs are written.
1376
:param show_ids: if True, revision-ids are to be displayed
1377
:param show_timezone: the timezone to use
1378
:param delta_format: the level of delta information to display
1379
or None to leave it to the formatter to decide
1380
:param levels: the number of levels to display; None or -1 to
1381
let the log formatter decide.
1382
:param show_advice: whether to show advice at the end of the
1384
:param author_list_handler: callable generating a list of
1385
authors to display for a given revision
314
"""Abstract class to display log messages."""
316
def __init__(self, to_file, show_ids=False, show_timezone='original'):
1387
317
self.to_file = to_file
1388
# 'exact' stream used to show diff, it should print content 'as is'
1389
# and should not try to decode/encode it to unicode to avoid bug #328007
1390
if to_exact_file is not None:
1391
self.to_exact_file = to_exact_file
1393
# XXX: somewhat hacky; this assumes it's a codec writer; it's better
1394
# for code that expects to get diffs to pass in the exact file
1396
self.to_exact_file = getattr(to_file, 'stream', to_file)
1397
318
self.show_ids = show_ids
1398
319
self.show_timezone = show_timezone
1399
if delta_format is None:
1400
# Ensures backward compatibility
1401
delta_format = 2 # long format
1402
self.delta_format = delta_format
1403
self.levels = levels
1404
self._show_advice = show_advice
1405
self._merge_count = 0
1406
self._author_list_handler = author_list_handler
1408
def get_levels(self):
1409
"""Get the number of levels to display or 0 for all."""
1410
if getattr(self, 'supports_merge_revisions', False):
1411
if self.levels is None or self.levels == -1:
1412
self.levels = self.preferred_levels
1417
def log_revision(self, revision):
1420
:param revision: The LogRevision to be logged.
321
def show(self, revno, rev, delta):
1422
322
raise NotImplementedError('not implemented in abstract base')
1424
def show_advice(self):
1425
"""Output user advice, if any, when the log is completed."""
1426
if self._show_advice and self.levels == 1 and self._merge_count > 0:
1427
advice_sep = self.get_advice_separator()
1429
self.to_file.write(advice_sep)
1431
"Use --include-merges or -n0 to see merged revisions.\n")
1433
def get_advice_separator(self):
1434
"""Get the text separating the log from the closing advice."""
1437
324
def short_committer(self, rev):
1438
name, address = config.parse_username(rev.committer)
1443
def short_author(self, rev):
1444
return self.authors(rev, 'first', short=True, sep=', ')
1446
def authors(self, rev, who, short=False, sep=None):
1447
"""Generate list of authors, taking --authors option into account.
1449
The caller has to specify the name of a author list handler,
1450
as provided by the author list registry, using the ``who``
1451
argument. That name only sets a default, though: when the
1452
user selected a different author list generation using the
1453
``--authors`` command line switch, as represented by the
1454
``author_list_handler`` constructor argument, that value takes
1457
:param rev: The revision for which to generate the list of authors.
1458
:param who: Name of the default handler.
1459
:param short: Whether to shorten names to either name or address.
1460
:param sep: What separator to use for automatic concatenation.
1462
if self._author_list_handler is not None:
1463
# The user did specify --authors, which overrides the default
1464
author_list_handler = self._author_list_handler
1466
# The user didn't specify --authors, so we use the caller's default
1467
author_list_handler = author_list_registry.get(who)
1468
names = author_list_handler(rev)
1470
for i in range(len(names)):
1471
name, address = config.parse_username(names[i])
1477
names = sep.join(names)
1480
def merge_marker(self, revision):
1481
"""Get the merge marker to include in the output or '' if none."""
1482
if len(revision.rev.parent_ids) > 1:
1483
self._merge_count += 1
1488
def show_properties(self, revision, indent):
1489
"""Displays the custom properties returned by each registered handler.
1491
If a registered handler raises an error it is propagated.
1493
for line in self.custom_properties(revision):
1494
self.to_file.write("%s%s\n" % (indent, line))
1496
def custom_properties(self, revision):
1497
"""Format the custom properties returned by each registered handler.
1499
If a registered handler raises an error it is propagated.
1501
:return: a list of formatted lines (excluding trailing newlines)
1503
lines = self._foreign_info_properties(revision)
1504
for key, handler in properties_handler_registry.iteritems():
1505
lines.extend(self._format_properties(handler(revision)))
1508
def _foreign_info_properties(self, rev):
1509
"""Custom log displayer for foreign revision identifiers.
1511
:param rev: Revision object.
1513
# Revision comes directly from a foreign repository
1514
if isinstance(rev, foreign.ForeignRevision):
1515
return self._format_properties(
1516
rev.mapping.vcs.show_foreign_revid(rev.foreign_revid))
1518
# Imported foreign revision revision ids always contain :
1519
if not ":" in rev.revision_id:
1522
# Revision was once imported from a foreign repository
1524
foreign_revid, mapping = \
1525
foreign.foreign_vcs_registry.parse_revision_id(rev.revision_id)
1526
except errors.InvalidRevisionId:
1529
return self._format_properties(
1530
mapping.vcs.show_foreign_revid(foreign_revid))
1532
def _format_properties(self, properties):
1534
for key, value in properties.items():
1535
lines.append(key + ': ' + value)
1538
def show_diff(self, to_file, diff, indent):
1539
for l in diff.rstrip().split('\n'):
1540
to_file.write(indent + '%s\n' % (l,))
1543
# Separator between revisions in long format
1544
_LONG_SEP = '-' * 60
325
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
1547
328
class LongLogFormatter(LogFormatter):
1549
supports_merge_revisions = True
1550
preferred_levels = 1
1551
supports_delta = True
1552
supports_tags = True
1553
supports_diff = True
1555
def __init__(self, *args, **kwargs):
1556
super(LongLogFormatter, self).__init__(*args, **kwargs)
1557
if self.show_timezone == 'original':
1558
self.date_string = self._date_string_original_timezone
1560
self.date_string = self._date_string_with_timezone
1562
def _date_string_with_timezone(self, rev):
1563
return format_date(rev.timestamp, rev.timezone or 0,
1566
def _date_string_original_timezone(self, rev):
1567
return format_date_with_offset_in_original_timezone(rev.timestamp,
1570
def log_revision(self, revision):
1571
"""Log a revision, either merged or not."""
1572
indent = ' ' * revision.merge_depth
1574
if revision.revno is not None:
1575
lines.append('revno: %s%s' % (revision.revno,
1576
self.merge_marker(revision)))
1578
lines.append('tags: %s' % (', '.join(revision.tags)))
1579
if self.show_ids or revision.revno is None:
1580
lines.append('revision-id: %s' % (revision.rev.revision_id,))
329
def show(self, revno, rev, delta):
330
return self._show_helper(revno=revno, rev=rev, delta=delta)
332
def show_merge(self, rev, merge_depth):
333
return self._show_helper(rev=rev, indent=' '*merge_depth, merged=True, delta=None)
335
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
336
"""Show a revision, either merged or not."""
337
from bzrlib.osutils import format_date
338
to_file = self.to_file
339
print >>to_file, indent+'-' * 60
340
if revno is not None:
341
print >>to_file, 'revno:', revno
343
print >>to_file, indent+'merged:', rev.revision_id
345
print >>to_file, indent+'revision-id:', rev.revision_id
1581
346
if self.show_ids:
1582
for parent_id in revision.rev.parent_ids:
1583
lines.append('parent: %s' % (parent_id,))
1584
lines.extend(self.custom_properties(revision.rev))
1586
committer = revision.rev.committer
1587
authors = self.authors(revision.rev, 'all')
1588
if authors != [committer]:
1589
lines.append('author: %s' % (", ".join(authors),))
1590
lines.append('committer: %s' % (committer,))
1592
branch_nick = revision.rev.properties.get('branch-nick', None)
1593
if branch_nick is not None:
1594
lines.append('branch nick: %s' % (branch_nick,))
1596
lines.append('timestamp: %s' % (self.date_string(revision.rev),))
1598
lines.append('message:')
1599
if not revision.rev.message:
1600
lines.append(' (no message)')
347
for parent_id in rev.parent_ids:
348
print >>to_file, indent+'parent:', parent_id
349
print >>to_file, indent+'committer:', rev.committer
351
print >>to_file, indent+'branch nick: %s' % \
352
rev.properties['branch-nick']
355
date_str = format_date(rev.timestamp,
358
print >>to_file, indent+'timestamp: %s' % date_str
360
print >>to_file, indent+'message:'
362
print >>to_file, indent+' (no message)'
1602
message = revision.rev.message.rstrip('\r\n')
364
message = rev.message.rstrip('\r\n')
1603
365
for l in message.split('\n'):
1604
lines.append(' %s' % (l,))
1606
# Dump the output, appending the delta and diff if requested
1607
to_file = self.to_file
1608
to_file.write("%s%s\n" % (indent, ('\n' + indent).join(lines)))
1609
if revision.delta is not None:
1610
# Use the standard status output to display changes
1611
from bzrlib.delta import report_delta
1612
report_delta(to_file, revision.delta, short_status=False,
1613
show_ids=self.show_ids, indent=indent)
1614
if revision.diff is not None:
1615
to_file.write(indent + 'diff:\n')
1617
# Note: we explicitly don't indent the diff (relative to the
1618
# revision information) so that the output can be fed to patch -p0
1619
self.show_diff(self.to_exact_file, revision.diff, indent)
1620
self.to_exact_file.flush()
1622
def get_advice_separator(self):
1623
"""Get the text separating the log from the closing advice."""
1624
return '-' * 60 + '\n'
366
print >>to_file, indent+' ' + l
367
if delta is not None:
368
delta.show(to_file, self.show_ids)
1627
371
class ShortLogFormatter(LogFormatter):
1629
supports_merge_revisions = True
1630
preferred_levels = 1
1631
supports_delta = True
1632
supports_tags = True
1633
supports_diff = True
1635
def __init__(self, *args, **kwargs):
1636
super(ShortLogFormatter, self).__init__(*args, **kwargs)
1637
self.revno_width_by_depth = {}
1639
def log_revision(self, revision):
1640
# We need two indents: one per depth and one for the information
1641
# relative to that indent. Most mainline revnos are 5 chars or
1642
# less while dotted revnos are typically 11 chars or less. Once
1643
# calculated, we need to remember the offset for a given depth
1644
# as we might be starting from a dotted revno in the first column
1645
# and we want subsequent mainline revisions to line up.
1646
depth = revision.merge_depth
1647
indent = ' ' * depth
1648
revno_width = self.revno_width_by_depth.get(depth)
1649
if revno_width is None:
1650
if revision.revno is None or revision.revno.find('.') == -1:
1651
# mainline revno, e.g. 12345
1654
# dotted revno, e.g. 12345.10.55
1656
self.revno_width_by_depth[depth] = revno_width
1657
offset = ' ' * (revno_width + 1)
372
def show(self, revno, rev, delta):
373
from bzrlib.osutils import format_date
1659
375
to_file = self.to_file
1662
tags = ' {%s}' % (', '.join(revision.tags))
1663
to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1664
revision.revno or "", self.short_author(revision.rev),
1665
format_date(revision.rev.timestamp,
1666
revision.rev.timezone or 0,
376
date_str = format_date(rev.timestamp, rev.timezone or 0,
378
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
379
format_date(rev.timestamp, rev.timezone or 0,
1667
380
self.show_timezone, date_fmt="%Y-%m-%d",
1669
tags, self.merge_marker(revision)))
1670
self.show_properties(revision.rev, indent+offset)
1671
if self.show_ids or revision.revno is None:
1672
to_file.write(indent + offset + 'revision-id:%s\n'
1673
% (revision.rev.revision_id,))
1674
if not revision.rev.message:
1675
to_file.write(indent + offset + '(no message)\n')
383
print >>to_file, ' revision-id:', rev.revision_id
385
print >>to_file, ' (no message)'
1677
message = revision.rev.message.rstrip('\r\n')
387
message = rev.message.rstrip('\r\n')
1678
388
for l in message.split('\n'):
1679
to_file.write(indent + offset + '%s\n' % (l,))
389
print >>to_file, ' ' + l
1681
if revision.delta is not None:
1682
# Use the standard status output to display changes
1683
from bzrlib.delta import report_delta
1684
report_delta(to_file, revision.delta,
1685
short_status=self.delta_format==1,
1686
show_ids=self.show_ids, indent=indent + offset)
1687
if revision.diff is not None:
1688
self.show_diff(self.to_exact_file, revision.diff, ' ')
391
# TODO: Why not show the modified files in a shorter form as
392
# well? rewrap them single lines of appropriate length
393
if delta is not None:
394
delta.show(to_file, self.show_ids)
1692
398
class LineLogFormatter(LogFormatter):
1694
supports_merge_revisions = True
1695
preferred_levels = 1
1696
supports_tags = True
1698
def __init__(self, *args, **kwargs):
1699
super(LineLogFormatter, self).__init__(*args, **kwargs)
1700
width = terminal_width()
1701
if width is not None:
1702
# we need one extra space for terminals that wrap on last char
1704
self._max_chars = width
1706
399
def truncate(self, str, max_len):
1707
if max_len is None or len(str) <= max_len:
400
if len(str) <= max_len:
1709
return str[:max_len-3] + '...'
402
return str[:max_len-3]+'...'
1711
404
def date_string(self, rev):
1712
return format_date(rev.timestamp, rev.timezone or 0,
405
from bzrlib.osutils import format_date
406
return format_date(rev.timestamp, rev.timezone or 0,
1713
407
self.show_timezone, date_fmt="%Y-%m-%d",
1714
408
show_offset=False)
added
removed
bzrlib/log.py
