~bzr-pqm/bzr/bzr.dev

369 by Martin Pool
- Split out log printing into new show_log function
1
# Copyright (C) 2005 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
369 by Martin Pool
- Split out log printing into new show_log function
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
369 by Martin Pool
- Split out log printing into new show_log function
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
369 by Martin Pool
- Split out log printing into new show_log function
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
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
52
# TODO: option to show delta summaries for merged-in revisions
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
53
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
54
from itertools import izip
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
55
import re
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
56
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
57
from bzrlib import(
58
    registry,
59
    symbol_versioning,
60
    )
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
61
import bzrlib.errors as errors
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
62
from bzrlib.symbol_versioning import deprecated_method, zero_eleven
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
63
from bzrlib.trace import mutter
64
from bzrlib.tsort import merge_sort
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
65
375 by Martin Pool
- New command touching-revisions and function to trace
66
67
def find_touching_revisions(branch, file_id):
68
    """Yield a description of revisions which affect the file_id.
69
70
    Each returned element is (revno, revision_id, description)
71
72
    This is the list of revisions where the file is either added,
73
    modified, renamed or deleted.
74
75
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
76
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
77
    """
78
    last_ie = None
79
    last_path = None
80
    revno = 1
81
    for revision_id in branch.revision_history():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
82
        this_inv = branch.repository.get_revision_inventory(revision_id)
375 by Martin Pool
- New command touching-revisions and function to trace
83
        if file_id in this_inv:
84
            this_ie = this_inv[file_id]
85
            this_path = this_inv.id2path(file_id)
86
        else:
87
            this_ie = this_path = None
88
89
        # now we know how it was last time, and how it is in this revision.
90
        # are those two states effectively the same or not?
91
92
        if not this_ie and not last_ie:
93
            # not present in either
94
            pass
95
        elif this_ie and not last_ie:
96
            yield revno, revision_id, "added " + this_path
97
        elif not this_ie and last_ie:
98
            # deleted here
99
            yield revno, revision_id, "deleted " + last_path
100
        elif this_path != last_path:
101
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
102
        elif (this_ie.text_size != last_ie.text_size
103
              or this_ie.text_sha1 != last_ie.text_sha1):
104
            yield revno, revision_id, "modified " + this_path
105
106
        last_ie = this_ie
107
        last_path = this_path
108
        revno += 1
109
110
527 by Martin Pool
- refactor log command
111
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
112
def _enumerate_history(branch):
113
    rh = []
114
    revno = 1
115
    for rev_id in branch.revision_history():
116
        rh.append((revno, rev_id))
117
        revno += 1
118
    return rh
119
120
378 by Martin Pool
- New usage bzr log FILENAME
121
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
122
             lf,
527 by Martin Pool
- refactor log command
123
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
124
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
125
             direction='reverse',
126
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
127
             end_revision=None,
128
             search=None):
