/brz/remove-bazaar

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