~bzr-pqm/bzr/bzr.dev

369 by Martin Pool
- Split out log printing into new show_log function
1
# Copyright (C) 2005 Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
375 by Martin Pool
- New command touching-revisions and function to trace
17
18
527 by Martin Pool
- refactor log command
19
"""Code to show logs of changes.
20
21
Various flavors of log can be produced:
22
23
* for one file, or the whole tree, and (not done yet) for
24
  files in a given directory
25
26
* in "verbose" mode with a description of what changed from one
27
  version to the next
28
29
* with file-ids and revision-ids shown
30
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
31
Logs are actually written out through an abstract LogFormatter
32
interface, which allows for different preferred formats.  Plugins can
33
register formats too.
34
35
Logs can be produced in either forward (oldest->newest) or reverse
36
(newest->oldest) order.
37
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
41
calling in here.
42
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.
527 by Martin Pool
- refactor log command
50
"""
51
52
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
53
from bzrlib.tree import EmptyTree
54
from bzrlib.delta import compare_trees
55
from bzrlib.trace import mutter
56
375 by Martin Pool
- New command touching-revisions and function to trace
57
58
def find_touching_revisions(branch, file_id):
59
    """Yield a description of revisions which affect the file_id.
60
61
    Each returned element is (revno, revision_id, description)
62
63
    This is the list of revisions where the file is either added,
64
    modified, renamed or deleted.
65
66
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
67
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
68
    """
69
    last_ie = None
70
    last_path = None
71
    revno = 1
72
    for revision_id in branch.revision_history():
73
        this_inv = branch.get_revision_inventory(revision_id)
74
        if file_id in this_inv:
75
            this_ie = this_inv[file_id]
76
            this_path = this_inv.id2path(file_id)
77
        else:
78
            this_ie = this_path = None
79
80
        # now we know how it was last time, and how it is in this revision.
81
        # are those two states effectively the same or not?
82
83
        if not this_ie and not last_ie:
84
            # not present in either
85
            pass
86
        elif this_ie and not last_ie:
87
            yield revno, revision_id, "added " + this_path
88
        elif not this_ie and last_ie:
89
            # deleted here
90
            yield revno, revision_id, "deleted " + last_path
91
        elif this_path != last_path:
92
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
93
        elif (this_ie.text_size != last_ie.text_size
94
              or this_ie.text_sha1 != last_ie.text_sha1):
95
            yield revno, revision_id, "modified " + this_path
96
97
        last_ie = this_ie
98
        last_path = this_path
99
        revno += 1
100
101
527 by Martin Pool
- refactor log command
102
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
103
def _enumerate_history(branch):
104
    rh = []
105
    revno = 1
106
    for rev_id in branch.revision_history():
107
        rh.append((revno, rev_id))
108
        revno += 1
109
    return rh
110
111
1393.1.56 by Martin Pool
- doc and small refactoring of log code
112
def _get_revision_delta(branch, revno):
113
    """Return the delta for a mainline revision.
114
    
115
    This is used to show summaries in verbose logs, and also for finding 
116
    revisions which touch a given file."""
117
    # FIXME: The current version is very inefficient; it retrieves all revisions
118
    # twice and reads the weave twice.  We ought to keep revisions in memory 
119
    # in case they're used again, either in a general cache or perhaps 
120
    # in this code.
121
    # XXX: What are we supposed to do when showing a summary for something 
122
    # other than a mainline revision.  The delta to it's first parent, or
123
    # (more useful) the delta to a nominated other revision.
124
    return branch.get_revision_delta(revno)
125
126
378 by Martin Pool
- New usage bzr log FILENAME
127
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
128
             lf,
527 by Martin Pool
- refactor log command
129
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
130
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
131
             direction='reverse',
132
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
133
             end_revision=None,
134
             search=None):
369 by Martin Pool
- Split out log printing into new show_log function
135
    """Write out human-readable log of commits to this branch.
136
794 by Martin Pool
- Merge John's nice short-log format.
137
    lf
138
        LogFormatter object to show the output.
139
527 by Martin Pool
- refactor log command
140
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
141
        If true, list only the commits affecting the specified
142
        file, rather than all commits.
143
369 by Martin Pool
- Split out log printing into new show_log function
144
    verbose
145
        If true show added/changed/deleted/renamed files.
146
527 by Martin Pool
- refactor log command
147
    direction
148
        'reverse' (default) is latest to earliest;
149
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
150
151
    start_revision
152
        If not None, only show revisions >= start_revision
153
154
    end_revision
155
        If not None, only show revisions <= end_revision
369 by Martin Pool
- Split out log printing into new show_log function
156
    """
