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