369 by Martin Pool
- Split out log printing into new show_log function
129
    """Write out human-readable log of commits to this branch.
130
794 by Martin Pool
- Merge John's nice short-log format.
131
    lf
132
        LogFormatter object to show the output.
133
527 by Martin Pool
- refactor log command
134
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
135
        If true, list only the commits affecting the specified
136
        file, rather than all commits.
137
369 by Martin Pool
- Split out log printing into new show_log function
138
    verbose
139
        If true show added/changed/deleted/renamed files.
140
527 by Martin Pool
- refactor log command
141
    direction
142
        'reverse' (default) is latest to earliest;
143
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
144
145
    start_revision
146
        If not None, only show revisions >= start_revision
147
148
    end_revision
149
        If not None, only show revisions <= end_revision
369 by Martin Pool
- Split out log printing into new show_log function
150
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
151
    branch.lock_read()
152
    try:
1756.1.6 by Aaron Bentley
Revert locking fix
153
        _show_log(branch, lf, specific_fileid, verbose, direction,
154
                  start_revision, end_revision, search)
1417.1.7 by Robert Collins
teach log it needs a read lock
155
    finally:
156
        branch.unlock()
157
    
158
def _show_log(branch,
159
             lf,
160
             specific_fileid=None,
161
             verbose=False,
162
             direction='reverse',
163
             start_revision=None,
164
             end_revision=None,
165
             search=None):
166
    """Worker function for show_log - see show_log."""
794 by Martin Pool
- Merge John's nice short-log format.
167
    from bzrlib.osutils import format_date
168
    from bzrlib.errors import BzrCheckError
169
    
170
    from warnings import warn
369 by Martin Pool
- Split out log printing into new show_log function
171
794 by Martin Pool
- Merge John's nice short-log format.
172
    if not isinstance(lf, LogFormatter):
173
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
174
175
    if specific_fileid:
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
176
        mutter('get log for file_id %r', specific_fileid)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
177
900 by Martin Pool
- patch from john to search for matching commits
178
    if search is not None:
179
        import re
180
        searchRE = re.compile(search, re.IGNORECASE)
181
    else:
182
        searchRE = None
183
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
184
    which_revs = _enumerate_history(branch)
185
    
186
    if start_revision is None:
187
        start_revision = 1
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
188
    else:
189
        branch.check_real_revno(start_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
190
    
191
    if end_revision is None:
192
        end_revision = len(which_revs)
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
193
    else:
194
        branch.check_real_revno(end_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
195
196
    # list indexes are 0-based; revisions are 1-based
197
    cut_revs = which_revs[(start_revision-1):(end_revision)]
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
198
    if not cut_revs:
199
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
200
201
    # convert the revision history to a dictionary:
1756.2.27 by Aaron Bentley
Tweak rev_nos style
202
    rev_nos = dict((k, v) for v, k in cut_revs)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
203
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
204
    # override the mainline to look like the revision history.
205
    mainline_revs = [revision_id for index, revision_id in cut_revs]
206
    if cut_revs[0][0] == 1:
207
        mainline_revs.insert(0, None)
208
    else:
209
        mainline_revs.insert(0, which_revs[start_revision-2][1])
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
210
    # how should we show merged revisions ?
211
    # old api: show_merge. New api: show_merge_revno
212
    show_merge_revno = getattr(lf, 'show_merge_revno', None)
213
    show_merge = getattr(lf, 'show_merge', None)
214
    if show_merge is None and show_merge_revno is None:
215
        # no merged-revno support
216
        include_merges = False
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
217
    else:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
218
        include_merges = True
219
    if show_merge is not None and show_merge_revno is None:
220
        # tell developers to update their code
221
        symbol_versioning.warn('LogFormatters should provide show_merge_revno '
222
            'instead of show_merge since bzr 0.11.',
223
            DeprecationWarning, stacklevel=3)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
224
    view_revisions = list(get_view_revisions(mainline_revs, rev_nos, branch,
1756.2.22 by Aaron Bentley
Apply review comments
225
                          direction, include_merges=include_merges))
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
226
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
227
    def iter_revisions():
1756.3.22 by Aaron Bentley
Tweaks from review
228
        # r = revision, n = revno, d = merge depth
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
229
        revision_ids = [r for r, n, d in view_revisions]
1756.3.2 by Aaron Bentley
Refactor revision_delta call
230
        zeros = set(r for r, n, d in view_revisions if d == 0)
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
231
        num = 9
1756.3.22 by Aaron Bentley
Tweaks from review
232
        repository = branch.repository
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
233
        while revision_ids:
1756.3.22 by Aaron Bentley
Tweaks from review
234
            cur_deltas = {}
235
            revisions = repository.get_revisions(revision_ids[:num])
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
236
            if verbose or specific_fileid:
237
                delta_revisions = [r for r in revisions if
238
                                   r.revision_id in zeros]
1756.3.22 by Aaron Bentley
Tweaks from review
239
                deltas = repository.get_deltas_for_revisions(delta_revisions)
240
                cur_deltas = dict(izip((r.revision_id for r in 
241
                                        delta_revisions), deltas))
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
242
            for revision in revisions:
1756.3.22 by Aaron Bentley
Tweaks from review
243
                # The delta value will be None unless
244
                # 1. verbose or specific_fileid is specified, and
245
                # 2. the revision is a mainline revision
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
246
                yield revision, cur_deltas.get(revision.revision_id)
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
247
            revision_ids  = revision_ids[num:]
248
            num = int(num * 1.5)
249
            
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
250
    # now we just print all the revisions
1756.3.2 by Aaron Bentley
Refactor revision_delta call
251
    for ((rev_id, revno, merge_depth), (rev, delta)) in \
1756.2.18 by Aaron Bentley
Factor out the revision list generation
252
         izip(view_revisions, iter_revisions()):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
253
254
        if searchRE:
255
            if not searchRE.search(rev.message):
256
                continue
257
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
258
        if merge_depth == 0:
259
            # a mainline revision.
260
                
261
            if specific_fileid:
262
                if not delta.touches_file_id(specific_fileid):
263
                    continue
264
    
265
            if not verbose:
266
                # although we calculated it, throw it away without display
267
                delta = None
268
1756.2.18 by Aaron Bentley
Factor out the revision list generation
269
            lf.show(revno, rev, delta)
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
270
        else:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
271
            if show_merge_revno is None:
272
                lf.show_merge(rev, merge_depth)
273
            else:
274
                lf.show_merge_revno(rev, merge_depth, revno)
527 by Martin Pool
- refactor log command
275
530 by Martin Pool
- put back verbose log support for reversed logs
276
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
277
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
278
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
279
    """Produce an iterator of revisions to show
