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