220
223
# although we calculated it, throw it away without display
223
rev = branch.get_revision(rev_id)
226
rev = branch.repository.get_revision(rev_id)
226
229
if not searchRE.search(rev.message):
229
232
lf.show(revno, rev, delta)
233
# revno is 1 based, so -2 to get back 1 less.
234
excludes = set(branch.get_ancestry(revision_history[revno - 2]))
235
pending = list(rev.parent_ids)
237
rev_id = pending.pop()
238
if rev_id in excludes:
240
# prevent showing merged revs twice if they multi-path.
243
rev = branch.get_revision(rev_id)
244
except errors.NoSuchRevision:
246
pending.extend(rev.parent_ids)
233
if hasattr(lf, 'show_merge'):
237
# revno is 1 based, so -2 to get back 1 less.
238
repository = branch.repository
239
excludes = repository.get_ancestry(revision_history[revno - 2])
240
excludes = set(excludes)
241
pending = list(rev.parent_ids)
243
rev_id = pending.pop()
244
if rev_id in excludes:
246
# prevent showing merged revs twice if they multi-path.
249
rev = branch.repository.get_revision(rev_id)
250
except errors.NoSuchRevision:
252
pending.extend(rev.parent_ids)
250
256
def deltas_for_log_dummy(branch, which_revs):
340
346
def show(self, revno, rev, delta):
341
347
raise NotImplementedError('not implemented in abstract base')
343
def show_merge(self, rev):
349
def short_committer(self, rev):
350
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
347
353
class LongLogFormatter(LogFormatter):
348
354
def show(self, revno, rev, delta):
349
from osutils import format_date
351
to_file = self.to_file
353
print >>to_file, '-' * 60
354
print >>to_file, 'revno:', revno
356
print >>to_file, 'revision-id:', rev.revision_id
358
for parent_id in rev.parent_ids:
359
print >>to_file, 'parent:', parent_id
361
print >>to_file, 'committer:', rev.committer
363
date_str = format_date(rev.timestamp,
366
print >>to_file, 'timestamp: %s' % date_str
368
print >>to_file, 'message:'
370
print >>to_file, ' (no message)'
372
for l in rev.message.split('\n'):
373
print >>to_file, ' ' + l
376
delta.show(to_file, self.show_ids)
355
return self._show_helper(revno=revno, rev=rev, delta=delta)
378
357
def show_merge(self, rev):
379
from osutils import format_date
358
return self._show_helper(rev=rev, indent=' ', merged=True, delta=None)
360
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
361
"""Show a revision, either merged or not."""
362
from bzrlib.osutils import format_date
381
363
to_file = self.to_file
385
364
print >>to_file, indent+'-' * 60
386
print >>to_file, indent+'merged:', rev.revision_id
365
if revno is not None:
366
print >>to_file, 'revno:', revno
368
print >>to_file, indent+'merged:', rev.revision_id
370
print >>to_file, indent+'revision-id:', rev.revision_id
387
371
if self.show_ids:
388
372
for parent_id in rev.parent_ids:
389
373
print >>to_file, indent+'parent:', parent_id
391
374
print >>to_file, indent+'committer:', rev.committer
376
print >>to_file, indent+'branch nick: %s' % \
377
rev.properties['branch-nick']
393
380
date_str = format_date(rev.timestamp,
394
381
rev.timezone or 0,
395
382
self.show_timezone)
408
398
from bzrlib.osutils import format_date
410
400
to_file = self.to_file
412
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
401
date_str = format_date(rev.timestamp, rev.timezone or 0,
403
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
413
404
format_date(rev.timestamp, rev.timezone or 0,
405
self.show_timezone, date_fmt="%Y-%m-%d",
415
407
if self.show_ids:
416
408
print >>to_file, ' revision-id:', rev.revision_id
417
409
if not rev.message:
418
410
print >>to_file, ' (no message)'
420
for l in rev.message.split('\n'):
412
message = rev.message.rstrip('\r\n')
413
for l in message.split('\n'):
421
414
print >>to_file, ' ' + l
423
416
# TODO: Why not show the modified files in a shorter form as
424
417
# well? rewrap them single lines of appropriate length
425
418
if delta != None:
426
419
delta.show(to_file, self.show_ids)
422
class LineLogFormatter(LogFormatter):
423
def truncate(self, str, max_len):
424
if len(str) <= max_len:
426
return str[:max_len-3]+'...'
428
def date_string(self, rev):
429
from bzrlib.osutils import format_date
430
return format_date(rev.timestamp, rev.timezone or 0,
431
self.show_timezone, date_fmt="%Y-%m-%d",
434
def message(self, rev):
436
return '(no message)'
440
def show(self, revno, rev, delta):
441
print >> self.to_file, self.log_string(rev, 79)
443
def log_string(self, rev, max_chars):
444
out = [self.truncate(self.short_committer(rev), 20)]
445
out.append(self.date_string(rev))
446
out.append(self.message(rev).replace('\n', ' '))
447
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
449
def line_log(rev, max_chars):
450
lf = LineLogFormatter(None)
451
return lf.log_string(rev, max_chars)
431
453
FORMATTERS = {'long': LongLogFormatter,
432
454
'short': ShortLogFormatter,
455
'line': LineLogFormatter,
436
459
def log_formatter(name, *args, **kwargs):
437
460
"""Construct a formatter from arguments.
439
name -- Name of the formatter to construct; currently 'long' and
440
'short' are supported.
462
name -- Name of the formatter to construct; currently 'long', 'short' and
463
'line' are supported.
442
465
from bzrlib.errors import BzrCommandError
449
472
# deprecated; for compatability
450
473
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
451
474
lf.show(revno, rev, delta)
476
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
477
"""Show the change in revision history comparing the old revision history to the new one.
479
:param branch: The branch where the revisions exist
480
:param old_rh: The old revision history
481
:param new_rh: The new revision history
482
:param to_file: A file to write the results to. If None, stdout will be used
488
to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
489
lf = log_formatter(log_format,
492
show_timezone='original')
494
# This is the first index which is different between
497
for i in xrange(max(len(new_rh),
501
or new_rh[i] != old_rh[i]):
506
to_file.write('Nothing seems to have changed\n')
508
## TODO: It might be nice to do something like show_log
509
## and show the merged entries. But since this is the
510
## removed revisions, it shouldn't be as important
511
if base_idx < len(old_rh):
512
to_file.write('*'*60)
513
to_file.write('\nRemoved Revisions:\n')
514
for i in range(base_idx, len(old_rh)):
515
rev = branch.repository.get_revision(old_rh[i])
516
lf.show(i+1, rev, None)
517
to_file.write('*'*60)
518
to_file.write('\n\n')
519
if base_idx < len(new_rh):
520
to_file.write('Added Revisions:\n')
526
start_revision=base_idx+1,
527
end_revision=len(new_rh),