194
163
if start_revision is None:
195
164
start_revision = 1
197
branch.check_real_revno(start_revision)
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
199
168
if end_revision is None:
200
169
end_revision = len(which_revs)
202
branch.check_real_revno(end_revision)
170
elif end_revision < 1 or end_revision >= len(which_revs):
171
raise InvalidRevisionNumber(end_revision)
204
173
# list indexes are 0-based; revisions are 1-based
205
174
cut_revs = which_revs[(start_revision-1):(end_revision)]
208
# override the mainline to look like the revision history.
209
mainline_revs = [revision_id for index, revision_id in cut_revs]
210
if cut_revs[0][0] == 1:
211
mainline_revs.insert(0, None)
213
mainline_revs.insert(0, which_revs[start_revision-2][1])
215
merge_sorted_revisions = merge_sort(
216
branch.repository.get_revision_graph(mainline_revs[-1]),
220
176
if direction == 'reverse':
221
177
cut_revs.reverse()
222
178
elif direction == 'forward':
223
# forward means oldest first.
224
merge_sorted_revisions.reverse()
226
181
raise ValueError('invalid direction %r' % direction)
228
revision_history = branch.revision_history()
230
# convert the revision history to a dictionary:
232
for index, rev_id in cut_revs:
233
rev_nos[rev_id] = index
235
# now we just print all the revisions
236
for sequence, rev_id, merge_depth, end_of_merge in merge_sorted_revisions:
237
rev = branch.repository.get_revision(rev_id)
183
for revno, rev_id in cut_revs:
184
if verbose or specific_fileid:
185
delta = branch.get_revision_delta(revno)
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)
240
198
if not searchRE.search(rev.message):
244
# a mainline revision.
245
if verbose or specific_fileid:
246
delta = _get_revision_delta(branch, rev_nos[rev_id])
249
if not delta.touches_file_id(specific_fileid):
253
# although we calculated it, throw it away without display
201
lf.show(revno, rev, delta)
256
lf.show(rev_nos[rev_id], rev, delta)
257
elif hasattr(lf, 'show_merge'):
258
lf.show_merge(rev, merge_depth)
261
205
def deltas_for_log_dummy(branch, which_revs):
343
287
class LogFormatter(object):
344
288
"""Abstract class to display log messages."""
346
289
def __init__(self, to_file, show_ids=False, show_timezone='original'):
347
290
self.to_file = to_file
348
291
self.show_ids = show_ids
349
292
self.show_timezone = show_timezone
351
295
def show(self, revno, rev, delta):
352
296
raise NotImplementedError('not implemented in abstract base')
354
def short_committer(self, rev):
355
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
358
303
class LongLogFormatter(LogFormatter):
359
304
def show(self, revno, rev, delta):
360
return self._show_helper(revno=revno, rev=rev, delta=delta)
362
def show_merge(self, rev, merge_depth):
363
return self._show_helper(rev=rev, indent=' '*merge_depth, merged=True, delta=None)
365
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
366
"""Show a revision, either merged or not."""
367
from bzrlib.osutils import format_date
305
from osutils import format_date
368
307
to_file = self.to_file
369
print >>to_file, indent+'-' * 60
370
if revno is not None:
371
print >>to_file, 'revno:', revno
373
print >>to_file, indent+'merged:', rev.revision_id
375
print >>to_file, indent+'revision-id:', rev.revision_id
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
376
311
if self.show_ids:
377
for parent_id in rev.parent_ids:
378
print >>to_file, indent+'parent:', parent_id
379
print >>to_file, indent+'committer:', rev.committer
381
print >>to_file, indent+'branch nick: %s' % \
382
rev.properties['branch-nick']
312
print >>to_file, 'revision-id:', rev.revision_id
313
print >>to_file, 'committer:', rev.committer
385
315
date_str = format_date(rev.timestamp,
386
316
rev.timezone or 0,
387
317
self.show_timezone)
388
print >>to_file, indent+'timestamp: %s' % date_str
318
print >>to_file, 'timestamp: %s' % date_str
390
print >>to_file, indent+'message:'
320
print >>to_file, 'message:'
391
321
if not rev.message:
392
print >>to_file, indent+' (no message)'
322
print >>to_file, ' (no message)'
394
message = rev.message.rstrip('\r\n')
395
for l in message.split('\n'):
396
print >>to_file, indent+' ' + l
324
for l in rev.message.split('\n'):
325
print >>to_file, ' ' + l
397
327
if delta != None:
398
328
delta.show(to_file, self.show_ids)
401
332
class ShortLogFormatter(LogFormatter):
402
333
def show(self, revno, rev, delta):
403
334
from bzrlib.osutils import format_date
405
336
to_file = self.to_file
406
date_str = format_date(rev.timestamp, rev.timezone or 0,
408
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
338
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
409
339
format_date(rev.timestamp, rev.timezone or 0,
410
self.show_timezone, date_fmt="%Y-%m-%d",
412
341
if self.show_ids:
413
342
print >>to_file, ' revision-id:', rev.revision_id
414
343
if not rev.message:
415
344
print >>to_file, ' (no message)'
417
message = rev.message.rstrip('\r\n')
418
for l in message.split('\n'):
346
for l in rev.message.split('\n'):
419
347
print >>to_file, ' ' + l
421
349
# TODO: Why not show the modified files in a shorter form as
422
350
# well? rewrap them single lines of appropriate length
423
351
if delta != None:
424
352
delta.show(to_file, self.show_ids)
428
class LineLogFormatter(LogFormatter):
429
def truncate(self, str, max_len):
430
if len(str) <= max_len:
432
return str[:max_len-3]+'...'
434
def date_string(self, rev):
435
from bzrlib.osutils import format_date
436
return format_date(rev.timestamp, rev.timezone or 0,
437
self.show_timezone, date_fmt="%Y-%m-%d",
440
def message(self, rev):
442
return '(no message)'
446
def show(self, revno, rev, delta):
447
from bzrlib.osutils import terminal_width
448
print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
450
def log_string(self, revno, rev, max_chars):
451
"""Format log info into one string. Truncate tail of string
452
:param revno: revision number (int) or None.
453
Revision numbers counts from 1.
454
:param rev: revision info object
455
:param max_chars: maximum length of resulting string
456
:return: formatted truncated string
460
# show revno only when is not None
461
out.append("%d:" % revno)
462
out.append(self.truncate(self.short_committer(rev), 20))
463
out.append(self.date_string(rev))
464
out.append(self.message(rev).replace('\n', ' '))
465
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
468
def line_log(rev, max_chars):
469
lf = LineLogFormatter(None)
470
return lf.log_string(None, rev, max_chars)
473
'long': LongLogFormatter,
357
FORMATTERS = {'long': LongLogFormatter,
474
358
'short': ShortLogFormatter,
475
'line': LineLogFormatter,
478
def register_formatter(name, formatter):
479
FORMATTERS[name] = formatter
481
362
def log_formatter(name, *args, **kwargs):
482
"""Construct a formatter from arguments.
484
name -- Name of the formatter to construct; currently 'long', 'short' and
485
'line' are supported.
487
363
from bzrlib.errors import BzrCommandError
489
366
return FORMATTERS[name](*args, **kwargs)
491
368
raise BzrCommandError("unknown log formatter: %r" % name)
493
370
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
494
371
# deprecated; for compatability
495
372
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
496
373
lf.show(revno, rev, delta)
498
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
499
"""Show the change in revision history comparing the old revision history to the new one.
501
:param branch: The branch where the revisions exist
502
:param old_rh: The old revision history
503
:param new_rh: The new revision history
504
:param to_file: A file to write the results to. If None, stdout will be used
510
to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
511
lf = log_formatter(log_format,
514
show_timezone='original')
516
# This is the first index which is different between
519
for i in xrange(max(len(new_rh),
523
or new_rh[i] != old_rh[i]):
528
to_file.write('Nothing seems to have changed\n')
530
## TODO: It might be nice to do something like show_log
531
## and show the merged entries. But since this is the
532
## removed revisions, it shouldn't be as important
533
if base_idx < len(old_rh):
534
to_file.write('*'*60)
535
to_file.write('\nRemoved Revisions:\n')
536
for i in range(base_idx, len(old_rh)):
537
rev = branch.repository.get_revision(old_rh[i])
538
lf.show(i+1, rev, None)
539
to_file.write('*'*60)
540
to_file.write('\n\n')
541
if base_idx < len(new_rh):
542
to_file.write('Added Revisions:\n')
548
start_revision=base_idx+1,
549
end_revision=len(new_rh),
added
removed
bzrlib/log.py
