344
295
def show(self, revno, rev, delta):
345
296
raise NotImplementedError('not implemented in abstract base')
347
def short_committer(self, rev):
348
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
351
303
class LongLogFormatter(LogFormatter):
352
304
def show(self, revno, rev, delta):
353
return self._show_helper(revno=revno, rev=rev, delta=delta)
355
def show_merge(self, rev):
356
return self._show_helper(rev=rev, indent=' ', merged=True, delta=None)
358
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
359
"""Show a revision, either merged or not."""
360
from bzrlib.osutils import format_date
305
from osutils import format_date
361
307
to_file = self.to_file
362
print >>to_file, indent+'-' * 60
363
if revno is not None:
364
print >>to_file, 'revno:', revno
366
print >>to_file, indent+'merged:', rev.revision_id
368
print >>to_file, indent+'revision-id:', rev.revision_id
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
369
311
if self.show_ids:
370
for parent_id in rev.parent_ids:
371
print >>to_file, indent+'parent:', parent_id
372
print >>to_file, indent+'committer:', rev.committer
374
print >>to_file, indent+'branch nick: %s' % \
375
rev.properties['branch-nick']
312
print >>to_file, 'revision-id:', rev.revision_id
313
print >>to_file, 'committer:', rev.committer
378
315
date_str = format_date(rev.timestamp,
379
316
rev.timezone or 0,
380
317
self.show_timezone)
381
print >>to_file, indent+'timestamp: %s' % date_str
318
print >>to_file, 'timestamp: %s' % date_str
383
print >>to_file, indent+'message:'
320
print >>to_file, 'message:'
384
321
if not rev.message:
385
print >>to_file, indent+' (no message)'
322
print >>to_file, ' (no message)'
387
message = rev.message.rstrip('\r\n')
388
for l in message.split('\n'):
389
print >>to_file, indent+' ' + l
324
for l in rev.message.split('\n'):
325
print >>to_file, ' ' + l
390
327
if delta != None:
391
328
delta.show(to_file, self.show_ids)
394
332
class ShortLogFormatter(LogFormatter):
395
333
def show(self, revno, rev, delta):
396
334
from bzrlib.osutils import format_date
398
336
to_file = self.to_file
399
date_str = format_date(rev.timestamp, rev.timezone or 0,
401
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
338
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
402
339
format_date(rev.timestamp, rev.timezone or 0,
403
self.show_timezone, date_fmt="%Y-%m-%d",
405
341
if self.show_ids:
406
342
print >>to_file, ' revision-id:', rev.revision_id
407
343
if not rev.message:
408
344
print >>to_file, ' (no message)'
410
message = rev.message.rstrip('\r\n')
411
for l in message.split('\n'):
346
for l in rev.message.split('\n'):
412
347
print >>to_file, ' ' + l
414
349
# TODO: Why not show the modified files in a shorter form as
415
350
# well? rewrap them single lines of appropriate length
416
351
if delta != None:
417
352
delta.show(to_file, self.show_ids)
420
class LineLogFormatter(LogFormatter):
421
def truncate(self, str, max_len):
422
if len(str) <= max_len:
424
return str[:max_len-3]+'...'
426
def date_string(self, rev):
427
from bzrlib.osutils import format_date
428
return format_date(rev.timestamp, rev.timezone or 0,
429
self.show_timezone, date_fmt="%Y-%m-%d",
432
def message(self, rev):
434
return '(no message)'
438
def show(self, revno, rev, delta):
439
print >> self.to_file, self.log_string(rev, 79)
441
def log_string(self, rev, max_chars):
442
out = [self.truncate(self.short_committer(rev), 20)]
443
out.append(self.date_string(rev))
444
out.append(self.message(rev).replace('\n', ' '))
445
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
447
def line_log(rev, max_chars):
448
lf = LineLogFormatter(None)
449
return lf.log_string(rev, max_chars)
451
357
FORMATTERS = {'long': LongLogFormatter,
452
358
'short': ShortLogFormatter,
453
'line': LineLogFormatter,
457
362
def log_formatter(name, *args, **kwargs):
458
"""Construct a formatter from arguments.
460
name -- Name of the formatter to construct; currently 'long', 'short' and
461
'line' are supported.
463
363
from bzrlib.errors import BzrCommandError
465
366
return FORMATTERS[name](*args, **kwargs)
466
367
except IndexError:
470
371
# deprecated; for compatability
471
372
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
472
373
lf.show(revno, rev, delta)
474
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
475
"""Show the change in revision history comparing the old revision history to the new one.
477
:param branch: The branch where the revisions exist
478
:param old_rh: The old revision history
479
:param new_rh: The new revision history
480
:param to_file: A file to write the results to. If None, stdout will be used
486
to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
487
lf = log_formatter(log_format,
490
show_timezone='original')
492
# This is the first index which is different between
495
for i in xrange(max(len(new_rh),
499
or new_rh[i] != old_rh[i]):
504
to_file.write('Nothing seems to have changed\n')
506
## TODO: It might be nice to do something like show_log
507
## and show the merged entries. But since this is the
508
## removed revisions, it shouldn't be as important
509
if base_idx < len(old_rh):
510
to_file.write('*'*60)
511
to_file.write('\nRemoved Revisions:\n')
512
for i in range(base_idx, len(old_rh)):
513
rev = branch.get_revision(old_rh[i])
514
lf.show(i+1, rev, None)
515
to_file.write('*'*60)
516
to_file.write('\n\n')
517
if base_idx < len(new_rh):
518
to_file.write('Added Revisions:\n')
524
start_revision=base_idx+1,
525
end_revision=len(new_rh),