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