280
    :return: an iterator of (revision_id, revno, merge_depth)
281
    (if there is no revno for a revision, None is supplied)
282
    """
1756.2.22 by Aaron Bentley
Apply review comments
283
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
284
        revision_ids = mainline_revs[1:]
285
        if direction == 'reverse':
286
            revision_ids.reverse()
287
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
288
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
289
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
290
    merge_sorted_revisions = merge_sort(
291
        branch.repository.get_revision_graph(mainline_revs[-1]),
292
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
293
        mainline_revs,
294
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
295
296
    if direction == 'forward':
297
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
298
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
299
    elif direction != 'reverse':
300
        raise ValueError('invalid direction %r' % direction)
301
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
302
    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
303
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
304
305
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
306
def reverse_by_depth(merge_sorted_revisions, _depth=0):
307
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
308
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
309
    Revisions with a different depth are sorted as a group with the previous
310
    revision of that depth.  There may be no topological justification for this,
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
311
    but it looks much nicer.
312
    """
313
    zd_revisions = []
314
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
315
        if val[2] == _depth:
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
316
            zd_revisions.append([val])
317
        else:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
318
            assert val[2] > _depth
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
319
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
320
    for revisions in zd_revisions:
321
        if len(revisions) > 1:
322
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
323
    zd_revisions.reverse()
324
    result = []
325
    for chunk in zd_revisions:
326
        result.extend(chunk)
327
    return result
328
329
794 by Martin Pool
- Merge John's nice short-log format.
330
class LogFormatter(object):
331
    """Abstract class to display log messages."""
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
332
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
333
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
334
        self.to_file = to_file
335
        self.show_ids = show_ids
336
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
337
338
    def show(self, revno, rev, delta):
339
        raise NotImplementedError('not implemented in abstract base')
1393.1.56 by Martin Pool
- doc and small refactoring of log code
340
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
341
    def short_committer(self, rev):
342
        return re.sub('<.*@.*>', '', rev.committer).strip(' ')
343
    
1393.1.56 by Martin Pool
- doc and small refactoring of log code
344
    
794 by Martin Pool
- Merge John's nice short-log format.
345
class LongLogFormatter(LogFormatter):
346
    def show(self, revno, rev, delta):
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
347
        return self._show_helper(revno=revno, rev=rev, delta=delta)
794 by Martin Pool
- Merge John's nice short-log format.
348
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
349
    @deprecated_method(zero_eleven)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
350
    def show_merge(self, rev, merge_depth):
351
        return self._show_helper(rev=rev, indent='    '*merge_depth, merged=True, delta=None)
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
352
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
353
    def show_merge_revno(self, rev, merge_depth, revno):
354
        """Show a merged revision rev, with merge_depth and a revno."""
355
        return self._show_helper(rev=rev, revno=revno,
356
            indent='    '*merge_depth, merged=True, delta=None)
