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