163
197
if start_revision is None:
164
198
start_revision = 1
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
200
branch.check_real_revno(start_revision)
168
202
if end_revision is None:
169
203
end_revision = len(which_revs)
170
elif end_revision < 1 or end_revision >= len(which_revs):
171
raise InvalidRevisionNumber(end_revision)
205
branch.check_real_revno(end_revision)
173
207
# list indexes are 0-based; revisions are 1-based
174
208
cut_revs = which_revs[(start_revision-1):(end_revision)]
211
# override the mainline to look like the revision history.
212
mainline_revs = [revision_id for index, revision_id in cut_revs]
213
if cut_revs[0][0] == 1:
214
mainline_revs.insert(0, None)
216
mainline_revs.insert(0, which_revs[start_revision-2][1])
218
merge_sorted_revisions = merge_sort(
219
branch.repository.get_revision_graph(mainline_revs[-1]),
176
223
if direction == 'reverse':
177
224
cut_revs.reverse()
178
225
elif direction == 'forward':
226
# forward means oldest first.
227
merge_sorted_revisions.reverse()
181
229
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)
231
revision_history = branch.revision_history()
233
# convert the revision history to a dictionary:
235
for index, rev_id in cut_revs:
236
rev_nos[rev_id] = index
238
# now we just print all the revisions
239
for sequence, rev_id, merge_depth, end_of_merge in merge_sorted_revisions:
240
rev = branch.repository.get_revision(rev_id)
198
243
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.
247
# a mainline revision.
248
if verbose or specific_fileid:
249
delta = _get_revision_delta(branch, rev_nos[rev_id])
252
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
256
# although we calculated it, throw it away without display
259
lf.show(rev_nos[rev_id], rev, delta)
260
elif hasattr(lf, 'show_merge'):
261
lf.show_merge(rev, merge_depth)
287
264
class LogFormatter(object):
288
265
"""Abstract class to display log messages."""
289
267
def __init__(self, to_file, show_ids=False, show_timezone='original'):
290
268
self.to_file = to_file
291
269
self.show_ids = show_ids
292
270
self.show_timezone = show_timezone
295
272
def show(self, revno, rev, delta):
296
273
raise NotImplementedError('not implemented in abstract base')
275
def short_committer(self, rev):
276
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
303
279
class LongLogFormatter(LogFormatter):
304
280
def show(self, revno, rev, delta):
305
from osutils import format_date
281
return self._show_helper(revno=revno, rev=rev, delta=delta)
283
def show_merge(self, rev, merge_depth):
284
return self._show_helper(rev=rev, indent=' '*merge_depth, merged=True, delta=None)
286
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
287
"""Show a revision, either merged or not."""
288
from bzrlib.osutils import format_date
307
289
to_file = self.to_file
309
print >>to_file, '-' * 60
310
print >>to_file, 'revno:', revno
290
print >>to_file, indent+'-' * 60
291
if revno is not None:
292
print >>to_file, 'revno:', revno
294
print >>to_file, indent+'merged:', rev.revision_id
296
print >>to_file, indent+'revision-id:', rev.revision_id
311
297
if self.show_ids:
312
print >>to_file, 'revision-id:', rev.revision_id
313
print >>to_file, 'committer:', rev.committer
298
for parent_id in rev.parent_ids:
299
print >>to_file, indent+'parent:', parent_id
300
print >>to_file, indent+'committer:', rev.committer
302
print >>to_file, indent+'branch nick: %s' % \
303
rev.properties['branch-nick']
315
306
date_str = format_date(rev.timestamp,
316
307
rev.timezone or 0,
317
308
self.show_timezone)
318
print >>to_file, 'timestamp: %s' % date_str
309
print >>to_file, indent+'timestamp: %s' % date_str
320
print >>to_file, 'message:'
311
print >>to_file, indent+'message:'
321
312
if not rev.message:
322
print >>to_file, ' (no message)'
313
print >>to_file, indent+' (no message)'
324
for l in rev.message.split('\n'):
325
print >>to_file, ' ' + l
315
message = rev.message.rstrip('\r\n')
316
for l in message.split('\n'):
317
print >>to_file, indent+' ' + l
327
318
if delta != None:
328
319
delta.show(to_file, self.show_ids)
332
322
class ShortLogFormatter(LogFormatter):
333
323
def show(self, revno, rev, delta):
334
324
from bzrlib.osutils import format_date
336
326
to_file = self.to_file
338
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
327
date_str = format_date(rev.timestamp, rev.timezone or 0,
329
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
339
330
format_date(rev.timestamp, rev.timezone or 0,
331
self.show_timezone, date_fmt="%Y-%m-%d",
341
333
if self.show_ids:
342
334
print >>to_file, ' revision-id:', rev.revision_id
343
335
if not rev.message:
344
336
print >>to_file, ' (no message)'
346
for l in rev.message.split('\n'):
338
message = rev.message.rstrip('\r\n')
339
for l in message.split('\n'):
347
340
print >>to_file, ' ' + l
349
342
# TODO: Why not show the modified files in a shorter form as
350
343
# well? rewrap them single lines of appropriate length
351
344
if delta != None:
352
345
delta.show(to_file, self.show_ids)
357
FORMATTERS = {'long': LongLogFormatter,
349
class LineLogFormatter(LogFormatter):
350
def truncate(self, str, max_len):
351
if len(str) <= max_len:
353
return str[:max_len-3]+'...'
355
def date_string(self, rev):
356
from bzrlib.osutils import format_date
357
return format_date(rev.timestamp, rev.timezone or 0,
358
self.show_timezone, date_fmt="%Y-%m-%d",
361
def message(self, rev):
363
return '(no message)'
367
def show(self, revno, rev, delta):
368
from bzrlib.osutils import terminal_width
369
print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
371
def log_string(self, revno, rev, max_chars):
372
"""Format log info into one string. Truncate tail of string
373
:param revno: revision number (int) or None.
374
Revision numbers counts from 1.
375
:param rev: revision info object
376
:param max_chars: maximum length of resulting string
377
:return: formatted truncated string
381
# show revno only when is not None
382
out.append("%d:" % revno)
383
out.append(self.truncate(self.short_committer(rev), 20))
384
out.append(self.date_string(rev))
385
out.append(rev.get_summary())
386
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
389
def line_log(rev, max_chars):
390
lf = LineLogFormatter(None)
391
return lf.log_string(None, rev, max_chars)
394
'long': LongLogFormatter,
358
395
'short': ShortLogFormatter,
396
'line': LineLogFormatter,
399
def register_formatter(name, formatter):
400
FORMATTERS[name] = formatter
362
402
def log_formatter(name, *args, **kwargs):
403
"""Construct a formatter from arguments.
405
name -- Name of the formatter to construct; currently 'long', 'short' and
406
'line' are supported.
363
408
from bzrlib.errors import BzrCommandError
366
410
return FORMATTERS[name](*args, **kwargs)
368
412
raise BzrCommandError("unknown log formatter: %r" % name)
370
414
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
# deprecated; for compatability
415
# deprecated; for compatibility
372
416
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
417
lf.show(revno, rev, delta)
419
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
420
"""Show the change in revision history comparing the old revision history to the new one.
422
:param branch: The branch where the revisions exist
423
:param old_rh: The old revision history
424
:param new_rh: The new revision history
425
:param to_file: A file to write the results to. If None, stdout will be used
431
to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
432
lf = log_formatter(log_format,
435
show_timezone='original')
437
# This is the first index which is different between
440
for i in xrange(max(len(new_rh),
444
or new_rh[i] != old_rh[i]):
449
to_file.write('Nothing seems to have changed\n')
451
## TODO: It might be nice to do something like show_log
452
## and show the merged entries. But since this is the
453
## removed revisions, it shouldn't be as important
454
if base_idx < len(old_rh):
455
to_file.write('*'*60)
456
to_file.write('\nRemoved Revisions:\n')
457
for i in range(base_idx, len(old_rh)):
458
rev = branch.repository.get_revision(old_rh[i])
459
lf.show(i+1, rev, None)
460
to_file.write('*'*60)
461
to_file.write('\n\n')
462
if base_idx < len(new_rh):
463
to_file.write('Added Revisions:\n')
469
start_revision=base_idx+1,
470
end_revision=len(new_rh),
added
removed
bzrlib/log.py