357
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
358
    def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None):
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
359
        """Show a revision, either merged or not."""
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
360
        from bzrlib.osutils import format_date
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
361
        to_file = self.to_file
362
        print >>to_file,  indent+'-' * 60
1185.35.18 by Aaron Bentley
Refactored long-format log printing
363
        if revno is not None:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
364
            print >>to_file,  indent+'revno:', revno
1185.35.18 by Aaron Bentley
Refactored long-format log printing
365
        if merged:
366
            print >>to_file,  indent+'merged:', rev.revision_id
367
        elif self.show_ids:
368
            print >>to_file,  indent+'revision-id:', rev.revision_id
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
369
        if self.show_ids:
370
            for parent_id in rev.parent_ids:
371
                print >>to_file, indent+'parent:', parent_id
372
        print >>to_file,  indent+'committer:', rev.committer
1185.35.17 by Aaron Bentley
Added branch nicks to long-format logs
373
        try:
374
            print >>to_file, indent+'branch nick: %s' % \
375
                rev.properties['branch-nick']
376
        except KeyError:
377
            pass
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
378
        date_str = format_date(rev.timestamp,
379
                               rev.timezone or 0,
380
                               self.show_timezone)
381
        print >>to_file,  indent+'timestamp: %s' % date_str
382
383
        print >>to_file,  indent+'message:'
384
        if not rev.message:
385
            print >>to_file,  indent+'  (no message)'
386
        else:
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
387
            message = rev.message.rstrip('\r\n')
388
            for l in message.split('\n'):
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
389
                print >>to_file,  indent+'  ' + l
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
390
        if delta is not None:
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
391
            delta.show(to_file, self.show_ids)
794 by Martin Pool
- Merge John's nice short-log format.
392
393
394
class ShortLogFormatter(LogFormatter):
395
    def show(self, revno, rev, delta):
396
        from bzrlib.osutils import format_date
397
398
        to_file = self.to_file
1185.12.25 by Aaron Bentley
Added one-line log format
399
        date_str = format_date(rev.timestamp, rev.timezone or 0,
400
                            self.show_timezone)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
401
        print >>to_file, "%5s %s\t%s" % (revno, self.short_committer(rev),
794 by Martin Pool
- Merge John's nice short-log format.
402
                format_date(rev.timestamp, rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
403
                            self.show_timezone, date_fmt="%Y-%m-%d",
404
                           show_offset=False))
794 by Martin Pool
- Merge John's nice short-log format.
405
        if self.show_ids:
406
            print >>to_file,  '      revision-id:', rev.revision_id
407
        if not rev.message:
408
            print >>to_file,  '      (no message)'
409
        else:
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
410
            message = rev.message.rstrip('\r\n')
411
            for l in message.split('\n'):
794 by Martin Pool
- Merge John's nice short-log format.
412
                print >>to_file,  '      ' + l
413
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
414
        # TODO: Why not show the modified files in a shorter form as
415
        # well? rewrap them single lines of appropriate length
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
416
        if delta is not None:
794 by Martin Pool
- Merge John's nice short-log format.
417
            delta.show(to_file, self.show_ids)
1185.31.21 by John Arbash Meinel
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
418
        print >>to_file, ''
794 by Martin Pool
- Merge John's nice short-log format.
419
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
420
1185.12.25 by Aaron Bentley
Added one-line log format
421
class LineLogFormatter(LogFormatter):
422
    def truncate(self, str, max_len):
423
        if len(str) <= max_len:
424
            return str
425
        return str[:max_len-3]+'...'
426
427
    def date_string(self, rev):
428
        from bzrlib.osutils import format_date
429
        return format_date(rev.timestamp, rev.timezone or 0, 
430
                           self.show_timezone, date_fmt="%Y-%m-%d",
431
                           show_offset=False)
432
433
    def message(self, rev):
434
        if not rev.message:
435
            return '(no message)'
436
        else:
437
            return rev.message
438
439
    def show(self, revno, rev, delta):
1704.2.2 by Martin Pool
Detect terminal width using ioctl
440
        from bzrlib.osutils import terminal_width
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
441
        print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
