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