794 by Martin Pool
- Merge John's nice short-log format.
157
    from bzrlib.osutils import format_date
158
    from bzrlib.errors import BzrCheckError
159
    from bzrlib.textui import show_status
160
    
161
    from warnings import warn
369 by Martin Pool
- Split out log printing into new show_log function
162
794 by Martin Pool
- Merge John's nice short-log format.
163
    if not isinstance(lf, LogFormatter):
164
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
165
166
    if specific_fileid:
167
        mutter('get log for file_id %r' % specific_fileid)
168
900 by Martin Pool
- patch from john to search for matching commits
169
    if search is not None:
170
        import re
171
        searchRE = re.compile(search, re.IGNORECASE)
172
    else:
173
        searchRE = None
174
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
175
    which_revs = _enumerate_history(branch)
176
    
177
    if start_revision is None:
178
        start_revision = 1
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
179
    else:
180
        branch.check_real_revno(start_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
181
    
182
    if end_revision is None:
183
        end_revision = len(which_revs)
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
184
    else:
185
        branch.check_real_revno(end_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
186
187
    # list indexes are 0-based; revisions are 1-based
188
    cut_revs = which_revs[(start_revision-1):(end_revision)]
189
190
    if direction == 'reverse':
191
        cut_revs.reverse()
192
    elif direction == 'forward':
193
        pass
194
    else:
195
        raise ValueError('invalid direction %r' % direction)
196
197
    for revno, rev_id in cut_revs:
198
        if verbose or specific_fileid:
1393.1.56 by Martin Pool
- doc and small refactoring of log code
199
            delta = _get_revision_delta(branch, revno)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
200
            
532 by Martin Pool
- put back support for log on specific files
201
        if specific_fileid:
202
            if not delta.touches_file_id(specific_fileid):
203
                continue
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
204
532 by Martin Pool
- put back support for log on specific files
205
        if not verbose:
206
            # although we calculated it, throw it away without display
207
            delta = None
794 by Martin Pool
- Merge John's nice short-log format.
208
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
209
        rev = branch.get_revision(rev_id)
210
211
        if searchRE:
212
            if not searchRE.search(rev.message):
213
                continue
214
215
        lf.show(revno, rev, delta)
527 by Martin Pool
- refactor log command
216
217
530 by Martin Pool
- put back verbose log support for reversed logs
218
219
def deltas_for_log_dummy(branch, which_revs):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
220
    """Return all the revisions without intermediate deltas.
221
222
    Useful for log commands that won't need the delta information.
223
    """
224
    
530 by Martin Pool
- put back verbose log support for reversed logs
225
    for revno, revision_id in which_revs:
226
        yield revno, branch.get_revision(revision_id), None
227
228
229
def deltas_for_log_reverse(branch, which_revs):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
230
    """Compute deltas for display in latest-to-earliest order.
231
232
    branch
233
        Branch to traverse
234
235
    which_revs
236
        Sequence of (revno, revision_id) for the subset of history to examine
237
238
    returns 
239
        Sequence of (revno, rev, delta)
530 by Martin Pool
- put back verbose log support for reversed logs
240
241
    The delta is from the given revision to the next one in the
242
    sequence, which makes sense if the log is being displayed from
243
    newest to oldest.
244
    """
245
    last_revno = last_revision_id = last_tree = None
246
    for revno, revision_id in which_revs:
247
        this_tree = branch.revision_tree(revision_id)
248
        this_revision = branch.get_revision(revision_id)
249
        
250
        if last_revno:
251
            yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
252
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
253
        this_tree = EmptyTree(branch.get_root_id())
254
530 by Martin Pool
- put back verbose log support for reversed logs
255
        last_revno = revno
256
        last_revision = this_revision
257
        last_tree = this_tree
258
259
    if last_revno:
805 by Martin Pool
Merge John's log patch:
260
        if last_revno == 1:
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
261
            this_tree = EmptyTree(branch.get_root_id())
805 by Martin Pool
Merge John's log patch:
262
        else:
263
            this_revno = last_revno - 1
264
            this_revision_id = branch.revision_history()[this_revno]
265
            this_tree = branch.revision_tree(this_revision_id)
530 by Martin Pool
- put back verbose log support for reversed logs
266
        yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
267
268
805 by Martin Pool
Merge John's log patch:
269
def deltas_for_log_forward(branch, which_revs):
270
    """Compute deltas for display in forward log.
271
272
    Given a sequence of (revno, revision_id) pairs, return
273
    (revno, rev, delta).
274
275
    The delta is from the given revision to the next one in the
276
    sequence, which makes sense if the log is being displayed from
277
    newest to oldest.
278
    """
279
    last_revno = last_revision_id = last_tree = None
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
280
    prev_tree = EmptyTree(branch.get_root_id())
281
805 by Martin Pool
Merge John's log patch:
282
    for revno, revision_id in which_revs:
283
        this_tree = branch.revision_tree(revision_id)
284
        this_revision = branch.get_revision(revision_id)
285
286
        if not last_revno:
287
            if revno == 1:
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
288
                last_tree = EmptyTree(branch.get_root_id())
805 by Martin Pool
Merge John's log patch:
289
            else:
290
                last_revno = revno - 1
291
                last_revision_id = branch.revision_history()[last_revno]
292
                last_tree = branch.revision_tree(last_revision_id)
293
294
        yield revno, this_revision, compare_trees(last_tree, this_tree, False)
295
296
        last_revno = revno
297
        last_revision = this_revision
298
        last_tree = this_tree
530 by Martin Pool
- put back verbose log support for reversed logs
299
527 by Martin Pool
- refactor log command
300
794 by Martin Pool
- Merge John's nice short-log format.
301
class LogFormatter(object):
302
    """Abstract class to display log messages."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
303
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
304
        self.to_file = to_file
305
        self.show_ids = show_ids
306
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
307
308
309
    def show(self, revno, rev, delta):
310
        raise NotImplementedError('not implemented in abstract base')
1393.1.56 by Martin Pool
- doc and small refactoring of log code
311
312
    
794 by Martin Pool
- Merge John's nice short-log format.
313
class LongLogFormatter(LogFormatter):
314
    def show(self, revno, rev, delta):
315
        from osutils import format_date
316
317
        to_file = self.to_file
318
319
        print >>to_file,  '-' * 60
320
        print >>to_file,  'revno:', revno
321
        if self.show_ids:
322
            print >>to_file,  'revision-id:', rev.revision_id
1138 by Martin Pool
- bzr log --show-ids includes parent ids
323
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
324
            for parent_id in rev.parent_ids:
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
325
                print >>to_file, 'parent:', parent_id
1138 by Martin Pool
- bzr log --show-ids includes parent ids
326
            
794 by Martin Pool
- Merge John's nice short-log format.
327
        print >>to_file,  'committer:', rev.committer
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
328
329
        date_str = format_date(rev.timestamp,
330
                               rev.timezone or 0,
331
                               self.show_timezone)
332
        print >>to_file,  'timestamp: %s' % date_str
794 by Martin Pool
- Merge John's nice short-log format.
333
334
        print >>to_file,  'message:'
335
        if not rev.message:
336
            print >>to_file,  '  (no message)'
337
        else:
338
            for l in rev.message.split('\n'):
339
                print >>to_file,  '  ' + l
340
341
        if delta != None:
342
            delta.show(to_file, self.show_ids)
343
344
345
346
class ShortLogFormatter(LogFormatter):
347
    def show(self, revno, rev, delta):
348
        from bzrlib.osutils import format_date
349
350
        to_file = self.to_file
351
352
        print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
353
                format_date(rev.timestamp, rev.timezone or 0,
354
                            self.show_timezone))
355
        if self.show_ids:
356
            print >>to_file,  '      revision-id:', rev.revision_id
357
        if not rev.message:
358
            print >>to_file,  '      (no message)'
359
        else:
360
            for l in rev.message.split('\n'):
361
                print >>to_file,  '      ' + l
362
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
363
        # TODO: Why not show the modified files in a shorter form as
364
        # well? rewrap them single lines of appropriate length
794 by Martin Pool
- Merge John's nice short-log format.
365
        if delta != None:
366
            delta.show(to_file, self.show_ids)
367
        print
368
369
370
371
FORMATTERS = {'long': LongLogFormatter,
372
              'short': ShortLogFormatter,
373
              }
374
375
376
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
377
    """Construct a formatter from arguments.
378
379
    name -- Name of the formatter to construct; currently 'long' and
380
        'short' are supported.
381
    """
794 by Martin Pool
- Merge John's nice short-log format.
382
    from bzrlib.errors import BzrCommandError
383
    try:
384
        return FORMATTERS[name](*args, **kwargs)
385
    except IndexError:
386
        raise BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
387
388
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
389
    # deprecated; for compatability
390
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
391
    lf.show(revno, rev, delta)