1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
|
# Copyright (C) 2005 Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Code to show logs of changes.
Various flavors of log can be produced:
* for one file, or the whole tree, and (not done yet) for
files in a given directory
* in "verbose" mode with a description of what changed from one
version to the next
* with file-ids and revision-ids shown
* from last to first or (not anymore) from first to last;
the default is "reversed" because it shows the likely most
relevant and interesting information first
* (not yet) in XML format
"""
from bzrlib.tree import EmptyTree
from bzrlib.delta import compare_trees
from bzrlib.trace import mutter
def find_touching_revisions(branch, file_id):
"""Yield a description of revisions which affect the file_id.
Each returned element is (revno, revision_id, description)
This is the list of revisions where the file is either added,
modified, renamed or deleted.
TODO: Perhaps some way to limit this to only particular revisions,
or to traverse a non-mainline set of revisions?
"""
last_ie = None
last_path = None
revno = 1
for revision_id in branch.revision_history():
this_inv = branch.get_revision_inventory(revision_id)
if file_id in this_inv:
this_ie = this_inv[file_id]
this_path = this_inv.id2path(file_id)
else:
this_ie = this_path = None
# now we know how it was last time, and how it is in this revision.
# are those two states effectively the same or not?
if not this_ie and not last_ie:
# not present in either
pass
elif this_ie and not last_ie:
yield revno, revision_id, "added " + this_path
elif not this_ie and last_ie:
# deleted here
yield revno, revision_id, "deleted " + last_path
elif this_path != last_path:
yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
elif (this_ie.text_size != last_ie.text_size
or this_ie.text_sha1 != last_ie.text_sha1):
yield revno, revision_id, "modified " + this_path
last_ie = this_ie
last_path = this_path
revno += 1
def show_log(branch,
lf,
specific_fileid=None,
verbose=False,
direction='reverse',
start_revision=None,
end_revision=None,
search=None):
"""Write out human-readable log of commits to this branch.
lf
LogFormatter object to show the output.
specific_fileid
If true, list only the commits affecting the specified
file, rather than all commits.
verbose
If true show added/changed/deleted/renamed files.
direction
'reverse' (default) is latest to earliest;
'forward' is earliest to latest.
start_revision
If not None, only show revisions >= start_revision
end_revision
If not None, only show revisions <= end_revision
"""
from bzrlib.osutils import format_date
from bzrlib.errors import BzrCheckError
from bzrlib.textui import show_status
from warnings import warn
if not isinstance(lf, LogFormatter):
warn("not a LogFormatter instance: %r" % lf)
if specific_fileid:
mutter('get log for file_id %r' % specific_fileid)
if search is not None:
import re
searchRE = re.compile(search, re.IGNORECASE)
else:
searchRE = None
which_revs = branch.enum_history(direction)
which_revs = [x for x in which_revs if (
(start_revision is None or x[0] >= start_revision)
and (end_revision is None or x[0] <= end_revision))]
if not (verbose or specific_fileid):
# no need to know what changed between revisions
with_deltas = deltas_for_log_dummy(branch, which_revs)
elif direction == 'reverse':
with_deltas = deltas_for_log_reverse(branch, which_revs)
else:
with_deltas = deltas_for_log_forward(branch, which_revs)
for revno, rev, delta in with_deltas:
if specific_fileid:
if not delta.touches_file_id(specific_fileid):
continue
if not verbose:
# although we calculated it, throw it away without display
delta = None
if searchRE is None or searchRE.search(rev.message):
lf.show(revno, rev, delta)
def deltas_for_log_dummy(branch, which_revs):
"""Return all the revisions without intermediate deltas.
Useful for log commands that won't need the delta information.
"""
for revno, revision_id in which_revs:
yield revno, branch.get_revision(revision_id), None
def deltas_for_log_reverse(branch, which_revs):
"""Compute deltas for display in latest-to-earliest order.
branch
Branch to traverse
which_revs
Sequence of (revno, revision_id) for the subset of history to examine
returns
Sequence of (revno, rev, delta)
The delta is from the given revision to the next one in the
sequence, which makes sense if the log is being displayed from
newest to oldest.
"""
last_revno = last_revision_id = last_tree = None
for revno, revision_id in which_revs:
this_tree = branch.revision_tree(revision_id)
this_revision = branch.get_revision(revision_id)
if last_revno:
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
this_tree = EmptyTree(branch.get_root_id())
last_revno = revno
last_revision = this_revision
last_tree = this_tree
if last_revno:
if last_revno == 1:
this_tree = EmptyTree(branch.get_root_id())
else:
this_revno = last_revno - 1
this_revision_id = branch.revision_history()[this_revno]
this_tree = branch.revision_tree(this_revision_id)
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
def deltas_for_log_forward(branch, which_revs):
"""Compute deltas for display in forward log.
Given a sequence of (revno, revision_id) pairs, return
(revno, rev, delta).
The delta is from the given revision to the next one in the
sequence, which makes sense if the log is being displayed from
newest to oldest.
"""
last_revno = last_revision_id = last_tree = None
prev_tree = EmptyTree(branch.get_root_id())
for revno, revision_id in which_revs:
this_tree = branch.revision_tree(revision_id)
this_revision = branch.get_revision(revision_id)
if not last_revno:
if revno == 1:
last_tree = EmptyTree(branch.get_root_id())
else:
last_revno = revno - 1
last_revision_id = branch.revision_history()[last_revno]
last_tree = branch.revision_tree(last_revision_id)
yield revno, this_revision, compare_trees(last_tree, this_tree, False)
last_revno = revno
last_revision = this_revision
last_tree = this_tree
class LogFormatter(object):
"""Abstract class to display log messages."""
def __init__(self, to_file, show_ids=False, show_timezone='original'):
self.to_file = to_file
self.show_ids = show_ids
self.show_timezone = show_timezone
def show(self, revno, rev, delta):
raise NotImplementedError('not implemented in abstract base')
class LongLogFormatter(LogFormatter):
def show(self, revno, rev, delta):
from osutils import format_date
to_file = self.to_file
print >>to_file, '-' * 60
print >>to_file, 'revno:', revno
if self.show_ids:
print >>to_file, 'revision-id:', rev.revision_id
print >>to_file, 'committer:', rev.committer
date_str = format_date(rev.timestamp,
rev.timezone or 0,
self.show_timezone)
print >>to_file, 'timestamp: %s' % date_str
print >>to_file, 'message:'
if not rev.message:
print >>to_file, ' (no message)'
else:
for l in rev.message.split('\n'):
print >>to_file, ' ' + l
if delta != None:
delta.show(to_file, self.show_ids)
class ShortLogFormatter(LogFormatter):
def show(self, revno, rev, delta):
from bzrlib.osutils import format_date
to_file = self.to_file
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
format_date(rev.timestamp, rev.timezone or 0,
self.show_timezone))
if self.show_ids:
print >>to_file, ' revision-id:', rev.revision_id
if not rev.message:
print >>to_file, ' (no message)'
else:
for l in rev.message.split('\n'):
print >>to_file, ' ' + l
if delta != None:
delta.show(to_file, self.show_ids)
print
FORMATTERS = {'long': LongLogFormatter,
'short': ShortLogFormatter,
}
def log_formatter(name, *args, **kwargs):
from bzrlib.errors import BzrCommandError
try:
return FORMATTERS[name](*args, **kwargs)
except IndexError:
raise BzrCommandError("unknown log formatter: %r" % name)
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
# deprecated; for compatability
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
lf.show(revno, rev, delta)
|