29
29
* with file-ids and revision-ids shown
31
Logs are actually written out through an abstract LogFormatter
32
interface, which allows for different preferred formats. Plugins can
35
Logs can be produced in either forward (oldest->newest) or reverse
36
(newest->oldest) order.
38
Logs can be filtered to show only revisions matching a particular
39
search string, or within a particular range of revisions. The range
40
can be given as date/times, which are reduced to revisions before
43
In verbose mode we show a summary of what changed in each particular
44
revision. Note that this is the delta for changes in that revision
45
relative to its mainline parent, not the delta relative to the last
46
logged revision. So for example if you ask for a verbose log of
47
changes touching hello.c you will get a list of those revisions also
48
listing other things that were changed in the same revision, but not
49
all the changes since the previous revision that touched hello.c.
31
* from last to first or (not anymore) from first to last;
32
the default is "reversed" because it shows the likely most
33
relevant and interesting information first
35
* (not yet) in XML format
53
from bzrlib.tree import EmptyTree
54
from bzrlib.delta import compare_trees
55
from bzrlib.trace import mutter
56
from bzrlib.errors import InvalidRevisionNumber
39
from trace import mutter
59
41
def find_touching_revisions(branch, file_id):
60
42
"""Yield a description of revisions which affect the file_id.
152
124
if specific_fileid:
153
125
mutter('get log for file_id %r' % specific_fileid)
155
if search is not None:
157
searchRE = re.compile(search, re.IGNORECASE)
161
which_revs = _enumerate_history(branch)
163
if start_revision is None:
165
elif start_revision < 1 or start_revision >= len(which_revs):
166
raise InvalidRevisionNumber(start_revision)
168
if end_revision is None:
169
end_revision = len(which_revs)
170
elif end_revision < 1 or end_revision >= len(which_revs):
171
raise InvalidRevisionNumber(end_revision)
173
# list indexes are 0-based; revisions are 1-based
174
cut_revs = which_revs[(start_revision-1):(end_revision)]
176
if direction == 'reverse':
178
elif direction == 'forward':
181
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)
127
which_revs = branch.enum_history(direction)
129
if not (verbose or specific_fileid):
130
# no need to know what changed between revisions
131
with_deltas = deltas_for_log_dummy(branch, which_revs)
132
elif direction == 'reverse':
133
with_deltas = deltas_for_log_reverse(branch, which_revs)
135
raise NotImplementedError("sorry, verbose forward logs not done yet")
137
for revno, rev, delta in with_deltas:
187
138
if specific_fileid:
188
139
if not delta.touches_file_id(specific_fileid):
142
if start_revision is not None and revno < start_revision:
145
if end_revision is not None and revno > end_revision:
192
149
# although we calculated it, throw it away without display
195
rev = branch.get_revision(rev_id)
198
if not searchRE.search(rev.message):
201
152
lf.show(revno, rev, delta)
205
156
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.
211
157
for revno, revision_id in which_revs:
212
158
yield revno, branch.get_revision(revision_id), None
215
161
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)
162
"""Compute deltas for display in reverse log.
164
Given a sequence of (revno, revision_id) pairs, return
227
167
The delta is from the given revision to the next one in the
228
168
sequence, which makes sense if the log is being displayed from
229
169
newest to oldest.
171
from tree import EmptyTree
172
from diff import compare_trees
231
174
last_revno = last_revision_id = last_tree = None
232
175
for revno, revision_id in which_revs:
233
176
this_tree = branch.revision_tree(revision_id)
237
180
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
239
this_tree = EmptyTree(branch.get_root_id())
241
182
last_revno = revno
242
183
last_revision = this_revision
243
184
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)
187
this_tree = EmptyTree()
252
188
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
287
193
class LogFormatter(object):
288
194
"""Abstract class to display log messages."""
289
def __init__(self, to_file, show_ids=False, show_timezone='original'):
195
def __init__(self, to_file, show_ids=False, show_timezone=False):
290
196
self.to_file = to_file
291
197
self.show_ids = show_ids
292
198
self.show_timezone = show_timezone
295
def show(self, revno, rev, delta):
296
raise NotImplementedError('not implemented in abstract base')
311
213
if self.show_ids:
312
214
print >>to_file, 'revision-id:', rev.revision_id
313
215
print >>to_file, 'committer:', rev.committer
315
date_str = format_date(rev.timestamp,
318
print >>to_file, 'timestamp: %s' % date_str
216
print >>to_file, 'timestamp: %s' % (format_date(rev.timestamp, rev.timezone or 0,
320
219
print >>to_file, 'message:'
321
220
if not rev.message:
366
263
return FORMATTERS[name](*args, **kwargs)
367
264
except IndexError:
368
265
raise BzrCommandError("unknown log formatter: %r" % name)
370
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
371
# deprecated; for compatability
372
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
373
lf.show(revno, rev, delta)
added
removed
bzrlib/log.py
