~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
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
34
35
* (not yet) in XML format
36
"""
37
38
538 by Martin Pool
- fix import
39
from trace import mutter
375 by Martin Pool
- New command touching-revisions and function to trace
40
41
def find_touching_revisions(branch, file_id):
42
    """Yield a description of revisions which affect the file_id.
43
44
    Each returned element is (revno, revision_id, description)
45
46
    This is the list of revisions where the file is either added,
47
    modified, renamed or deleted.
48
49
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
50
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
51
    """
52
    last_ie = None
53
    last_path = None
54
    revno = 1
55
    for revision_id in branch.revision_history():
56
        this_inv = branch.get_revision_inventory(revision_id)
57
        if file_id in this_inv:
58
            this_ie = this_inv[file_id]
59
            this_path = this_inv.id2path(file_id)
60
        else:
61
            this_ie = this_path = None
62
63
        # now we know how it was last time, and how it is in this revision.
64
        # are those two states effectively the same or not?
65
66
        if not this_ie and not last_ie:
67
            # not present in either
68
            pass
69
        elif this_ie and not last_ie:
70
            yield revno, revision_id, "added " + this_path
71
        elif not this_ie and last_ie:
72
            # deleted here
73
            yield revno, revision_id, "deleted " + last_path
74
        elif this_path != last_path:
75
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
76
        elif (this_ie.text_size != last_ie.text_size
77
              or this_ie.text_sha1 != last_ie.text_sha1):
78
            yield revno, revision_id, "modified " + this_path
79
80
        last_ie = this_ie
81
        last_path = this_path
82
        revno += 1
83
84
527 by Martin Pool
- refactor log command
85
378 by Martin Pool
- New usage bzr log FILENAME
86
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
87
             lf,
527 by Martin Pool
- refactor log command
88
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
89
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
90
             direction='reverse',
91
             start_revision=None,
92
             end_revision=None):
369 by Martin Pool
- Split out log printing into new show_log function
93
    """Write out human-readable log of commits to this branch.
94
794 by Martin Pool
- Merge John's nice short-log format.
95
    lf
96
        LogFormatter object to show the output.
97
527 by Martin Pool
- refactor log command
98
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
99
        If true, list only the commits affecting the specified
100
        file, rather than all commits.
101
369 by Martin Pool
- Split out log printing into new show_log function
102
    verbose
103
        If true show added/changed/deleted/renamed files.
104
527 by Martin Pool
- refactor log command
105
    direction
106
        'reverse' (default) is latest to earliest;
107
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
108
109
    start_revision
110
        If not None, only show revisions >= start_revision
111
112
    end_revision
113
        If not None, only show revisions <= end_revision
369 by Martin Pool
- Split out log printing into new show_log function
114
    """
794 by Martin Pool
- Merge John's nice short-log format.
115
    from bzrlib.osutils import format_date
116
    from bzrlib.errors import BzrCheckError
117
    from bzrlib.textui import show_status
118
    
119
    from warnings import warn
369 by Martin Pool
- Split out log printing into new show_log function
120
794 by Martin Pool
- Merge John's nice short-log format.
121
    if not isinstance(lf, LogFormatter):
122
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
123
124
    if specific_fileid:
125
        mutter('get log for file_id %r' % specific_fileid)
126
527 by Martin Pool
- refactor log command
127
    which_revs = branch.enum_history(direction)
805 by Martin Pool
Merge John's log patch:
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))]
527 by Martin Pool
- refactor log command
131
532 by Martin Pool
- put back support for log on specific files
132
    if not (verbose or specific_fileid):
133
        # no need to know what changed between revisions
530 by Martin Pool
- put back verbose log support for reversed logs
134
        with_deltas = deltas_for_log_dummy(branch, which_revs)
135
    elif direction == 'reverse':
136
        with_deltas = deltas_for_log_reverse(branch, which_revs)
137
    else:        
805 by Martin Pool
Merge John's log patch:
138
        with_deltas = deltas_for_log_forward(branch, which_revs)
530 by Martin Pool
- put back verbose log support for reversed logs
139
140
    for revno, rev, delta in with_deltas:
532 by Martin Pool
- put back support for log on specific files
141
        if specific_fileid:
142
            if not delta.touches_file_id(specific_fileid):
143
                continue
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
144
532 by Martin Pool
- put back support for log on specific files
145
        if not verbose:
146
            # although we calculated it, throw it away without display
147
            delta = None
794 by Martin Pool
- Merge John's nice short-log format.
148
149
        lf.show(revno, rev, delta)
527 by Martin Pool
- refactor log command
150
151
530 by Martin Pool
- put back verbose log support for reversed logs
152
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
156
157
158
def deltas_for_log_reverse(branch, which_revs):
159
    """Compute deltas for display in reverse log.
