182
122
warn("not a LogFormatter instance: %r" % lf)
184
124
if specific_fileid:
185
mutter('get log for file_id %r', specific_fileid)
187
if search is not None:
189
searchRE = re.compile(search, re.IGNORECASE)
193
which_revs = _enumerate_history(branch)
195
if start_revision is None:
198
branch.check_real_revno(start_revision)
200
if end_revision is None:
201
end_revision = len(which_revs)
203
branch.check_real_revno(end_revision)
205
# list indexes are 0-based; revisions are 1-based
206
cut_revs = which_revs[(start_revision-1):(end_revision)]
209
# override the mainline to look like the revision history.
210
mainline_revs = [revision_id for index, revision_id in cut_revs]
211
if cut_revs[0][0] == 1:
212
mainline_revs.insert(0, None)
214
mainline_revs.insert(0, which_revs[start_revision-2][1])
216
merge_sorted_revisions = merge_sort(
217
branch.repository.get_revision_graph(mainline_revs[-1]),
221
if direction == 'reverse':
223
elif direction == 'forward':
224
# forward means oldest first.
225
merge_sorted_revisions.reverse()
227
raise ValueError('invalid direction %r' % direction)
229
revision_history = branch.revision_history()
231
# convert the revision history to a dictionary:
233
for index, rev_id in cut_revs:
234
rev_nos[rev_id] = index
236
def iter_revisions():
237
revision_ids = [r for s, r, m, e in merge_sorted_revisions]
240
revisions = branch.repository.get_revisions(revision_ids[:num])
241
for revision in revisions:
243
revision_ids = revision_ids[num:]
246
revisions = branch.repository.get_revisions()
247
for revision in revisions:
249
# now we just print all the revisions
250
for ((sequence, rev_id, merge_depth, end_of_merge), rev) in \
251
izip(merge_sorted_revisions, iter_revisions()):
254
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):
258
# a mainline revision.
259
if verbose or specific_fileid:
260
delta = _get_revision_delta(branch, rev_nos[rev_id])
263
if not delta.touches_file_id(specific_fileid):
146
# although we calculated it, throw it away without display
149
lf.show(revno, rev, delta)
153
def deltas_for_log_dummy(branch, which_revs):
154
for revno, revision_id in which_revs:
155
yield revno, branch.get_revision(revision_id), None
158
def deltas_for_log_reverse(branch, which_revs):
159
"""Compute deltas for display in reverse log.
161
Given a sequence of (revno, revision_id) pairs, return
164
The delta is from the given revision to the next one in the
165
sequence, which makes sense if the log is being displayed from
168
from tree import EmptyTree
169
from diff import compare_trees
267
# although we calculated it, throw it away without display
270
lf.show(rev_nos[rev_id], rev, delta)
271
elif hasattr(lf, 'show_merge'):
272
lf.show_merge(rev, merge_depth)
171
last_revno = last_revision_id = last_tree = None
172
for revno, revision_id in which_revs:
173
this_tree = branch.revision_tree(revision_id)
174
this_revision = branch.get_revision(revision_id)
177
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
180
last_revision = this_revision
181
last_tree = this_tree
185
this_tree = EmptyTree()
187
this_revno = last_revno - 1
188
this_revision_id = branch.revision_history()[this_revno]
189
this_tree = branch.revision_tree(this_revision_id)
190
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
193
def deltas_for_log_forward(branch, which_revs):
194
"""Compute deltas for display in forward log.
196
Given a sequence of (revno, revision_id) pairs, return
199
The delta is from the given revision to the next one in the
200
sequence, which makes sense if the log is being displayed from
203
from tree import EmptyTree
204
from diff import compare_trees
206
last_revno = last_revision_id = last_tree = None
207
for revno, revision_id in which_revs:
208
this_tree = branch.revision_tree(revision_id)
209
this_revision = branch.get_revision(revision_id)
213
last_tree = EmptyTree()
215
last_revno = revno - 1
216
last_revision_id = branch.revision_history()[last_revno]
217
last_tree = branch.revision_tree(last_revision_id)
219
yield revno, this_revision, compare_trees(last_tree, this_tree, False)
222
last_revision = this_revision
223
last_tree = this_tree
275
226
class LogFormatter(object):
276
227
"""Abstract class to display log messages."""
278
def __init__(self, to_file, show_ids=False, show_timezone='original'):
228
def __init__(self, to_file, show_ids=False, show_timezone=False):
279
229
self.to_file = to_file
280
230
self.show_ids = show_ids
281
231
self.show_timezone = show_timezone
283
def show(self, revno, rev, delta):
284
raise NotImplementedError('not implemented in abstract base')
286
def short_committer(self, rev):
287
return re.sub('<.*@.*>', '', rev.committer).strip(' ')
290
238
class LongLogFormatter(LogFormatter):
291
239
def show(self, revno, rev, delta):
292
return self._show_helper(revno=revno, rev=rev, delta=delta)
294
def show_merge(self, rev, merge_depth):
295
return self._show_helper(rev=rev, indent=' '*merge_depth, merged=True, delta=None)
297
def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
298
"""Show a revision, either merged or not."""
299
from bzrlib.osutils import format_date
240
from osutils import format_date
300
242
to_file = self.to_file
301
print >>to_file, indent+'-' * 60
302
if revno is not None:
303
print >>to_file, 'revno:', revno
305
print >>to_file, indent+'merged:', rev.revision_id
307
print >>to_file, indent+'revision-id:', rev.revision_id
244
print >>to_file, '-' * 60
245
print >>to_file, 'revno:', revno
308
246
if self.show_ids:
309
for parent_id in rev.parent_ids:
310
print >>to_file, indent+'parent:', parent_id
311
print >>to_file, indent+'committer:', rev.committer
313
print >>to_file, indent+'branch nick: %s' % \
314
rev.properties['branch-nick']
317
date_str = format_date(rev.timestamp,
320
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,
322
print >>to_file, indent+'message:'
252
print >>to_file, 'message:'
323
253
if not rev.message:
324
print >>to_file, indent+' (no message)'
254
print >>to_file, ' (no message)'
326
message = rev.message.rstrip('\r\n')
327
for l in message.split('\n'):
328
print >>to_file, indent+' ' + l
256
for l in rev.message.split('\n'):
257
print >>to_file, ' ' + l
329
259
if delta != None:
330
260
delta.show(to_file, self.show_ids)
333
264
class ShortLogFormatter(LogFormatter):
334
265
def show(self, revno, rev, delta):
335
266
from bzrlib.osutils import format_date
337
268
to_file = self.to_file
338
date_str = format_date(rev.timestamp, rev.timezone or 0,
340
print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
270
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
341
271
format_date(rev.timestamp, rev.timezone or 0,
342
self.show_timezone, date_fmt="%Y-%m-%d",
344
273
if self.show_ids:
345
274
print >>to_file, ' revision-id:', rev.revision_id
346
275
if not rev.message:
347
276
print >>to_file, ' (no message)'
349
message = rev.message.rstrip('\r\n')
350
for l in message.split('\n'):
278
for l in rev.message.split('\n'):
351
279
print >>to_file, ' ' + l
353
# TODO: Why not show the modified files in a shorter form as
354
# well? rewrap them single lines of appropriate length
355
281
if delta != None:
356
282
delta.show(to_file, self.show_ids)
360
class LineLogFormatter(LogFormatter):
361
def truncate(self, str, max_len):
362
if len(str) <= max_len:
364
return str[:max_len-3]+'...'
366
def date_string(self, rev):
367
from bzrlib.osutils import format_date
368
return format_date(rev.timestamp, rev.timezone or 0,
369
self.show_timezone, date_fmt="%Y-%m-%d",
372
def message(self, rev):
374
return '(no message)'
378
def show(self, revno, rev, delta):
379
from bzrlib.osutils import terminal_width
380
print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
382
def log_string(self, revno, rev, max_chars):
383
"""Format log info into one string. Truncate tail of string
384
:param revno: revision number (int) or None.
385
Revision numbers counts from 1.
386
:param rev: revision info object
387
:param max_chars: maximum length of resulting string
388
:return: formatted truncated string
392
# show revno only when is not None
393
out.append("%d:" % revno)
394
out.append(self.truncate(self.short_committer(rev), 20))
395
out.append(self.date_string(rev))
396
out.append(rev.get_summary())
397
return self.truncate(" ".join(out).rstrip('\n'), max_chars)
400
def line_log(rev, max_chars):
401
lf = LineLogFormatter(None)
402
return lf.log_string(None, rev, max_chars)
405
'long': LongLogFormatter,
287
FORMATTERS = {'long': LongLogFormatter,
406
288
'short': ShortLogFormatter,
407
'line': LineLogFormatter,
410
def register_formatter(name, formatter):
411
FORMATTERS[name] = formatter
413
292
def log_formatter(name, *args, **kwargs):
414
"""Construct a formatter from arguments.
416
name -- Name of the formatter to construct; currently 'long', 'short' and
417
'line' are supported.
419
293
from bzrlib.errors import BzrCommandError
421
296
return FORMATTERS[name](*args, **kwargs)
423
298
raise BzrCommandError("unknown log formatter: %r" % name)
425
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
426
# deprecated; for compatibility
427
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
428
lf.show(revno, rev, delta)
430
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
431
"""Show the change in revision history comparing the old revision history to the new one.
433
:param branch: The branch where the revisions exist
434
:param old_rh: The old revision history
435
:param new_rh: The new revision history
436
:param to_file: A file to write the results to. If None, stdout will be used
442
to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
443
lf = log_formatter(log_format,
446
show_timezone='original')
448
# This is the first index which is different between
451
for i in xrange(max(len(new_rh),
455
or new_rh[i] != old_rh[i]):
460
to_file.write('Nothing seems to have changed\n')
462
## TODO: It might be nice to do something like show_log
463
## and show the merged entries. But since this is the
464
## removed revisions, it shouldn't be as important
465
if base_idx < len(old_rh):
466
to_file.write('*'*60)
467
to_file.write('\nRemoved Revisions:\n')
468
for i in range(base_idx, len(old_rh)):
469
rev = branch.repository.get_revision(old_rh[i])
470
lf.show(i+1, rev, None)
471
to_file.write('*'*60)
472
to_file.write('\n\n')
473
if base_idx < len(new_rh):
474
to_file.write('Added Revisions:\n')
480
start_revision=base_idx+1,
481
end_revision=len(new_rh),
added
removed
bzrlib/log.py