1185.12.25 by Aaron Bentley
Added one-line log format
442
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
443
    def log_string(self, revno, rev, max_chars):
444
        """Format log info into one string. Truncate tail of string
445
        :param  revno:      revision number (int) or None.
446
                            Revision numbers counts from 1.
447
        :param  rev:        revision info object
448
        :param  max_chars:  maximum length of resulting string
449
        :return:            formatted truncated string
450
        """
451
        out = []
452
        if revno:
453
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
454
            out.append("%s:" % revno)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
455
        out.append(self.truncate(self.short_committer(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
456
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
457
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
458
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
459
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
460
1185.12.27 by Aaron Bentley
Use line log for pending merges
461
def line_log(rev, max_chars):
462
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
463
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
464
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
465
466
class LogFormatterRegistry(registry.Registry):
467
    """Registry for log formatters"""
468
469
    def make_formatter(self, name, *args, **kwargs):
470
        """Construct a formatter from arguments.
471
472
        :param name: Name of the formatter to construct.  'short', 'long' and
473
            'line' are built-in.
474
        """
475
        return self.get(name)(*args, **kwargs)
476
477
    def get_default(self, branch):
478
        return self.get(branch.get_config().log_format())
479
480
481
log_formatter_registry = LogFormatterRegistry()
482
483
484
log_formatter_registry.register('short', ShortLogFormatter,
485
                                'Moderately short log format')
486
log_formatter_registry.register('long', LongLogFormatter,
487
                                'Detailed log format')
488
log_formatter_registry.register('line', LineLogFormatter,
489
                                'Log format with one line per revision')
490
794 by Martin Pool
- Merge John's nice short-log format.
491
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
492
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
493
    log_formatter_registry.register(name, formatter)
494
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
495
794 by Martin Pool
- Merge John's nice short-log format.
496
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
497
    """Construct a formatter from arguments.
498
1185.12.27 by Aaron Bentley
Use line log for pending merges
499
    name -- Name of the formatter to construct; currently 'long', 'short' and
500
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
501
    """
794 by Martin Pool
- Merge John's nice short-log format.
502
    from bzrlib.errors import BzrCommandError
503
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
504
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
505
    except KeyError:
794 by Martin Pool
- Merge John's nice short-log format.
506
        raise BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
507
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
508
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
509
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
510
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
511
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
512
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
513
514
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
515
    """Show the change in revision history comparing the old revision history to the new one.
516
517
    :param branch: The branch where the revisions exist
518
    :param old_rh: The old revision history
519
    :param new_rh: The new revision history
520
    :param to_file: A file to write the results to. If None, stdout will be used
521
    """
522
    if to_file is None:
523
        import sys
524
        import codecs
525
        import bzrlib
526
        to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
527
    lf = log_formatter(log_format,
528
                       show_ids=False,
529
                       to_file=to_file,
530
                       show_timezone='original')
531
532
    # This is the first index which is different between
533
    # old and new
534
    base_idx = None
535
    for i in xrange(max(len(new_rh),
536
                        len(old_rh))):
537
        if (len(new_rh) <= i
538
            or len(old_rh) <= i
539
            or new_rh[i] != old_rh[i]):
540
            base_idx = i
541
            break
542
543
    if base_idx is None:
544
        to_file.write('Nothing seems to have changed\n')
545
        return
546
    ## TODO: It might be nice to do something like show_log
547
    ##       and show the merged entries. But since this is the
548
    ##       removed revisions, it shouldn't be as important
549
    if base_idx < len(old_rh):
550
        to_file.write('*'*60)
551
        to_file.write('\nRemoved Revisions:\n')
552
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
553
            rev = branch.repository.get_revision(old_rh[i])
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
554
            lf.show(i+1, rev, None)
555
        to_file.write('*'*60)
556
        to_file.write('\n\n')
557
    if base_idx < len(new_rh):
558
        to_file.write('Added Revisions:\n')
559
        show_log(branch,
560
                 lf,
561
                 None,
562
                 verbose=True,
563
                 direction='forward',
564
                 start_revision=base_idx+1,
565
                 end_revision=len(new_rh),
566
                 search=None)
567