181
122
warn("not a LogFormatter instance: %r" % lf)
183
124
if specific_fileid:
184
mutter('get log for file_id %r', specific_fileid)
186
if search is not None:
188
searchRE = re.compile(search, re.IGNORECASE)
192
which_revs = _enumerate_history(branch)
194
if start_revision is None:
197
branch.check_real_revno(start_revision)
199
if end_revision is None:
200
end_revision = len(which_revs)
202
branch.check_real_revno(end_revision)
204
# list indexes are 0-based; revisions are 1-based
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]),
220
if direction == 'reverse':
222
elif direction == 'forward':
223
# forward means oldest first.
224
merge_sorted_revisions.reverse()
226
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)
240
if not searchRE.search(rev.message):
125
mutter('get log for file_id %r' % specific_fileid)
127
which_revs = branch.enum_history(direction)
128
which_revs = [x for x in which_revs if (
129
(start_revision is None or x[0] >= start_revision)
130
and (end_revision is None or x[0] <= end_revision))]
132
if not (verbose or specific_fileid):
133
# no need to know what changed between revisions
134
with_deltas = deltas_for_log_dummy(branch, which_revs)
135
elif direction == 'reverse':
136
with_deltas = deltas_for_log_reverse(branch, which_revs)
138
with_deltas = deltas_for_log_forward(branch, which_revs)
140
for revno, rev, delta in with_deltas:
142
if not delta.touches_file_id(specific_fileid):
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)
146
# although we calculated it, throw it away without display
149
lf.show(revno, rev, delta)
261
153
def deltas_for_log_dummy(branch, which_revs):
262
"""Return all the revisions without intermediate deltas.
264
Useful for log commands that won't need the delta information.
267
154
for revno, revision_id in which_revs:
268
155
yield revno, branch.get_revision(revision_id), None
271
158
def deltas_for_log_reverse(branch, which_revs):
272
"""Compute deltas for display in latest-to-earliest order.
278
Sequence of (revno, revision_id) for the subset of history to examine
281
Sequence of (revno, rev, delta)
159
"""Compute deltas for display in reverse log.
161
Given a sequence of (revno, revision_id) pairs, return
283
164
The delta is from the given revision to the next one in the
284
165
sequence, which makes sense if the log is being displayed from
285
166
newest to oldest.
168
from tree import EmptyTree
169
from diff import compare_trees
287
171
last_revno = last_revision_id = last_tree = None
288
172
for revno, revision_id in which_revs:
289
173
this_tree = branch.revision_tree(revision_id)
343
226
class LogFormatter(object):
344
227
"""Abstract class to display log messages."""
345
def __init__(self, to_file, show_ids=False, show_timezone='original'):
228
def __init__(self, to_file, show_ids=False, show_timezone=False):
346
229
self.to_file = to_file
347
230
self.show_ids = show_ids
348
231
self.show_timezone = show_timezone
351
def show(self, revno, rev, delta):
352
raise NotImplementedError('not implemented in abstract base')
354
def short_committer(self, rev):
355
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
358
238
class LongLogFormatter(LogFormatter):
359
239
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
240
from osutils import format_date
368
242
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
244
print >>to_file, '-' * 60
245
print >>to_file, 'revno:', revno
376
246
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']
385
date_str = format_date(rev.timestamp,
388
print >>to_file, indent+'timestamp: %s' % date_str
247
print >>to_file, 'revision-id:', rev.revision_id
248
print >>to_file, 'committer:', rev.committer
249
print >>to_file, 'timestamp: %s' % (format_date(rev.timestamp, rev.timezone or 0,
390
print >>to_file, indent+'message:'
252
print >>to_file, 'message:'
391
253
if not rev.message:
392
print >>to_file, indent+' (no message)'
254
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
256
for l in rev.message.split('\n'):
257
print >>to_file, ' ' + l
397
259
if delta != None:
398
260
delta.show(to_file, self.show_ids)
401
264
class ShortLogFormatter(LogFormatter):
402
265
def show(self, revno, rev, delta):
403
266
from bzrlib.osutils import format_date
405
268
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),
270
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
409
271
format_date(rev.timestamp, rev.timezone or 0,
410
self.show_timezone, date_fmt="%Y-%m-%d",
412
273
if self.show_ids:
413
274
print >>to_file, ' revision-id:', rev.revision_id
414
275
if not rev.message:
415
276
print >>to_file, ' (no message)'
417
message = rev.message.rstrip('\r\n')
418
for l in message.split('\n'):
278
for l in rev.message.split('\n'):
419
279
print >>to_file, ' ' + l
421
# TODO: Why not show the modified files in a shorter form as
422
# well? rewrap them single lines of appropriate length
423
281
if delta != None:
424
282
delta.show(to_file, self.show_ids)
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,
287
FORMATTERS = {'long': LongLogFormatter,
460
288
'short': ShortLogFormatter,
461
'line': LineLogFormatter,
464
def register_formatter(name, formatter):
465
FORMATTERS[name] = formatter
467
292
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.
473
293
from bzrlib.errors import BzrCommandError
475
296
return FORMATTERS[name](*args, **kwargs)
477
298
raise BzrCommandError("unknown log formatter: %r" % name)
479
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
480
# deprecated; for compatability
481
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
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
