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