163
194
if start_revision is None:
164
195
start_revision = 1
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
197
branch.check_real_revno(start_revision)
168
199
if end_revision is None:
169
200
end_revision = len(which_revs)
170
elif end_revision < 1 or end_revision >= len(which_revs):
171
raise InvalidRevisionNumber(end_revision)
202
branch.check_real_revno(end_revision)
173
204
# list indexes are 0-based; revisions are 1-based
174
205
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]),
176
220
if direction == 'reverse':
177
221
cut_revs.reverse()
178
222
elif direction == 'forward':
223
# forward means oldest first.
224
merge_sorted_revisions.reverse()
181
226
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)
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)
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)
198
240
if not searchRE.search(rev.message):
201
lf.show(revno, rev, delta)
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
256
lf.show(rev_nos[rev_id], rev, delta)
257
elif hasattr(lf, 'show_merge'):
258
lf.show_merge(rev, merge_depth)
205
261
def deltas_for_log_dummy(branch, which_revs):
295
351
def show(self, revno, rev, delta):
296
352
raise NotImplementedError('not implemented in abstract base')
354
def short_committer(self, rev):
355
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
303
358
class LongLogFormatter(LogFormatter):
304
359
def show(self, revno, rev, delta):
305
from osutils import format_date
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
307
368
to_file = self.to_file
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
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
311
376
if self.show_ids:
312
print >>to_file, 'revision-id:', rev.revision_id
313
print >>to_file, 'committer:', rev.committer
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']
315
385
date_str = format_date(rev.timestamp,
316
386
rev.timezone or 0,
317
387
self.show_timezone)
318
print >>to_file, 'timestamp: %s' % date_str
388
print >>to_file, indent+'timestamp: %s' % date_str
320
print >>to_file, 'message:'
390
print >>to_file, indent+'message:'
321
391
if not rev.message:
322
print >>to_file, ' (no message)'
392
print >>to_file, indent+' (no message)'
324
for l in rev.message.split('\n'):
325
print >>to_file, ' ' + l
394
message = rev.message.rstrip('\r\n')
395
for l in message.split('\n'):
396
print >>to_file, indent+' ' + l
327
397
if delta != None:
328
398
delta.show(to_file, self.show_ids)
332
401
class ShortLogFormatter(LogFormatter):
333
402
def show(self, revno, rev, delta):
334
403
from bzrlib.osutils import format_date
336
405
to_file = self.to_file
338
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
406
date_str = format_date(rev.timestamp, rev.timezone or 0,
408
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
339
409
format_date(rev.timestamp, rev.timezone or 0,
410
self.show_timezone, date_fmt="%Y-%m-%d",
341
412
if self.show_ids:
342
413
print >>to_file, ' revision-id:', rev.revision_id
343
414
if not rev.message:
344
415
print >>to_file, ' (no message)'
346
for l in rev.message.split('\n'):
417
message = rev.message.rstrip('\r\n')
418
for l in message.split('\n'):
347
419
print >>to_file, ' ' + l
349
421
# TODO: Why not show the modified files in a shorter form as
350
422
# well? rewrap them single lines of appropriate length
351
423
if delta != None:
352
424
delta.show(to_file, self.show_ids)
357
FORMATTERS = {'long': LongLogFormatter,
427
class LineLogFormatter(LogFormatter):
428
def truncate(self, str, max_len):
429
if len(str) <= max_len:
431
return str[:max_len-3]+'...'
433
def date_string(self, rev):
434
from bzrlib.osutils import format_date
435
return format_date(rev.timestamp, rev.timezone or 0,
436
self.show_timezone, date_fmt="%Y-%m-%d",
439
def message(self, rev):
441
return '(no message)'
445
def show(self, revno, rev, delta):
446
print >> self.to_file, self.log_string(rev, 79)
448
def log_string(self, rev, max_chars):
449
out = [self.truncate(self.short_committer(rev), 20)]
450
out.append(self.date_string(rev))
451
out.append(self.message(rev).replace('\n', ' '))
452
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
454
def line_log(rev, max_chars):
455
lf = LineLogFormatter(None)
456
return lf.log_string(rev, max_chars)
459
'long': LongLogFormatter,
358
460
'short': ShortLogFormatter,
461
'line': LineLogFormatter,
464
def register_formatter(name, formatter):
465
FORMATTERS[name] = formatter
362
467
def log_formatter(name, *args, **kwargs):
468
"""Construct a formatter from arguments.
470
name -- Name of the formatter to construct; currently 'long', 'short' and
471
'line' are supported.
363
473
from bzrlib.errors import BzrCommandError
366
475
return FORMATTERS[name](*args, **kwargs)
368
477
raise BzrCommandError("unknown log formatter: %r" % name)
370
479
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
480
# deprecated; for compatability
372
481
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
482
lf.show(revno, rev, delta)
484
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
485
"""Show the change in revision history comparing the old revision history to the new one.
487
:param branch: The branch where the revisions exist
488
:param old_rh: The old revision history
489
:param new_rh: The new revision history
490
:param to_file: A file to write the results to. If None, stdout will be used
496
to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
497
lf = log_formatter(log_format,
500
show_timezone='original')
502
# This is the first index which is different between
505
for i in xrange(max(len(new_rh),
509
or new_rh[i] != old_rh[i]):
514
to_file.write('Nothing seems to have changed\n')
516
## TODO: It might be nice to do something like show_log
517
## and show the merged entries. But since this is the
518
## removed revisions, it shouldn't be as important
519
if base_idx < len(old_rh):
520
to_file.write('*'*60)
521
to_file.write('\nRemoved Revisions:\n')
522
for i in range(base_idx, len(old_rh)):
523
rev = branch.repository.get_revision(old_rh[i])
524
lf.show(i+1, rev, None)
525
to_file.write('*'*60)
526
to_file.write('\n\n')
527
if base_idx < len(new_rh):
528
to_file.write('Added Revisions:\n')
534
start_revision=base_idx+1,
535
end_revision=len(new_rh),
added
removed
bzrlib/log.py