160
161
    Given a sequence of (revno, revision_id) pairs, return
162
    (revno, rev, delta).
163
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
166
    newest to oldest.
167
    """
168
    from tree import EmptyTree
169
    from diff import compare_trees
170
    
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)
175
        
176
        if last_revno:
177
            yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
178
179
        last_revno = revno
180
        last_revision = this_revision
181
        last_tree = this_tree
182
183
    if last_revno:
805 by Martin Pool
Merge John's log patch:
184
        if last_revno == 1:
185
            this_tree = EmptyTree()
186
        else:
187
            this_revno = last_revno - 1
188
            this_revision_id = branch.revision_history()[this_revno]
189
            this_tree = branch.revision_tree(this_revision_id)
530 by Martin Pool
- put back verbose log support for reversed logs
190
        yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
191
192
805 by Martin Pool
Merge John's log patch:
193
def deltas_for_log_forward(branch, which_revs):
194
    """Compute deltas for display in forward log.
195
196
    Given a sequence of (revno, revision_id) pairs, return
197
    (revno, rev, delta).
198
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
201
    newest to oldest.
202
    """
203
    from tree import EmptyTree
204
    from diff import compare_trees
205
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)
210
211
        if not last_revno:
212
            if revno == 1:
213
                last_tree = EmptyTree()
214
            else:
215
                last_revno = revno - 1
216
                last_revision_id = branch.revision_history()[last_revno]
217
                last_tree = branch.revision_tree(last_revision_id)
218
219
        yield revno, this_revision, compare_trees(last_tree, this_tree, False)
220
221
        last_revno = revno
222
        last_revision = this_revision
223
        last_tree = this_tree
530 by Martin Pool
- put back verbose log support for reversed logs
224
527 by Martin Pool
- refactor log command
225
794 by Martin Pool
- Merge John's nice short-log format.
226
class LogFormatter(object):
227
    """Abstract class to display log messages."""
228
    def __init__(self, to_file, show_ids=False, show_timezone=False):
229
        self.to_file = to_file
230
        self.show_ids = show_ids
231
        self.show_timezone = show_timezone
232
        
233
234
235
236
237
238
class LongLogFormatter(LogFormatter):
239
    def show(self, revno, rev, delta):
240
        from osutils import format_date
241
242
        to_file = self.to_file
243
244
        print >>to_file,  '-' * 60
245
        print >>to_file,  'revno:', revno
246
        if self.show_ids:
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,
250
                                             self.show_timezone))
251
252
        print >>to_file,  'message:'
253
        if not rev.message:
254
            print >>to_file,  '  (no message)'
255
        else:
256
            for l in rev.message.split('\n'):
257
                print >>to_file,  '  ' + l
258
259
        if delta != None:
260
            delta.show(to_file, self.show_ids)
261
262
263
264
class ShortLogFormatter(LogFormatter):
265
    def show(self, revno, rev, delta):
266
        from bzrlib.osutils import format_date
267
268
        to_file = self.to_file
269
270
        print >>to_file, "%5d %s\t%s" % (revno, rev.committer,
271
                format_date(rev.timestamp, rev.timezone or 0,
272
                            self.show_timezone))
273
        if self.show_ids:
274
            print >>to_file,  '      revision-id:', rev.revision_id
275
        if not rev.message:
276
            print >>to_file,  '      (no message)'
277
        else:
278
            for l in rev.message.split('\n'):
279
                print >>to_file,  '      ' + l
280
281
        if delta != None:
282
            delta.show(to_file, self.show_ids)
283
        print
284
285
286
287
FORMATTERS = {'long': LongLogFormatter,
288
              'short': ShortLogFormatter,
289
              }
290
291
292
def log_formatter(name, *args, **kwargs):
293
    from bzrlib.errors import BzrCommandError
527 by Martin Pool
- refactor log command
294
    
794 by Martin Pool
- Merge John's nice short-log format.
295
    try:
296
        return FORMATTERS[name](*args, **kwargs)
297
    except IndexError:
298
        raise BzrCommandError("unknown log formatter: %r" % name)