163
182
if start_revision is None:
164
183
start_revision = 1
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
185
branch.check_real_revno(start_revision)
168
187
if end_revision is None:
169
188
end_revision = len(which_revs)
170
elif end_revision < 1 or end_revision >= len(which_revs):
171
raise InvalidRevisionNumber(end_revision)
190
branch.check_real_revno(end_revision)
173
192
# list indexes are 0-based; revisions are 1-based
174
193
cut_revs = which_revs[(start_revision-1):(end_revision)]
176
if direction == 'reverse':
178
elif direction == 'forward':
181
raise ValueError('invalid direction %r' % direction)
183
for revno, rev_id in cut_revs:
184
if verbose or specific_fileid:
185
delta = branch.get_revision_delta(revno)
197
# convert the revision history to a dictionary:
198
rev_nos = dict((k, v) for v, k in cut_revs)
200
# override the mainline to look like the revision history.
201
mainline_revs = [revision_id for index, revision_id in cut_revs]
202
if cut_revs[0][0] == 1:
203
mainline_revs.insert(0, None)
205
mainline_revs.insert(0, which_revs[start_revision-2][1])
206
if getattr(lf, 'show_merge', None) is not None:
207
include_merges = True
209
include_merges = False
210
view_revisions = list(get_view_revisions(mainline_revs, rev_nos, branch,
211
direction, include_merges=include_merges))
213
def iter_revisions():
214
# r = revision, n = revno, d = merge depth
215
revision_ids = [r for r, n, d in view_revisions]
216
zeros = set(r for r, n, d in view_revisions if d == 0)
218
repository = branch.repository
221
revisions = repository.get_revisions(revision_ids[:num])
222
if verbose or specific_fileid:
223
delta_revisions = [r for r in revisions if
224
r.revision_id in zeros]
225
deltas = repository.get_deltas_for_revisions(delta_revisions)
226
cur_deltas = dict(izip((r.revision_id for r in
227
delta_revisions), deltas))
228
for revision in revisions:
229
# The delta value will be None unless
230
# 1. verbose or specific_fileid is specified, and
231
# 2. the revision is a mainline revision
232
yield revision, cur_deltas.get(revision.revision_id)
233
revision_ids = revision_ids[num:]
188
if not delta.touches_file_id(specific_fileid):
192
# although we calculated it, throw it away without display
195
rev = branch.get_revision(rev_id)
236
# now we just print all the revisions
237
for ((rev_id, revno, merge_depth), (rev, delta)) in \
238
izip(view_revisions, iter_revisions()):
198
241
if not searchRE.search(rev.message):
201
lf.show(revno, rev, delta)
205
def deltas_for_log_dummy(branch, which_revs):
206
"""Return all the revisions without intermediate deltas.
208
Useful for log commands that won't need the delta information.
245
# a mainline revision.
248
if not delta.touches_file_id(specific_fileid):
211
for revno, revision_id in which_revs:
212
yield revno, branch.get_revision(revision_id), None
215
def deltas_for_log_reverse(branch, which_revs):
216
"""Compute deltas for display in latest-to-earliest order.
222
Sequence of (revno, revision_id) for the subset of history to examine
225
Sequence of (revno, rev, delta)
227
The delta is from the given revision to the next one in the
228
sequence, which makes sense if the log is being displayed from
231
last_revno = last_revision_id = last_tree = None
232
for revno, revision_id in which_revs:
233
this_tree = branch.revision_tree(revision_id)
234
this_revision = branch.get_revision(revision_id)
237
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
239
this_tree = EmptyTree(branch.get_root_id())
242
last_revision = this_revision
243
last_tree = this_tree
247
this_tree = EmptyTree(branch.get_root_id())
249
this_revno = last_revno - 1
250
this_revision_id = branch.revision_history()[this_revno]
251
this_tree = branch.revision_tree(this_revision_id)
252
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
255
def deltas_for_log_forward(branch, which_revs):
256
"""Compute deltas for display in forward log.
258
Given a sequence of (revno, revision_id) pairs, return
261
The delta is from the given revision to the next one in the
262
sequence, which makes sense if the log is being displayed from
265
last_revno = last_revision_id = last_tree = None
266
prev_tree = EmptyTree(branch.get_root_id())
268
for revno, revision_id in which_revs:
269
this_tree = branch.revision_tree(revision_id)
270
this_revision = branch.get_revision(revision_id)
274
last_tree = EmptyTree(branch.get_root_id())
276
last_revno = revno - 1
277
last_revision_id = branch.revision_history()[last_revno]
278
last_tree = branch.revision_tree(last_revision_id)
280
yield revno, this_revision, compare_trees(last_tree, this_tree, False)
283
last_revision = this_revision
284
last_tree = this_tree
252
# although we calculated it, throw it away without display
255
lf.show(revno, rev, delta)
257
lf.show_merge(rev, merge_depth)
260
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
261
include_merges=True):
262
"""Produce an iterator of revisions to show
263
:return: an iterator of (revision_id, revno, merge_depth)
264
(if there is no revno for a revision, None is supplied)
266
if include_merges is False:
267
revision_ids = mainline_revs[1:]
268
if direction == 'reverse':
269
revision_ids.reverse()
270
for revision_id in revision_ids:
271
yield revision_id, rev_nos[revision_id], 0
273
merge_sorted_revisions = merge_sort(
274
branch.repository.get_revision_graph(mainline_revs[-1]),
278
if direction == 'forward':
279
# forward means oldest first.
280
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
281
elif direction != 'reverse':
282
raise ValueError('invalid direction %r' % direction)
284
revision_history = branch.revision_history()
286
for sequence, rev_id, merge_depth, end_of_merge in merge_sorted_revisions:
287
yield rev_id, rev_nos.get(rev_id), merge_depth
290
def reverse_by_depth(merge_sorted_revisions, _depth=0):
291
"""Reverse revisions by depth.
293
Revisions with a different depth are sorted as a group with the previous
294
revision of that depth. There may be no topological justification for this,
295
but it looks much nicer.
298
for val in merge_sorted_revisions:
300
zd_revisions.append([val])
302
assert val[2] > _depth
303
zd_revisions[-1].append(val)
304
for revisions in zd_revisions:
305
if len(revisions) > 1:
306
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
307
zd_revisions.reverse()
309
for chunk in zd_revisions:
287
314
class LogFormatter(object):
288
315
"""Abstract class to display log messages."""
289
317
def __init__(self, to_file, show_ids=False, show_timezone='original'):
290
318
self.to_file = to_file
291
319
self.show_ids = show_ids
292
320
self.show_timezone = show_timezone
295
322
def show(self, revno, rev, delta):
296
323
raise NotImplementedError('not implemented in abstract base')
325
def short_committer(self, rev):
326
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
303
329
class LongLogFormatter(LogFormatter):
304
330
def show(self, revno, rev, delta):
305
from osutils import format_date
331
return self._show_helper(revno=revno, rev=rev, delta=delta)
333
def show_merge(self, rev, merge_depth):
334
return self._show_helper(rev=rev, indent=' '*merge_depth, merged=True, delta=None)
336
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
337
"""Show a revision, either merged or not."""
338
from bzrlib.osutils import format_date
307
339
to_file = self.to_file
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
340
print >>to_file, indent+'-' * 60
341
if revno is not None:
342
print >>to_file, 'revno:', revno
344
print >>to_file, indent+'merged:', rev.revision_id
346
print >>to_file, indent+'revision-id:', rev.revision_id
311
347
if self.show_ids:
312
print >>to_file, 'revision-id:', rev.revision_id
313
print >>to_file, 'committer:', rev.committer
348
for parent_id in rev.parent_ids:
349
print >>to_file, indent+'parent:', parent_id
350
print >>to_file, indent+'committer:', rev.committer
352
print >>to_file, indent+'branch nick: %s' % \
353
rev.properties['branch-nick']
315
356
date_str = format_date(rev.timestamp,
316
357
rev.timezone or 0,
317
358
self.show_timezone)
318
print >>to_file, 'timestamp: %s' % date_str
359
print >>to_file, indent+'timestamp: %s' % date_str
320
print >>to_file, 'message:'
361
print >>to_file, indent+'message:'
321
362
if not rev.message:
322
print >>to_file, ' (no message)'
363
print >>to_file, indent+' (no message)'
324
for l in rev.message.split('\n'):
325
print >>to_file, ' ' + l
365
message = rev.message.rstrip('\r\n')
366
for l in message.split('\n'):
367
print >>to_file, indent+' ' + l
327
368
if delta != None:
328
369
delta.show(to_file, self.show_ids)
332
372
class ShortLogFormatter(LogFormatter):
333
373
def show(self, revno, rev, delta):
334
374
from bzrlib.osutils import format_date
336
376
to_file = self.to_file
338
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
377
date_str = format_date(rev.timestamp, rev.timezone or 0,
379
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
339
380
format_date(rev.timestamp, rev.timezone or 0,
381
self.show_timezone, date_fmt="%Y-%m-%d",
341
383
if self.show_ids:
342
384
print >>to_file, ' revision-id:', rev.revision_id
343
385
if not rev.message:
344
386
print >>to_file, ' (no message)'
346
for l in rev.message.split('\n'):
388
message = rev.message.rstrip('\r\n')
389
for l in message.split('\n'):
347
390
print >>to_file, ' ' + l
349
392
# TODO: Why not show the modified files in a shorter form as
350
393
# well? rewrap them single lines of appropriate length
351
394
if delta != None:
352
395
delta.show(to_file, self.show_ids)
357
FORMATTERS = {'long': LongLogFormatter,
399
class LineLogFormatter(LogFormatter):
400
def truncate(self, str, max_len):
401
if len(str) <= max_len:
403
return str[:max_len-3]+'...'
405
def date_string(self, rev):
406
from bzrlib.osutils import format_date
407
return format_date(rev.timestamp, rev.timezone or 0,
408
self.show_timezone, date_fmt="%Y-%m-%d",
411
def message(self, rev):
413
return '(no message)'
417
def show(self, revno, rev, delta):
418
from bzrlib.osutils import terminal_width
419
print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
421
def log_string(self, revno, rev, max_chars):
422
"""Format log info into one string. Truncate tail of string
423
:param revno: revision number (int) or None.
424
Revision numbers counts from 1.
425
:param rev: revision info object
426
:param max_chars: maximum length of resulting string
427
:return: formatted truncated string
431
# show revno only when is not None
432
out.append("%d:" % revno)
433
out.append(self.truncate(self.short_committer(rev), 20))
434
out.append(self.date_string(rev))
435
out.append(rev.get_summary())
436
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
439
def line_log(rev, max_chars):
440
lf = LineLogFormatter(None)
441
return lf.log_string(None, rev, max_chars)
444
'long': LongLogFormatter,
358
445
'short': ShortLogFormatter,
446
'line': LineLogFormatter,
449
def register_formatter(name, formatter):
450
FORMATTERS[name] = formatter
362
452
def log_formatter(name, *args, **kwargs):
453
"""Construct a formatter from arguments.
455
name -- Name of the formatter to construct; currently 'long', 'short' and
456
'line' are supported.
363
458
from bzrlib.errors import BzrCommandError
366
460
return FORMATTERS[name](*args, **kwargs)
368
462
raise BzrCommandError("unknown log formatter: %r" % name)
370
464
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
# deprecated; for compatability
465
# deprecated; for compatibility
372
466
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
467
lf.show(revno, rev, delta)
469
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
470
"""Show the change in revision history comparing the old revision history to the new one.
472
:param branch: The branch where the revisions exist
473
:param old_rh: The old revision history
474
:param new_rh: The new revision history
475
:param to_file: A file to write the results to. If None, stdout will be used
481
to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
482
lf = log_formatter(log_format,
485
show_timezone='original')
487
# This is the first index which is different between
490
for i in xrange(max(len(new_rh),
494
or new_rh[i] != old_rh[i]):
499
to_file.write('Nothing seems to have changed\n')
501
## TODO: It might be nice to do something like show_log
502
## and show the merged entries. But since this is the
503
## removed revisions, it shouldn't be as important
504
if base_idx < len(old_rh):
505
to_file.write('*'*60)
506
to_file.write('\nRemoved Revisions:\n')
507
for i in range(base_idx, len(old_rh)):
508
rev = branch.repository.get_revision(old_rh[i])
509
lf.show(i+1, rev, None)
510
to_file.write('*'*60)
511
to_file.write('\n\n')
512
if base_idx < len(new_rh):
513
to_file.write('Added Revisions:\n')
519
start_revision=base_idx+1,
520
end_revision=len(new_rh),
added
removed
bzrlib/log.py
