49
47
all the changes since the previous revision that touched hello.c.
50
from __future__ import absolute_import
53
from cStringIO import StringIO
54
from itertools import (
60
56
from warnings import (
64
from bzrlib.lazy_import import lazy_import
60
from .lazy_import import lazy_import
65
61
lazy_import(globals(), """
73
repository as _mod_repository,
74
69
revision as _mod_revision,
71
from breezy.i18n import gettext, ngettext
84
from bzrlib.osutils import (
80
from .osutils import (
86
82
format_date_with_offset_in_original_timezone,
83
get_diff_header_encoding,
87
84
get_terminal_encoding,
91
from bzrlib.symbol_versioning import (
97
def find_touching_revisions(branch, file_id):
92
from .tree import InterTree
95
def find_touching_revisions(repository, last_revision, last_tree, last_path):
98
96
"""Yield a description of revisions which affect the file_id.
100
98
Each returned element is (revno, revision_id, description)
105
103
TODO: Perhaps some way to limit this to only particular revisions,
106
104
or to traverse a non-mainline set of revisions?
111
for revision_id in branch.revision_history():
112
this_inv = branch.repository.get_inventory(revision_id)
113
if file_id in this_inv:
114
this_ie = this_inv[file_id]
115
this_path = this_inv.id2path(file_id)
117
this_ie = this_path = None
106
last_verifier = last_tree.get_file_verifier(last_path)
107
graph = repository.get_graph()
108
history = list(graph.iter_lefthand_ancestry(last_revision, []))
110
for revision_id in history:
111
this_tree = repository.revision_tree(revision_id)
112
this_intertree = InterTree.get(this_tree, last_tree)
113
this_path = this_intertree.find_source_path(last_path)
119
115
# now we know how it was last time, and how it is in this revision.
120
116
# are those two states effectively the same or not?
122
if not this_ie and not last_ie:
123
# not present in either
125
elif this_ie and not last_ie:
126
yield revno, revision_id, "added " + this_path
127
elif not this_ie and last_ie:
129
yield revno, revision_id, "deleted " + last_path
117
if this_path is not None and last_path is None:
118
yield revno, revision_id, "deleted " + this_path
119
this_verifier = this_tree.get_file_verifier(this_path)
120
elif this_path is None and last_path is not None:
121
yield revno, revision_id, "added " + last_path
130
122
elif this_path != last_path:
131
yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
132
elif (this_ie.text_size != last_ie.text_size
133
or this_ie.text_sha1 != last_ie.text_sha1):
134
yield revno, revision_id, "modified " + this_path
123
yield revno, revision_id, ("renamed %s => %s" % (this_path, last_path))
124
this_verifier = this_tree.get_file_verifier(this_path)
126
this_verifier = this_tree.get_file_verifier(this_path)
127
if (this_verifier != last_verifier):
128
yield revno, revision_id, "modified " + this_path
130
last_verifier = this_verifier
137
131
last_path = this_path
141
def _enumerate_history(branch):
144
for rev_id in branch.revision_history():
145
rh.append((revno, rev_id))
132
last_tree = this_tree
133
if last_path is None:
150
138
def show_log(branch,
152
specific_fileid=None,
154
141
direction='reverse',
155
142
start_revision=None,
156
143
end_revision=None,
160
148
"""Write out human-readable log of commits to this branch.
162
150
This function is being retained for backwards compatibility but
187
172
:param show_diff: If True, output a diff after each revision.
174
:param match: Dictionary of search lists to use when matching revision
189
# Convert old-style parameters to new-style parameters
190
if specific_fileid is not None:
191
file_ids = [specific_fileid]
196
delta_type = 'partial'
200
180
delta_type = None
203
diff_type = 'partial'
186
if isinstance(start_revision, int):
188
start_revision = revisionspec.RevisionInfo(branch, start_revision)
189
except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
190
raise errors.InvalidRevisionNumber(start_revision)
192
if isinstance(end_revision, int):
194
end_revision = revisionspec.RevisionInfo(branch, end_revision)
195
except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
196
raise errors.InvalidRevisionNumber(end_revision)
198
if end_revision is not None and end_revision.revno == 0:
199
raise errors.InvalidRevisionNumber(end_revision.revno)
209
201
# Build the request and execute it
210
rqst = make_log_request_dict(direction=direction, specific_fileids=file_ids,
202
rqst = make_log_request_dict(
211
204
start_revision=start_revision, end_revision=end_revision,
212
205
limit=limit, message_search=search,
213
206
delta_type=delta_type, diff_type=diff_type)
214
207
Logger(branch, rqst).show(lf)
217
# Note: This needs to be kept this in sync with the defaults in
210
# Note: This needs to be kept in sync with the defaults in
218
211
# make_log_request_dict() below
219
212
_DEFAULT_REQUEST_PARAMS = {
220
213
'direction': 'reverse',
222
215
'generate_tags': True,
223
216
'exclude_common_ancestry': False,
224
217
'_match_using_deltas': True,
228
221
def make_log_request_dict(direction='reverse', specific_fileids=None,
229
222
start_revision=None, end_revision=None, limit=None,
230
message_search=None, levels=1, generate_tags=True,
223
message_search=None, levels=None, generate_tags=True,
232
225
diff_type=None, _match_using_deltas=True,
233
exclude_common_ancestry=False,
226
exclude_common_ancestry=False, match=None,
227
signature=False, omit_merges=False,
235
229
"""Convenience function for making a logging request dictionary.
274
269
:param _match_using_deltas: a private parameter controlling the
275
270
algorithm used for matching specific_fileids. This parameter
276
may be removed in the future so bzrlib client code should NOT
271
may be removed in the future so breezy client code should NOT
279
274
:param exclude_common_ancestry: Whether -rX..Y should be interpreted as a
280
275
range operator or as a graph difference.
277
:param signature: show digital signature information
279
:param match: Dictionary of list of search strings to use when filtering
280
revisions. Keys can be 'message', 'author', 'committer', 'bugs' or
281
the empty string to match any of the preceding properties.
283
:param omit_merges: If True, commits with more than one parent are
287
# Take care of old style message_search parameter
290
if 'message' in match:
291
match['message'].append(message_search)
293
match['message'] = [message_search]
295
match = {'message': [message_search]}
283
297
'direction': direction,
284
298
'specific_fileids': specific_fileids,
285
299
'start_revision': start_revision,
286
300
'end_revision': end_revision,
288
'message_search': message_search,
289
302
'levels': levels,
290
303
'generate_tags': generate_tags,
291
304
'delta_type': delta_type,
292
305
'diff_type': diff_type,
293
306
'exclude_common_ancestry': exclude_common_ancestry,
307
'signature': signature,
309
'omit_merges': omit_merges,
294
310
# Add 'private' attributes for features that may be deprecated
295
311
'_match_using_deltas': _match_using_deltas,
299
315
def _apply_log_request_defaults(rqst):
300
316
"""Apply default values to a request dictionary."""
301
result = _DEFAULT_REQUEST_PARAMS
317
result = _DEFAULT_REQUEST_PARAMS.copy()
303
319
result.update(rqst)
323
def format_signature_validity(rev_id, branch):
324
"""get the signature validity
326
:param rev_id: revision id to validate
327
:param branch: branch of revision
328
:return: human readable string to print to log
330
from breezy import gpg
332
gpg_strategy = gpg.GPGStrategy(branch.get_config_stack())
333
result = branch.repository.verify_revision_signature(rev_id, gpg_strategy)
334
if result[0] == gpg.SIGNATURE_VALID:
335
return u"valid signature from {0}".format(result[1])
336
if result[0] == gpg.SIGNATURE_KEY_MISSING:
337
return "unknown key {0}".format(result[1])
338
if result[0] == gpg.SIGNATURE_NOT_VALID:
339
return "invalid signature!"
340
if result[0] == gpg.SIGNATURE_NOT_SIGNED:
341
return "no signature"
307
344
class LogGenerator(object):
308
345
"""A generator of log revisions."""
354
388
# Tweak the LogRequest based on what the LogFormatter can handle.
355
389
# (There's no point generating stuff if the formatter can't display it.)
357
rqst['levels'] = lf.get_levels()
391
if rqst['levels'] is None or lf.get_levels() > rqst['levels']:
392
# user didn't specify levels, use whatever the LF can handle:
393
rqst['levels'] = lf.get_levels()
358
395
if not getattr(lf, 'supports_tags', False):
359
396
rqst['generate_tags'] = False
360
397
if not getattr(lf, 'supports_delta', False):
361
398
rqst['delta_type'] = None
362
399
if not getattr(lf, 'supports_diff', False):
363
400
rqst['diff_type'] = None
401
if not getattr(lf, 'supports_signatures', False):
402
rqst['signature'] = False
365
404
# Find and print the interesting revisions
366
405
generator = self._generator_factory(self.branch, rqst)
367
for lr in generator.iter_log_revisions():
407
for lr in generator.iter_log_revisions():
409
except errors.GhostRevisionUnusableHere:
410
raise errors.BzrCommandError(
411
gettext('Further revision history missing.'))
371
414
def _generator_factory(self, branch, rqst):
372
415
"""Make the LogGenerator object to use.
374
417
Subclasses may wish to override this.
376
419
return _DefaultLogGenerator(branch, rqst)
400
443
levels = rqst.get('levels')
401
444
limit = rqst.get('limit')
402
445
diff_type = rqst.get('diff_type')
446
show_signature = rqst.get('signature')
447
omit_merges = rqst.get('omit_merges')
404
449
revision_iterator = self._create_log_revision_iterator()
405
450
for revs in revision_iterator:
406
451
for (rev_id, revno, merge_depth), rev, delta in revs:
407
452
# 0 levels means show everything; merge_depth counts from 0
408
if levels != 0 and merge_depth >= levels:
453
if (levels != 0 and merge_depth is not None and
454
merge_depth >= levels):
456
if omit_merges and len(rev.parent_ids) > 1:
459
raise errors.GhostRevisionUnusableHere(rev_id)
410
460
if diff_type is None:
413
463
diff = self._format_diff(rev, rev_id, diff_type)
414
yield LogRevision(rev, revno, merge_depth, delta,
415
self.rev_tag_dict.get(rev_id), diff)
465
signature = format_signature_validity(rev_id, self.branch)
469
rev, revno, merge_depth, delta,
470
self.rev_tag_dict.get(rev_id), diff, signature)
418
473
if log_count >= limit:
473
530
# Apply the other filters
474
531
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'))
532
rqst.get('delta_type'), rqst.get('match'),
533
file_ids=rqst.get('specific_fileids'),
534
direction=rqst.get('direction'))
479
536
def _log_revision_iterator_using_per_file_graph(self):
480
537
# Get the base revisions, filtering by the revision range.
488
545
if not isinstance(view_revisions, list):
489
546
view_revisions = list(view_revisions)
490
547
view_revisions = _filter_revisions_touching_file_id(self.branch,
491
rqst.get('specific_fileids')[0], view_revisions,
492
include_merges=rqst.get('levels') != 1)
548
rqst.get('specific_fileids')[
550
include_merges=rqst.get('levels') != 1)
493
551
return make_log_rev_iterator(self.branch, view_revisions,
494
rqst.get('delta_type'), rqst.get('message_search'))
552
rqst.get('delta_type'), rqst.get('match'))
497
555
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
505
563
a list of the same tuples.
507
565
if (exclude_common_ancestry and start_rev_id == end_rev_id):
508
raise errors.BzrCommandError(
509
'--exclude-common-ancestry requires two different revisions')
566
raise errors.BzrCommandError(gettext(
567
'--exclude-common-ancestry requires two different revisions'))
510
568
if direction not in ('reverse', 'forward'):
511
raise ValueError('invalid direction %r' % direction)
512
br_revno, br_rev_id = branch.last_revision_info()
569
raise ValueError(gettext('invalid direction %r') % direction)
570
br_rev_id = branch.last_revision()
571
if br_rev_id == _mod_revision.NULL_REVISION:
516
574
if (end_rev_id and start_rev_id == end_rev_id
517
575
and (not generate_merge_revisions
518
576
or not _has_merges(branch, end_rev_id))):
519
577
# If a single revision is requested, check we can handle it
520
iter_revs = _generate_one_revision(branch, end_rev_id, br_rev_id,
522
elif not generate_merge_revisions:
523
# If we only want to see linear revisions, we can iterate ...
524
iter_revs = _generate_flat_revisions(branch, start_rev_id, end_rev_id,
526
if direction == 'forward':
527
iter_revs = reversed(iter_revs)
529
iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
530
direction, delayed_graph_generation,
531
exclude_common_ancestry)
532
if direction == 'forward':
533
iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
578
return _generate_one_revision(branch, end_rev_id, br_rev_id,
580
if not generate_merge_revisions:
582
# If we only want to see linear revisions, we can iterate ...
583
iter_revs = _linear_view_revisions(
584
branch, start_rev_id, end_rev_id,
585
exclude_common_ancestry=exclude_common_ancestry)
586
# If a start limit was given and it's not obviously an
587
# ancestor of the end limit, check it before outputting anything
588
if (direction == 'forward'
589
or (start_rev_id and not _is_obvious_ancestor(
590
branch, start_rev_id, end_rev_id))):
591
iter_revs = list(iter_revs)
592
if direction == 'forward':
593
iter_revs = reversed(iter_revs)
595
except _StartNotLinearAncestor:
596
# Switch to the slower implementation that may be able to find a
597
# non-obvious ancestor out of the left-hand history.
599
iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
600
direction, delayed_graph_generation,
601
exclude_common_ancestry)
602
if direction == 'forward':
603
iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
540
610
return [(br_rev_id, br_revno, 0)]
542
revno = branch.revision_id_to_dotted_revno(rev_id)
543
revno_str = '.'.join(str(n) for n in revno)
612
revno_str = _compute_revno_str(branch, rev_id)
544
613
return [(rev_id, revno_str, 0)]
547
def _generate_flat_revisions(branch, start_rev_id, end_rev_id, direction):
548
result = _linear_view_revisions(branch, start_rev_id, end_rev_id)
549
# If a start limit was given and it's not obviously an
550
# ancestor of the end limit, check it before outputting anything
551
if direction == 'forward' or (start_rev_id
552
and not _is_obvious_ancestor(branch, start_rev_id, end_rev_id)):
554
result = list(result)
555
except _StartNotLinearAncestor:
556
raise errors.BzrCommandError('Start revision not found in'
557
' left-hand history of end revision.')
561
616
def _generate_all_revisions(branch, start_rev_id, end_rev_id, direction,
562
617
delayed_graph_generation,
563
618
exclude_common_ancestry=False):
571
626
initial_revisions = []
572
627
if delayed_graph_generation:
574
for rev_id, revno, depth in _linear_view_revisions(
575
branch, start_rev_id, end_rev_id):
629
for rev_id, revno, depth in _linear_view_revisions(
630
branch, start_rev_id, end_rev_id, exclude_common_ancestry):
576
631
if _has_merges(branch, rev_id):
577
632
# The end_rev_id can be nested down somewhere. We need an
578
633
# explicit ancestry check. There is an ambiguity here as we
610
665
# shown naturally, i.e. just like it is for linear logging. We can easily
611
666
# make forward the exact opposite display, but showing the merge revisions
612
667
# indented at the end seems slightly nicer in that case.
613
view_revisions = chain(iter(initial_revisions),
614
_graph_view_revisions(branch, start_rev_id, end_rev_id,
615
rebase_initial_depths=(direction == 'reverse'),
616
exclude_common_ancestry=exclude_common_ancestry))
668
view_revisions = itertools.chain(iter(initial_revisions),
669
_graph_view_revisions(branch, start_rev_id, end_rev_id,
670
rebase_initial_depths=(
671
direction == 'reverse'),
672
exclude_common_ancestry=exclude_common_ancestry))
617
673
return view_revisions
623
679
return len(parents) > 1
682
def _compute_revno_str(branch, rev_id):
683
"""Compute the revno string from a rev_id.
685
:return: The revno string, or None if the revision is not in the supplied
689
revno = branch.revision_id_to_dotted_revno(rev_id)
690
except errors.NoSuchRevision:
691
# The revision must be outside of this branch
694
return '.'.join(str(n) for n in revno)
626
697
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
627
698
"""Is start_rev_id an obvious ancestor of end_rev_id?"""
628
699
if start_rev_id and end_rev_id:
629
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
630
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
701
start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
702
end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
703
except errors.NoSuchRevision:
704
# one or both is not in the branch; not obvious
631
706
if len(start_dotted) == 1 and len(end_dotted) == 1:
632
707
# both on mainline
633
708
return start_dotted[0] <= end_dotted[0]
634
709
elif (len(start_dotted) == 3 and len(end_dotted) == 3 and
635
start_dotted[0:1] == end_dotted[0:1]):
710
start_dotted[0:1] == end_dotted[0:1]):
636
711
# both on same development line
637
712
return start_dotted[2] <= end_dotted[2]
646
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
721
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
722
exclude_common_ancestry=False):
647
723
"""Calculate a sequence of revisions to view, newest to oldest.
649
725
:param start_rev_id: the lower revision-id
650
726
:param end_rev_id: the upper revision-id
727
:param exclude_common_ancestry: Whether the start_rev_id should be part of
728
the iterated revisions.
651
729
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
730
dotted_revno will be None for ghosts
652
731
:raises _StartNotLinearAncestor: if a start_rev_id is specified but
653
is not found walking the left-hand history
732
is not found walking the left-hand history
655
br_revno, br_rev_id = branch.last_revision_info()
656
734
repo = branch.repository
735
graph = repo.get_graph()
657
736
if start_rev_id is None and end_rev_id is None:
659
for revision_id in repo.iter_reverse_revision_history(br_rev_id):
660
yield revision_id, str(cur_revno), 0
737
if branch._format.stores_revno() or \
738
config.GlobalStack().get('calculate_revnos'):
740
br_revno, br_rev_id = branch.last_revision_info()
741
except errors.GhostRevisionsHaveNoRevno:
742
br_rev_id = branch.last_revision()
747
br_rev_id = branch.last_revision()
750
graph_iter = graph.iter_lefthand_ancestry(br_rev_id,
751
(_mod_revision.NULL_REVISION,))
754
revision_id = next(graph_iter)
755
except errors.RevisionNotPresent as e:
757
yield e.revision_id, None, None
759
except StopIteration:
762
yield revision_id, str(cur_revno) if cur_revno is not None else None, 0
763
if cur_revno is not None:
766
br_rev_id = branch.last_revision()
663
767
if end_rev_id is None:
664
768
end_rev_id = br_rev_id
665
769
found_start = start_rev_id is None
666
for revision_id in repo.iter_reverse_revision_history(end_rev_id):
667
revno = branch.revision_id_to_dotted_revno(revision_id)
668
revno_str = '.'.join(str(n) for n in revno)
669
if not found_start and revision_id == start_rev_id:
670
yield revision_id, revno_str, 0
770
graph_iter = graph.iter_lefthand_ancestry(end_rev_id,
771
(_mod_revision.NULL_REVISION,))
774
revision_id = next(graph_iter)
775
except StopIteration:
777
except errors.RevisionNotPresent as e:
779
yield e.revision_id, None, None
674
yield revision_id, revno_str, 0
677
raise _StartNotLinearAncestor()
782
revno_str = _compute_revno_str(branch, revision_id)
783
if not found_start and revision_id == start_rev_id:
784
if not exclude_common_ancestry:
785
yield revision_id, revno_str, 0
789
yield revision_id, revno_str, 0
791
raise _StartNotLinearAncestor()
680
794
def _graph_view_revisions(branch, start_rev_id, end_rev_id,
721
835
yield rev_id, '.'.join(map(str, revno)), merge_depth
724
@deprecated_function(deprecated_in((2, 2, 0)))
725
def calculate_view_revisions(branch, start_revision, end_revision, direction,
726
specific_fileid, generate_merge_revisions):
727
"""Calculate the revisions to view.
729
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
730
a list of the same tuples.
732
start_rev_id, end_rev_id = _get_revision_limits(branch, start_revision,
734
view_revisions = list(_calc_view_revisions(branch, start_rev_id, end_rev_id,
735
direction, generate_merge_revisions or specific_fileid))
737
view_revisions = _filter_revisions_touching_file_id(branch,
738
specific_fileid, view_revisions,
739
include_merges=generate_merge_revisions)
740
return _rebase_merge_depth(view_revisions)
743
838
def _rebase_merge_depth(view_revisions):
744
839
"""Adjust depths upwards so the top level is 0."""
745
840
# If either the first or last revision have a merge_depth of 0, we're done
746
841
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
747
min_depth = min([d for r,n,d in view_revisions])
842
min_depth = min([d for r, n, d in view_revisions])
748
843
if min_depth != 0:
749
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
844
view_revisions = [(r, n, d - min_depth)
845
for r, n, d in view_revisions]
750
846
return view_revisions
753
849
def make_log_rev_iterator(branch, view_revisions, generate_delta, search,
754
file_ids=None, direction='reverse'):
850
file_ids=None, direction='reverse'):
755
851
"""Create a revision iterator for log.
757
853
:param branch: The branch being logged.
768
864
# Convert view_revisions into (view, None, None) groups to fit with
769
865
# the standard interface here.
770
if type(view_revisions) == list:
866
if isinstance(view_revisions, list):
771
867
# A single batch conversion is faster than many incremental ones.
772
868
# As we have all the data, do a batch conversion.
773
869
nones = [None] * len(view_revisions)
774
log_rev_iterator = iter([zip(view_revisions, nones, nones)])
870
log_rev_iterator = iter([list(zip(view_revisions, nones, nones))])
777
873
for view in view_revisions:
781
877
# It would be nicer if log adapters were first class objects
782
878
# with custom parameters. This will do for now. IGC 20090127
783
879
if adapter == _make_delta_filter:
784
log_rev_iterator = adapter(branch, generate_delta,
785
search, log_rev_iterator, file_ids, direction)
880
log_rev_iterator = adapter(
881
branch, generate_delta, search, log_rev_iterator, file_ids,
787
log_rev_iterator = adapter(branch, generate_delta,
788
search, log_rev_iterator)
884
log_rev_iterator = adapter(
885
branch, generate_delta, search, log_rev_iterator)
789
886
return log_rev_iterator
792
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):
889
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
793
890
"""Create a filtered iterator of log_rev_iterator matching on a regex.
795
892
:param branch: The branch being logged.
796
893
:param generate_delta: Whether to generate a delta for each revision.
797
:param search: A user text search string.
894
:param match: A dictionary with properties as keys and lists of strings
895
as values. To match, a revision may match any of the supplied strings
896
within a single property but must match at least one string for each
798
898
:param log_rev_iterator: An input iterator containing all revisions that
799
899
could be displayed, in lists.
800
900
:return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
804
904
return log_rev_iterator
805
searchRE = re_compile_checked(search, re.IGNORECASE,
806
'log message filter')
807
return _filter_message_re(searchRE, log_rev_iterator)
810
def _filter_message_re(searchRE, log_rev_iterator):
905
# Use lazy_compile so mapping to InvalidPattern error occurs.
906
searchRE = [(k, [lazy_regex.lazy_compile(x, re.IGNORECASE) for x in v])
907
for k, v in match.items()]
908
return _filter_re(searchRE, log_rev_iterator)
911
def _filter_re(searchRE, log_rev_iterator):
811
912
for revs in log_rev_iterator:
813
for (rev_id, revno, merge_depth), rev, delta in revs:
814
if searchRE.search(rev.message):
815
new_revs.append(((rev_id, revno, merge_depth), rev, delta))
913
new_revs = [rev for rev in revs if _match_filter(searchRE, rev[1])]
918
def _match_filter(searchRE, rev):
920
'message': (rev.message,),
921
'committer': (rev.committer,),
922
'author': (rev.get_apparent_authors()),
923
'bugs': list(rev.iter_bugs())
925
strings[''] = [item for inner_list in strings.values()
926
for item in inner_list]
927
for k, v in searchRE:
928
if k in strings and not _match_any_filter(strings[k], v):
933
def _match_any_filter(strings, res):
934
return any(r.search(s) for r in res for s in strings)
819
937
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
820
fileids=None, direction='reverse'):
938
fileids=None, direction='reverse'):
821
939
"""Add revision deltas to a log iterator if needed.
823
941
:param branch: The branch being logged.
866
984
if delta_type == 'full' and not check_fileids:
867
985
deltas = repository.get_deltas_for_revisions(revisions)
868
for rev, delta in izip(revs, deltas):
986
for rev, delta in zip(revs, deltas):
869
987
new_revs.append((rev[0], rev[1], delta))
871
989
deltas = repository.get_deltas_for_revisions(revisions, fileid_set)
872
for rev, delta in izip(revs, deltas):
990
for rev, delta in zip(revs, deltas):
873
991
if check_fileids:
874
992
if delta is None or not delta.has_changed():
894
1012
def _update_fileids(delta, fileids, stop_on):
895
1013
"""Update the set of file-ids to search based on file lifecycle events.
897
1015
:param fileids: a set of fileids to update
898
1016
:param stop_on: either 'add' or 'remove' - take file-ids out of the
899
1017
fileids set once their add or remove entry is detected respectively
901
1019
if stop_on == 'add':
902
for item in delta.added:
903
if item[1] in fileids:
904
fileids.remove(item[1])
1020
for item in delta.added + delta.copied:
1021
if item.file_id in fileids:
1022
fileids.remove(item.file_id)
905
1023
elif stop_on == 'delete':
906
1024
for item in delta.removed:
907
if item[1] in fileids:
908
fileids.remove(item[1])
1025
if item.file_id in fileids:
1026
fileids.remove(item.file_id)
911
1029
def _make_revision_objects(branch, generate_delta, search, log_rev_iterator):
923
1041
for revs in log_rev_iterator:
924
1042
# r = revision_id, n = revno, d = merge depth
925
1043
revision_ids = [view[0] for view, _, _ in revs]
926
revisions = repository.get_revisions(revision_ids)
927
revs = [(rev[0], revision, rev[2]) for rev, revision in
928
izip(revs, revisions)]
1044
revisions = dict(repository.iter_revisions(revision_ids))
1045
yield [(rev[0], revisions[rev[0][0]], rev[2]) for rev in revs]
932
1048
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):
968
1082
:return: (start_rev_id, end_rev_id) tuple.
970
branch_revno, branch_rev_id = branch.last_revision_info()
971
1084
start_rev_id = None
972
if start_revision is None:
1086
if start_revision is not None:
1087
if not isinstance(start_revision, revisionspec.RevisionInfo):
1088
raise TypeError(start_revision)
1089
start_rev_id = start_revision.rev_id
1090
start_revno = start_revision.revno
1091
if start_revno is None:
975
if isinstance(start_revision, revisionspec.RevisionInfo):
976
start_rev_id = start_revision.rev_id
977
start_revno = start_revision.revno or 1
979
branch.check_real_revno(start_revision)
980
start_revno = start_revision
981
start_rev_id = branch.get_rev_id(start_revno)
983
1094
end_rev_id = None
984
if end_revision is None:
985
end_revno = branch_revno
987
if isinstance(end_revision, revisionspec.RevisionInfo):
988
end_rev_id = end_revision.rev_id
989
end_revno = end_revision.revno or branch_revno
991
branch.check_real_revno(end_revision)
992
end_revno = end_revision
993
end_rev_id = branch.get_rev_id(end_revno)
1096
if end_revision is not None:
1097
if not isinstance(end_revision, revisionspec.RevisionInfo):
1098
raise TypeError(start_revision)
1099
end_rev_id = end_revision.rev_id
1100
end_revno = end_revision.revno
995
if branch_revno != 0:
1102
if branch.last_revision() != _mod_revision.NULL_REVISION:
996
1103
if (start_rev_id == _mod_revision.NULL_REVISION
997
or end_rev_id == _mod_revision.NULL_REVISION):
998
raise errors.BzrCommandError('Logging revision 0 is invalid.')
999
if start_revno > end_revno:
1000
raise errors.BzrCommandError("Start revision must be older than "
1001
"the end revision.")
1104
or end_rev_id == _mod_revision.NULL_REVISION):
1105
raise errors.BzrCommandError(
1106
gettext('Logging revision 0 is invalid.'))
1107
if end_revno is not None and start_revno > end_revno:
1108
raise errors.BzrCommandError(
1109
gettext("Start revision must be older than the end revision."))
1002
1110
return (start_rev_id, end_rev_id)
1052
1160
end_revno = end_revision
1054
1162
if ((start_rev_id == _mod_revision.NULL_REVISION)
1055
or (end_rev_id == _mod_revision.NULL_REVISION)):
1056
raise errors.BzrCommandError('Logging revision 0 is invalid.')
1163
or (end_rev_id == _mod_revision.NULL_REVISION)):
1164
raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
1057
1165
if start_revno > end_revno:
1058
raise errors.BzrCommandError("Start revision must be older than "
1059
"the end revision.")
1166
raise errors.BzrCommandError(gettext("Start revision must be older "
1167
"than the end revision."))
1061
1169
if end_revno < start_revno:
1062
1170
return None, None, None, None
1063
1171
cur_revno = branch_revno
1065
1173
mainline_revs = []
1066
for revision_id in branch.repository.iter_reverse_revision_history(
1067
branch_last_revision):
1174
graph = branch.repository.get_graph()
1175
for revision_id in graph.iter_lefthand_ancestry(
1176
branch_last_revision, (_mod_revision.NULL_REVISION,)):
1068
1177
if cur_revno < start_revno:
1069
1178
# We have gone far enough, but we always add 1 more revision
1070
1179
rev_nos[revision_id] = cur_revno
1084
1193
return mainline_revs, rev_nos, start_rev_id, end_rev_id
1087
@deprecated_function(deprecated_in((2, 2, 0)))
1088
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
1089
"""Filter view_revisions based on revision ranges.
1091
:param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1092
tuples to be filtered.
1094
:param start_rev_id: If not NONE specifies the first revision to be logged.
1095
If NONE then all revisions up to the end_rev_id are logged.
1097
:param end_rev_id: If not NONE specifies the last revision to be logged.
1098
If NONE then all revisions up to the end of the log are logged.
1100
:return: The filtered view_revisions.
1102
if start_rev_id or end_rev_id:
1103
revision_ids = [r for r, n, d in view_revisions]
1105
start_index = revision_ids.index(start_rev_id)
1108
if start_rev_id == end_rev_id:
1109
end_index = start_index
1112
end_index = revision_ids.index(end_rev_id)
1114
end_index = len(view_revisions) - 1
1115
# To include the revisions merged into the last revision,
1116
# extend end_rev_id down to, but not including, the next rev
1117
# with the same or lesser merge_depth
1118
end_merge_depth = view_revisions[end_index][2]
1120
for index in xrange(end_index+1, len(view_revisions)+1):
1121
if view_revisions[index][2] <= end_merge_depth:
1122
end_index = index - 1
1125
# if the search falls off the end then log to the end as well
1126
end_index = len(view_revisions) - 1
1127
view_revisions = view_revisions[start_index:end_index+1]
1128
return view_revisions
1131
1196
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1132
include_merges=True):
1197
include_merges=True):
1133
1198
r"""Return the list of revision ids which touch a given file id.
1135
1200
The function filters view_revisions and returns a subset.
1136
1201
This includes the revisions which directly change the file id,
1137
1202
and the revisions which merge these changes. So if the
1138
1203
revision graph is::
1177
1245
# indexing layer. We might consider passing in hints as to the known
1178
1246
# access pattern (sparse/clustered, high success rate/low success
1179
1247
# rate). This particular access is clustered with a low success rate.
1180
get_parent_map = branch.repository.texts.get_parent_map
1181
1248
modified_text_revisions = set()
1182
1249
chunk_size = 1000
1183
for start in xrange(0, len(text_keys), chunk_size):
1250
for start in range(0, len(text_keys), chunk_size):
1184
1251
next_keys = text_keys[start:start + chunk_size]
1185
1252
# Only keep the revision_id portion of the key
1186
1253
modified_text_revisions.update(
1213
@deprecated_function(deprecated_in((2, 2, 0)))
1214
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1215
include_merges=True):
1216
"""Produce an iterator of revisions to show
1217
:return: an iterator of (revision_id, revno, merge_depth)
1218
(if there is no revno for a revision, None is supplied)
1220
if not include_merges:
1221
revision_ids = mainline_revs[1:]
1222
if direction == 'reverse':
1223
revision_ids.reverse()
1224
for revision_id in revision_ids:
1225
yield revision_id, str(rev_nos[revision_id]), 0
1227
graph = branch.repository.get_graph()
1228
# This asks for all mainline revisions, which means we only have to spider
1229
# sideways, rather than depth history. That said, its still size-of-history
1230
# and should be addressed.
1231
# mainline_revisions always includes an extra revision at the beginning, so
1233
parent_map = dict(((key, value) for key, value in
1234
graph.iter_ancestry(mainline_revs[1:]) if value is not None))
1235
# filter out ghosts; merge_sort errors on ghosts.
1236
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
1237
merge_sorted_revisions = tsort.merge_sort(
1241
generate_revno=True)
1243
if direction == 'forward':
1244
# forward means oldest first.
1245
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1246
elif direction != 'reverse':
1247
raise ValueError('invalid direction %r' % direction)
1249
for (sequence, rev_id, merge_depth, revno, end_of_merge
1250
) in merge_sorted_revisions:
1251
yield rev_id, '.'.join(map(str, revno)), merge_depth
1254
1280
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1255
1281
"""Reverse revisions by depth.
1257
1283
Revisions with a different depth are sorted as a group with the previous
1258
revision of that depth. There may be no topological justification for this,
1284
revision of that depth. There may be no topological justification for this
1259
1285
but it looks much nicer.
1261
1287
# Add a fake revision at start so that we can always attach sub revisions
1312
1342
to indicate which LogRevision attributes it supports:
1314
1344
- supports_delta must be True if this log formatter supports delta.
1315
Otherwise the delta attribute may not be populated. The 'delta_format'
1316
attribute describes whether the 'short_status' format (1) or the long
1317
one (2) should be used.
1345
Otherwise the delta attribute may not be populated. The 'delta_format'
1346
attribute describes whether the 'short_status' format (1) or the long
1347
one (2) should be used.
1319
1349
- supports_merge_revisions must be True if this log formatter supports
1320
merge revisions. If not, then only mainline revisions will be passed
1350
merge revisions. If not, then only mainline revisions will be passed
1323
1353
- preferred_levels is the number of levels this formatter defaults to.
1324
The default value is zero meaning display all levels.
1325
This value is only relevant if supports_merge_revisions is True.
1354
The default value is zero meaning display all levels.
1355
This value is only relevant if supports_merge_revisions is True.
1327
1357
- supports_tags must be True if this log formatter supports tags.
1328
Otherwise the tags attribute may not be populated.
1358
Otherwise the tags attribute may not be populated.
1330
1360
- supports_diff must be True if this log formatter supports diffs.
1331
Otherwise the diff attribute may not be populated.
1361
Otherwise the diff attribute may not be populated.
1363
- supports_signatures must be True if this log formatter supports GPG
1333
1366
Plugins can register functions to show custom revision properties using
1334
1367
the properties_handler_registry. The registered function
1335
must respect the following interface description:
1368
must respect the following interface description::
1336
1370
def my_show_properties(properties_dict):
1337
1371
# code that returns a dict {'name':'value'} of the properties
1342
1376
def __init__(self, to_file, show_ids=False, show_timezone='original',
1343
1377
delta_format=None, levels=None, show_advice=False,
1344
to_exact_file=None):
1378
to_exact_file=None, author_list_handler=None):
1345
1379
"""Create a LogFormatter.
1347
1381
:param to_file: the file to output to
1348
:param to_exact_file: if set, gives an output stream to which
1382
:param to_exact_file: if set, gives an output stream to which
1349
1383
non-Unicode diffs are written.
1350
1384
:param show_ids: if True, revision-ids are to be displayed
1351
1385
:param show_timezone: the timezone to use
1355
1389
let the log formatter decide.
1356
1390
:param show_advice: whether to show advice at the end of the
1392
:param author_list_handler: callable generating a list of
1393
authors to display for a given revision
1359
1395
self.to_file = to_file
1360
1396
# 'exact' stream used to show diff, it should print content 'as is'
1361
# and should not try to decode/encode it to unicode to avoid bug #328007
1397
# and should not try to decode/encode it to unicode to avoid bug
1362
1399
if to_exact_file is not None:
1363
1400
self.to_exact_file = to_exact_file
1365
# XXX: somewhat hacky; this assumes it's a codec writer; it's better
1366
# for code that expects to get diffs to pass in the exact file
1402
# XXX: somewhat hacky; this assumes it's a codec writer; it's
1403
# better for code that expects to get diffs to pass in the exact
1368
1405
self.to_exact_file = getattr(to_file, 'stream', to_file)
1369
1406
self.show_ids = show_ids
1370
1407
self.show_timezone = show_timezone
1371
1408
if delta_format is None:
1372
1409
# Ensures backward compatibility
1373
delta_format = 2 # long format
1410
delta_format = 2 # long format
1374
1411
self.delta_format = delta_format
1375
1412
self.levels = levels
1376
1413
self._show_advice = show_advice
1377
1414
self._merge_count = 0
1415
self._author_list_handler = author_list_handler
1379
1417
def get_levels(self):
1380
1418
"""Get the number of levels to display or 0 for all."""
1414
1452
def short_author(self, rev):
1415
name, address = config.parse_username(rev.get_apparent_authors()[0])
1453
return self.authors(rev, 'first', short=True, sep=', ')
1455
def authors(self, rev, who, short=False, sep=None):
1456
"""Generate list of authors, taking --authors option into account.
1458
The caller has to specify the name of a author list handler,
1459
as provided by the author list registry, using the ``who``
1460
argument. That name only sets a default, though: when the
1461
user selected a different author list generation using the
1462
``--authors`` command line switch, as represented by the
1463
``author_list_handler`` constructor argument, that value takes
1466
:param rev: The revision for which to generate the list of authors.
1467
:param who: Name of the default handler.
1468
:param short: Whether to shorten names to either name or address.
1469
:param sep: What separator to use for automatic concatenation.
1471
if self._author_list_handler is not None:
1472
# The user did specify --authors, which overrides the default
1473
author_list_handler = self._author_list_handler
1475
# The user didn't specify --authors, so we use the caller's default
1476
author_list_handler = author_list_registry.get(who)
1477
names = author_list_handler(rev)
1479
for i in range(len(names)):
1480
name, address = config.parse_username(names[i])
1486
names = sep.join(names)
1420
1489
def merge_marker(self, revision):
1421
1490
"""Get the merge marker to include in the output or '' if none."""
1513
1588
lines = [_LONG_SEP]
1514
1589
if revision.revno is not None:
1515
1590
lines.append('revno: %s%s' % (revision.revno,
1516
self.merge_marker(revision)))
1591
self.merge_marker(revision)))
1517
1592
if revision.tags:
1518
lines.append('tags: %s' % (', '.join(revision.tags)))
1593
lines.append('tags: %s' % (', '.join(sorted(revision.tags))))
1594
if self.show_ids or revision.revno is None:
1595
lines.append('revision-id: %s' %
1596
(revision.rev.revision_id.decode('utf-8'),))
1519
1597
if self.show_ids:
1520
lines.append('revision-id: %s' % (revision.rev.revision_id,))
1521
1598
for parent_id in revision.rev.parent_ids:
1522
lines.append('parent: %s' % (parent_id,))
1599
lines.append('parent: %s' % (parent_id.decode('utf-8'),))
1523
1600
lines.extend(self.custom_properties(revision.rev))
1525
1602
committer = revision.rev.committer
1526
authors = revision.rev.get_apparent_authors()
1603
authors = self.authors(revision.rev, 'all')
1527
1604
if authors != [committer]:
1528
1605
lines.append('author: %s' % (", ".join(authors),))
1529
1606
lines.append('committer: %s' % (committer,))
1547
1627
to_file.write("%s%s\n" % (indent, ('\n' + indent).join(lines)))
1548
1628
if revision.delta is not None:
1549
1629
# Use the standard status output to display changes
1550
from bzrlib.delta import report_delta
1551
report_delta(to_file, revision.delta, short_status=False,
1630
from breezy.delta import report_delta
1631
report_delta(to_file, revision.delta, short_status=False,
1552
1632
show_ids=self.show_ids, indent=indent)
1553
1633
if revision.diff is not None:
1554
1634
to_file.write(indent + 'diff:\n')
1598
1678
to_file = self.to_file
1600
1680
if revision.tags:
1601
tags = ' {%s}' % (', '.join(revision.tags))
1681
tags = ' {%s}' % (', '.join(sorted(revision.tags)))
1602
1682
to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
1603
revision.revno, self.short_author(revision.rev),
1604
format_date(revision.rev.timestamp,
1605
revision.rev.timezone or 0,
1606
self.show_timezone, date_fmt="%Y-%m-%d",
1608
tags, self.merge_marker(revision)))
1609
self.show_properties(revision.rev, indent+offset)
1683
revision.revno or "", self.short_author(
1685
format_date(revision.rev.timestamp,
1686
revision.rev.timezone or 0,
1687
self.show_timezone, date_fmt="%Y-%m-%d",
1689
tags, self.merge_marker(revision)))
1690
self.show_properties(revision.rev, indent + offset)
1691
if self.show_ids or revision.revno is None:
1611
1692
to_file.write(indent + offset + 'revision-id:%s\n'
1612
% (revision.rev.revision_id,))
1693
% (revision.rev.revision_id.decode('utf-8'),))
1613
1694
if not revision.rev.message:
1614
1695
to_file.write(indent + offset + '(no message)\n')
1620
1701
if revision.delta is not None:
1621
1702
# Use the standard status output to display changes
1622
from bzrlib.delta import report_delta
1623
report_delta(to_file, revision.delta,
1624
short_status=self.delta_format==1,
1703
from breezy.delta import report_delta
1704
report_delta(to_file, revision.delta,
1705
short_status=self.delta_format == 1,
1625
1706
show_ids=self.show_ids, indent=indent + offset)
1626
1707
if revision.diff is not None:
1627
1708
self.show_diff(self.to_exact_file, revision.diff, ' ')
1661
1742
def log_revision(self, revision):
1662
1743
indent = ' ' * revision.merge_depth
1663
1744
self.to_file.write(self.log_string(revision.revno, revision.rev,
1664
self._max_chars, revision.tags, indent))
1745
self._max_chars, revision.tags, indent))
1665
1746
self.to_file.write('\n')
1667
1748
def log_string(self, revno, rev, max_chars, tags=None, prefix=''):
1668
1749
"""Format log info into one string. Truncate tail of string
1669
:param revno: revision number or None.
1670
Revision numbers counts from 1.
1671
:param rev: revision object
1672
:param max_chars: maximum length of resulting string
1673
:param tags: list of tags or None
1674
:param prefix: string to prefix each line
1675
:return: formatted truncated string
1751
:param revno: revision number or None.
1752
Revision numbers counts from 1.
1753
:param rev: revision object
1754
:param max_chars: maximum length of resulting string
1755
:param tags: list of tags or None
1756
:param prefix: string to prefix each line
1757
:return: formatted truncated string
1679
1761
# show revno only when is not None
1680
1762
out.append("%s:" % revno)
1681
out.append(self.truncate(self.short_author(rev), 20))
1763
if max_chars is not None:
1764
out.append(self.truncate(
1765
self.short_author(rev), (max_chars + 3) // 4))
1767
out.append(self.short_author(rev))
1682
1768
out.append(self.date_string(rev))
1683
1769
if len(rev.parent_ids) > 1:
1684
1770
out.append('[merge]')
1686
tag_str = '{%s}' % (', '.join(tags))
1772
tag_str = '{%s}' % (', '.join(sorted(tags)))
1687
1773
out.append(tag_str)
1688
1774
out.append(rev.get_summary())
1689
1775
return self.truncate(prefix + " ".join(out).rstrip('\n'), max_chars)
1703
1789
self.show_timezone,
1704
1790
date_fmt='%Y-%m-%d',
1705
1791
show_offset=False)
1706
committer_str = revision.rev.get_apparent_authors()[0].replace (' <', ' <')
1707
to_file.write('%s %s\n\n' % (date_str,committer_str))
1792
committer_str = self.authors(revision.rev, 'first', sep=', ')
1793
committer_str = committer_str.replace(' <', ' <')
1794
to_file.write('%s %s\n\n' % (date_str, committer_str))
1709
1796
if revision.delta is not None and revision.delta.has_changed():
1710
1797
for c in revision.delta.added + revision.delta.removed + revision.delta.modified:
1798
if c.path[0] is None:
1712
1802
to_file.write('\t* %s:\n' % (path,))
1713
for c in revision.delta.renamed:
1714
oldpath,newpath = c[:2]
1803
for c in revision.delta.renamed + revision.delta.copied:
1715
1804
# For renamed files, show both the old and the new path
1716
to_file.write('\t* %s:\n\t* %s:\n' % (oldpath,newpath))
1805
to_file.write('\t* %s:\n\t* %s:\n' % (c.path[0], c.path[1]))
1717
1806
to_file.write('\n')
1719
1808
if not revision.rev.message:
1742
1831
return self.get(name)(*args, **kwargs)
1744
1833
def get_default(self, branch):
1745
return self.get(branch.get_config().log_format())
1834
c = branch.get_config_stack()
1835
return self.get(c.get('log_format'))
1748
1838
log_formatter_registry = LogFormatterRegistry()
1751
1841
log_formatter_registry.register('short', ShortLogFormatter,
1752
'Moderately short log format')
1842
'Moderately short log format.')
1753
1843
log_formatter_registry.register('long', LongLogFormatter,
1754
'Detailed log format')
1844
'Detailed log format.')
1755
1845
log_formatter_registry.register('line', LineLogFormatter,
1756
'Log format with one line per revision')
1846
'Log format with one line per revision.')
1757
1847
log_formatter_registry.register('gnu-changelog', GnuChangelogLogFormatter,
1758
'Format used by GNU ChangeLog files')
1848
'Format used by GNU ChangeLog files.')
1761
1851
def register_formatter(name, formatter):
1772
1862
return log_formatter_registry.make_formatter(name, *args, **kwargs)
1773
1863
except KeyError:
1774
raise errors.BzrCommandError("unknown log formatter: %r" % name)
1777
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1778
# deprecated; for compatibility
1779
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
1780
lf.show(revno, rev, delta)
1864
raise errors.BzrCommandError(
1865
gettext("unknown log formatter: %r") % name)
1868
def author_list_all(rev):
1869
return rev.get_apparent_authors()[:]
1872
def author_list_first(rev):
1873
lst = rev.get_apparent_authors()
1880
def author_list_committer(rev):
1881
return [rev.committer]
1884
author_list_registry = registry.Registry()
1886
author_list_registry.register('all', author_list_all,
1889
author_list_registry.register('first', author_list_first,
1892
author_list_registry.register('committer', author_list_committer,
1783
1896
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
1800
1913
# This is the first index which is different between
1802
1915
base_idx = None
1803
for i in xrange(max(len(new_rh),
1916
for i in range(max(len(new_rh), len(old_rh))):
1805
1917
if (len(new_rh) <= i
1806
1918
or len(old_rh) <= i
1807
or new_rh[i] != old_rh[i]):
1919
or new_rh[i] != old_rh[i]):
1811
1923
if base_idx is None:
1812
1924
to_file.write('Nothing seems to have changed\n')
1814
## TODO: It might be nice to do something like show_log
1815
## and show the merged entries. But since this is the
1816
## removed revisions, it shouldn't be as important
1926
# TODO: It might be nice to do something like show_log
1927
# and show the merged entries. But since this is the
1928
# removed revisions, it shouldn't be as important
1817
1929
if base_idx < len(old_rh):
1818
to_file.write('*'*60)
1930
to_file.write('*' * 60)
1819
1931
to_file.write('\nRemoved Revisions:\n')
1820
1932
for i in range(base_idx, len(old_rh)):
1821
1933
rev = branch.repository.get_revision(old_rh[i])
1822
lr = LogRevision(rev, i+1, 0, None)
1934
lr = LogRevision(rev, i + 1, 0, None)
1823
1935
lf.log_revision(lr)
1824
to_file.write('*'*60)
1936
to_file.write('*' * 60)
1825
1937
to_file.write('\n\n')
1826
1938
if base_idx < len(new_rh):
1827
1939
to_file.write('Added Revisions:\n')
1828
1940
show_log(branch,
1832
1943
direction='forward',
1833
start_revision=base_idx+1,
1944
start_revision=base_idx + 1,
1834
1945
end_revision=len(new_rh),
1903
2015
log_format = log_formatter_registry.get_default(branch)
1904
2016
lf = log_format(show_ids=False, to_file=output, show_timezone='original')
1905
2017
if old_history != []:
1906
output.write('*'*60)
2018
output.write('*' * 60)
1907
2019
output.write('\nRemoved Revisions:\n')
1908
2020
show_flat_log(branch.repository, old_history, old_revno, lf)
1909
output.write('*'*60)
2021
output.write('*' * 60)
1910
2022
output.write('\n\n')
1911
2023
if new_history != []:
1912
2024
output.write('Added Revisions:\n')
1913
2025
start_revno = new_revno - len(new_history) + 1
1914
show_log(branch, lf, None, verbose=False, direction='forward',
1915
start_revision=start_revno,)
2026
show_log(branch, lf, verbose=False, direction='forward',
2027
start_revision=start_revno)
1918
2030
def show_flat_log(repository, history, last_revno, lf):
1923
2035
:param last_revno: The revno of the last revision_id in the history.
1924
2036
:param lf: The log formatter to use.
1926
start_revno = last_revno - len(history) + 1
1927
2038
revisions = repository.get_revisions(history)
1928
2039
for i, rev in enumerate(revisions):
1929
2040
lr = LogRevision(rev, i + last_revno, 0, None)
1930
2041
lf.log_revision(lr)
1933
def _get_info_for_log_files(revisionspec_list, file_list, add_cleanup):
2044
def _get_info_for_log_files(revisionspec_list, file_list, exit_stack):
1934
2045
"""Find file-ids and kinds given a list of files and a revision range.
1936
2047
We search for files at the end of the range. If not found there,
1940
2051
:param file_list: the list of paths given on the command line;
1941
2052
the first of these can be a branch location or a file path,
1942
2053
the remainder must be file paths
1943
:param add_cleanup: When the branch returned is read locked,
1944
an unlock call will be queued to the cleanup.
2054
:param exit_stack: When the branch returned is read locked,
2055
an unlock call will be queued to the exit stack.
1945
2056
:return: (branch, info_list, start_rev_info, end_rev_info) where
1946
2057
info_list is a list of (relative_path, file_id, kind) tuples where
1947
2058
kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
1948
2059
branch will be read-locked.
1950
from builtins import _get_revision_range, safe_relpath_files
1951
tree, b, path = bzrdir.BzrDir.open_containing_tree_or_branch(file_list[0])
1952
add_cleanup(b.lock_read().unlock)
2061
from breezy.builtins import _get_revision_range
2062
tree, b, path = controldir.ControlDir.open_containing_tree_or_branch(
2064
exit_stack.enter_context(b.lock_read())
1953
2065
# XXX: It's damn messy converting a list of paths to relative paths when
1954
2066
# those paths might be deleted ones, they might be on a case-insensitive
1955
2067
# filesystem and/or they might be in silly locations (like another branch).
1959
2071
# case of running log in a nested directory, assuming paths beyond the
1960
2072
# first one haven't been deleted ...
1962
relpaths = [path] + safe_relpath_files(tree, file_list[1:])
2074
relpaths = [path] + tree.safe_relpath_files(file_list[1:])
1964
2076
relpaths = [path] + file_list[1:]
1966
2078
start_rev_info, end_rev_info = _get_revision_range(revisionspec_list, b,
1968
2080
if relpaths in ([], [u'']):
1969
2081
return b, [], start_rev_info, end_rev_info
1970
2082
if start_rev_info is None and end_rev_info is None:
2020
2132
tree1 = b.repository.revision_tree(rev_id)
2021
2133
file_id = tree1.path2id(fp)
2022
kind = _get_kind_for_file_id(tree1, file_id)
2134
kind = _get_kind_for_file_id(tree1, fp, file_id)
2023
2135
info_list.append((fp, file_id, kind))
2024
2136
return b, info_list, start_rev_info, end_rev_info
2027
def _get_kind_for_file_id(tree, file_id):
2139
def _get_kind_for_file_id(tree, path, file_id):
2028
2140
"""Return the kind of a file-id or None if it doesn't exist."""
2029
2141
if file_id is not None:
2030
return tree.kind(file_id)
2142
return tree.kind(path)
2035
2147
properties_handler_registry = registry.Registry()
2037
2149
# Use the properties handlers to print out bug information if available
2038
2152
def _bugs_properties_handler(revision):
2039
if revision.properties.has_key('bugs'):
2040
bug_lines = revision.properties['bugs'].split('\n')
2041
bug_rows = [line.split(' ', 1) for line in bug_lines]
2042
fixed_bug_urls = [row[0] for row in bug_rows if
2043
len(row) > 1 and row[1] == 'fixed']
2154
related_bug_urls = []
2155
for bug_url, status in revision.iter_bugs():
2156
if status == 'fixed':
2157
fixed_bug_urls.append(bug_url)
2158
elif status == 'related':
2159
related_bug_urls.append(bug_url)
2162
text = ngettext('fixes bug', 'fixes bugs', len(fixed_bug_urls))
2163
ret[text] = ' '.join(fixed_bug_urls)
2164
if related_bug_urls:
2165
text = ngettext('related bug', 'related bugs',
2166
len(related_bug_urls))
2167
ret[text] = ' '.join(related_bug_urls)
2046
return {'fixes bug(s)': ' '.join(fixed_bug_urls)}
2049
2171
properties_handler_registry.register('bugs_properties_handler',
2050
2172
_bugs_properties_handler)
added
removed
breezy/log.py
