/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
369 by Martin Pool
- Split out log printing into new show_log function
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
369 by Martin Pool
- Split out log printing into new show_log function
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
369 by Martin Pool
- Split out log printing into new show_log function
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
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
45
relative to its left-most parent, not the delta relative to the last
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
46
logged revision.  So for example if you ask for a verbose log of
47
changes touching hello.c you will get a list of those revisions also
48
listing other things that were changed in the same revision, but not
49
all the changes since the previous revision that touched hello.c.
527 by Martin Pool
- refactor log command
50
"""
51
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
52
# TODO: option to show delta summaries for merged-in revisions
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
53
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
54
from itertools import izip
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
55
import re
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
56
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
57
from bzrlib import (
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
58
    registry,
59
    symbol_versioning,
60
    )
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
61
import bzrlib.errors as errors
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
62
from bzrlib.revisionspec import(
63
    RevisionInfo
64
    )
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
65
from bzrlib.symbol_versioning import (
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
66
    deprecated_method,
67
    zero_seventeen,
68
    )
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
69
from bzrlib.trace import mutter
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
70
from bzrlib.tsort import (
2359.1.2 by Kent Gibson
add logging of merge revisions
71
    merge_sort,
72
    topo_sort,
73
    )
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
74
375 by Martin Pool
- New command touching-revisions and function to trace
75
76
def find_touching_revisions(branch, file_id):
77
    """Yield a description of revisions which affect the file_id.
78
79
    Each returned element is (revno, revision_id, description)
80
81
    This is the list of revisions where the file is either added,
82
    modified, renamed or deleted.
83
84
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
85
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
86
    """
87
    last_ie = None
88
    last_path = None
89
    revno = 1
90
    for revision_id in branch.revision_history():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
91
        this_inv = branch.repository.get_revision_inventory(revision_id)
375 by Martin Pool
- New command touching-revisions and function to trace
92
        if file_id in this_inv:
93
            this_ie = this_inv[file_id]
94
            this_path = this_inv.id2path(file_id)
95
        else:
96
            this_ie = this_path = None
97
98
        # now we know how it was last time, and how it is in this revision.
99
        # are those two states effectively the same or not?
100
101
        if not this_ie and not last_ie:
102
            # not present in either
103
            pass
104
        elif this_ie and not last_ie:
105
            yield revno, revision_id, "added " + this_path
106
        elif not this_ie and last_ie:
107
            # deleted here
108
            yield revno, revision_id, "deleted " + last_path
109
        elif this_path != last_path:
110
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
111
        elif (this_ie.text_size != last_ie.text_size
112
              or this_ie.text_sha1 != last_ie.text_sha1):
113
            yield revno, revision_id, "modified " + this_path
114
115
        last_ie = this_ie
116
        last_path = this_path
117
        revno += 1
118
119
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
120
def _enumerate_history(branch):
121
    rh = []
122
    revno = 1
123
    for rev_id in branch.revision_history():
124
        rh.append((revno, rev_id))
125
        revno += 1
126
    return rh
127
128
378 by Martin Pool
- New usage bzr log FILENAME
129
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
130
             lf,
527 by Martin Pool
- refactor log command
131
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
132
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
133
             direction='reverse',
134
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
135
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
136
             search=None,
137
             limit=None):
369 by Martin Pool
- Split out log printing into new show_log function
138
    """Write out human-readable log of commits to this branch.
139
794 by Martin Pool
- Merge John's nice short-log format.
140
    lf
141
        LogFormatter object to show the output.
142
527 by Martin Pool
- refactor log command
143
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
144
        If true, list only the commits affecting the specified
145
        file, rather than all commits.
146
369 by Martin Pool
- Split out log printing into new show_log function
147
    verbose
148
        If true show added/changed/deleted/renamed files.
149
527 by Martin Pool
- refactor log command
150
    direction
151
        'reverse' (default) is latest to earliest;
152
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
153
154
    start_revision
155
        If not None, only show revisions >= start_revision
156
157
    end_revision
158
        If not None, only show revisions <= end_revision
2466.9.1 by Kent Gibson
add bzr log --limit
159
160
    search
161
        If not None, only show revisions with matching commit messages
162
163
    limit
164
        If not None or 0, only show limit revisions
369 by Martin Pool
- Split out log printing into new show_log function
165
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
166
    branch.lock_read()
167
    try:
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
168
        if getattr(lf, 'begin_log', None):
169
            lf.begin_log()
170
1756.1.6 by Aaron Bentley
Revert locking fix
171
        _show_log(branch, lf, specific_fileid, verbose, direction,
2466.9.1 by Kent Gibson
add bzr log --limit
172
                  start_revision, end_revision, search, limit)
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
173
174
        if getattr(lf, 'end_log', None):
175
            lf.end_log()
1417.1.7 by Robert Collins
teach log it needs a read lock
176
    finally:
177
        branch.unlock()
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
178
1417.1.7 by Robert Collins
teach log it needs a read lock
179
def _show_log(branch,
180
             lf,
181
             specific_fileid=None,
182
             verbose=False,
183
             direction='reverse',
184
             start_revision=None,
185
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
186
             search=None,
187
             limit=None):
1417.1.7 by Robert Collins
teach log it needs a read lock
188
    """Worker function for show_log - see show_log."""
794 by Martin Pool
- Merge John's nice short-log format.
189
    from bzrlib.osutils import format_date
190
    from bzrlib.errors import BzrCheckError
191
    
192
    from warnings import warn
369 by Martin Pool
- Split out log printing into new show_log function
193
794 by Martin Pool
- Merge John's nice short-log format.
194
    if not isinstance(lf, LogFormatter):
195
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
196
197
    if specific_fileid:
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
198
        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
199
900 by Martin Pool
- patch from john to search for matching commits
200
    if search is not None:
201
        import re
202
        searchRE = re.compile(search, re.IGNORECASE)
203
    else:
204
        searchRE = None
205
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
206
    mainline_revs, rev_nos, start_rev_id, end_rev_id = \
207
        _get_mainline_revs(branch, start_revision, end_revision)
208
    if not mainline_revs:
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
209
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
210
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
211
    if direction == 'reverse':
212
        start_rev_id, end_rev_id = end_rev_id, start_rev_id
213
        
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
214
    legacy_lf = getattr(lf, 'log_revision', None) is None
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
215
    if legacy_lf:
216
        # pre-0.17 formatters use show for mainline revisions.
217
        # how should we show merged revisions ?
218
        #   pre-0.11 api: show_merge
219
        #   0.11-0.16 api: show_merge_revno
220
        show_merge_revno = getattr(lf, 'show_merge_revno', None)
221
        show_merge = getattr(lf, 'show_merge', None)
222
        if show_merge is None and show_merge_revno is None:
223
            # no merged-revno support
224
            generate_merge_revisions = False
225
        else:
226
            generate_merge_revisions = True
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
227
        # tell developers to update their code
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
228
        symbol_versioning.warn('LogFormatters should provide log_revision '
229
            'instead of show and show_merge_revno since bzr 0.17.',
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
230
            DeprecationWarning, stacklevel=3)
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
231
    else:
232
        generate_merge_revisions = getattr(lf, 'supports_merge_revisions', 
233
                                           False)
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
234
    view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
235
                          direction, include_merges=generate_merge_revisions)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
236
    view_revisions = _filter_revision_range(list(view_revs_iter),
237
                                            start_rev_id,
238
                                            end_rev_id)
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
239
    if specific_fileid:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
240
        view_revisions = _filter_revisions_touching_file_id(branch,
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
241
                                                         specific_fileid,
242
                                                         mainline_revs,
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
243
                                                         view_revisions)
2388.1.11 by Alexander Belchenko
changes after John's review
244
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
245
    # rebase merge_depth - unless there are no revisions or 
246
    # either the first or last revision have merge_depth = 0.
247
    if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
2466.12.3 by Kent Gibson
Fix JAM's review comments for left align patch
248
        min_depth = min([d for r,n,d in view_revisions])
249
        if min_depth != 0:
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
250
            view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
251
        
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
252
    rev_tag_dict = {}
253
    generate_tags = getattr(lf, 'supports_tags', False)
254
    if generate_tags:
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
255
        if branch.supports_tags():
256
            rev_tag_dict = branch.tags.get_reverse_tag_dict()
2388.1.11 by Alexander Belchenko
changes after John's review
257
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
258
    generate_delta = verbose and getattr(lf, 'supports_delta', False)
259
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
260
    def iter_revisions():
1756.3.22 by Aaron Bentley
Tweaks from review
261
        # r = revision, n = revno, d = merge depth
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
262
        revision_ids = [r for r, n, d in view_revisions]
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
263
        num = 9
1756.3.22 by Aaron Bentley
Tweaks from review
264
        repository = branch.repository
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
265
        while revision_ids:
1756.3.22 by Aaron Bentley
Tweaks from review
266
            cur_deltas = {}
267
            revisions = repository.get_revisions(revision_ids[:num])
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
268
            if generate_delta:
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
269
                deltas = repository.get_deltas_for_revisions(revisions)
270
                cur_deltas = dict(izip((r.revision_id for r in revisions),
271
                                       deltas))
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
272
            for revision in revisions:
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
273
                yield revision, cur_deltas.get(revision.revision_id)
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
274
            revision_ids  = revision_ids[num:]
2359.1.2 by Kent Gibson
add logging of merge revisions
275
            num = min(int(num * 1.5), 200)
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
276
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
277
    # now we just print all the revisions
2466.9.1 by Kent Gibson
add bzr log --limit
278
    log_count = 0
1756.3.2 by Aaron Bentley
Refactor revision_delta call
279
    for ((rev_id, revno, merge_depth), (rev, delta)) in \
1756.2.18 by Aaron Bentley
Factor out the revision list generation
280
         izip(view_revisions, iter_revisions()):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
281
282
        if searchRE:
283
            if not searchRE.search(rev.message):
284
                continue
285
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
286
        if not legacy_lf:
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
287
            lr = LogRevision(rev, revno, merge_depth, delta,
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
288
                             rev_tag_dict.get(rev_id))
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
289
            lf.log_revision(lr)
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
290
        else:
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
291
            # support for legacy (pre-0.17) LogFormatters
292
            if merge_depth == 0:
293
                if generate_tags:
294
                    lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
295
                else:
296
                    lf.show(revno, rev, delta)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
297
            else:
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
298
                if show_merge_revno is None:
299
                    lf.show_merge(rev, merge_depth)
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
300
                else:
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
301
                    if generate_tags:
302
                        lf.show_merge_revno(rev, merge_depth, revno,
303
                                            rev_tag_dict.get(rev_id))
304
                    else:
305
                        lf.show_merge_revno(rev, merge_depth, revno)
2466.9.1 by Kent Gibson
add bzr log --limit
306
        if limit:
307
            log_count += 1
308
            if log_count >= limit:
309
                break
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
310
530 by Martin Pool
- put back verbose log support for reversed logs
311
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
312
def _get_mainline_revs(branch, start_revision, end_revision):
313
    """Get the mainline revisions from the branch.
314
    
315
    Generates the list of mainline revisions for the branch.
316
    
317
    :param  branch: The branch containing the revisions. 
318
319
    :param  start_revision: The first revision to be logged.
320
            For backwards compatibility this may be a mainline integer revno,
321
            but for merge revision support a RevisionInfo is expected.
322
323
    :param  end_revision: The last revision to be logged.
324
            For backwards compatibility this may be a mainline integer revno,
325
            but for merge revision support a RevisionInfo is expected.
326
327
    :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
328
    """
329
    which_revs = _enumerate_history(branch)
330
    if not which_revs:
331
        return None, None, None, None
332
333
    # For mainline generation, map start_revision and end_revision to 
334
    # mainline revnos. If the revision is not on the mainline choose the 
335
    # appropriate extreme of the mainline instead - the extra will be 
336
    # filtered later.
337
    # Also map the revisions to rev_ids, to be used in the later filtering
338
    # stage.
339
    start_rev_id = None 
340
    if start_revision is None:
341
        start_revno = 1
342
    else:
343
        if isinstance(start_revision,RevisionInfo):
344
            start_rev_id = start_revision.rev_id
345
            start_revno = start_revision.revno or 1
346
        else:
347
            branch.check_real_revno(start_revision)
348
            start_revno = start_revision
349
    
350
    end_rev_id = None
351
    if end_revision is None:
352
        end_revno = len(which_revs)
353
    else:
354
        if isinstance(end_revision,RevisionInfo):
355
            end_rev_id = end_revision.rev_id
356
            end_revno = end_revision.revno or len(which_revs)
357
        else:
358
            branch.check_real_revno(end_revision)
359
            end_revno = end_revision
360
361
    if start_revno > end_revno:
362
        from bzrlib.errors import BzrCommandError
363
        raise BzrCommandError("Start revision must be older than "
364
                              "the end revision.")
365
366
    # list indexes are 0-based; revisions are 1-based
367
    cut_revs = which_revs[(start_revno-1):(end_revno)]
368
    if not cut_revs:
369
        return None, None, None, None
370
371
    # convert the revision history to a dictionary:
372
    rev_nos = dict((k, v) for v, k in cut_revs)
373
374
    # override the mainline to look like the revision history.
375
    mainline_revs = [revision_id for index, revision_id in cut_revs]
376
    if cut_revs[0][0] == 1:
377
        mainline_revs.insert(0, None)
378
    else:
379
        mainline_revs.insert(0, which_revs[start_revno-2][1])
380
    return mainline_revs, rev_nos, start_rev_id, end_rev_id
381
382
383
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
384
    """Filter view_revisions based on revision ranges.
385
386
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth) 
387
            tuples to be filtered.
388
389
    :param start_rev_id: If not NONE specifies the first revision to be logged.
390
            If NONE then all revisions up to the end_rev_id are logged.
391
392
    :param end_rev_id: If not NONE specifies the last revision to be logged.
393
            If NONE then all revisions up to the end of the log are logged.
394
395
    :return: The filtered view_revisions.
396
    """
397
    if start_rev_id or end_rev_id: 
398
        revision_ids = [r for r, n, d in view_revisions]
399
        if start_rev_id:
400
            start_index = revision_ids.index(start_rev_id)
401
        else:
402
            start_index = 0
403
        if start_rev_id == end_rev_id:
404
            end_index = start_index
405
        else:
406
            if end_rev_id:
407
                end_index = revision_ids.index(end_rev_id)
408
            else:
409
                end_index = len(view_revisions) - 1
410
        # To include the revisions merged into the last revision, 
411
        # extend end_rev_id down to, but not including, the next rev
412
        # with the same or lesser merge_depth
413
        end_merge_depth = view_revisions[end_index][2]
414
        try:
415
            for index in xrange(end_index+1, len(view_revisions)+1):
416
                if view_revisions[index][2] <= end_merge_depth:
417
                    end_index = index - 1
418
                    break
419
        except IndexError:
420
            # if the search falls off the end then log to the end as well
421
            end_index = len(view_revisions) - 1
422
        view_revisions = view_revisions[start_index:end_index+1]
423
    return view_revisions
424
425
426
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
427
                                       view_revs_iter):
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
428
    """Return the list of revision ids which touch a given file id.
429
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
430
    The function filters view_revisions and returns a subset.
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
431
    This includes the revisions which directly change the file id,
432
    and the revisions which merge these changes. So if the
433
    revision graph is::
434
        A
435
        |\
436
        B C
437
        |/
438
        D
439
440
    And 'C' changes a file, then both C and D will be returned.
441
442
    This will also can be restricted based on a subset of the mainline.
2359.1.8 by John Arbash Meinel
doc
443
444
    :return: A list of (revision_id, dotted_revno, merge_depth) tuples.
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
445
    """
446
    # find all the revisions that change the specific file
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
447
    file_weave = branch.repository.weave_store.get_weave(file_id,
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
448
                branch.repository.get_transaction())
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
449
    weave_modifed_revisions = set(file_weave.versions())
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
450
    # build the ancestry of each revision in the graph
451
    # - only listing the ancestors that change the specific file.
452
    rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1])
453
    sorted_rev_list = topo_sort(rev_graph)
454
    ancestry = {}
455
    for rev in sorted_rev_list:
2359.1.9 by John Arbash Meinel
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
456
        parents = rev_graph[rev]
457
        if rev not in weave_modifed_revisions and len(parents) == 1:
458
            # We will not be adding anything new, so just use a reference to
459
            # the parent ancestry.
460
            rev_ancestry = ancestry[parents[0]]
461
        else:
462
            rev_ancestry = set()
463
            if rev in weave_modifed_revisions:
464
                rev_ancestry.add(rev)
465
            for parent in parents:
466
                rev_ancestry = rev_ancestry.union(ancestry[parent])
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
467
        ancestry[rev] = rev_ancestry
468
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
469
    def is_merging_rev(r):
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
470
        parents = rev_graph[r]
471
        if len(parents) > 1:
472
            leftparent = parents[0]
473
            for rightparent in parents[1:]:
474
                if not ancestry[leftparent].issuperset(
475
                        ancestry[rightparent]):
476
                    return True
477
        return False
478
479
    # filter from the view the revisions that did not change or merge 
480
    # the specific file
481
    return [(r, n, d) for r, n, d in view_revs_iter
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
482
            if r in weave_modifed_revisions or is_merging_rev(r)]
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
483
484
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
485
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
486
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
487
    """Produce an iterator of revisions to show
488
    :return: an iterator of (revision_id, revno, merge_depth)
489
    (if there is no revno for a revision, None is supplied)
490
    """
1756.2.22 by Aaron Bentley
Apply review comments
491
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
492
        revision_ids = mainline_revs[1:]
493
        if direction == 'reverse':
494
            revision_ids.reverse()
495
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
496
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
497
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
498
    merge_sorted_revisions = merge_sort(
499
        branch.repository.get_revision_graph(mainline_revs[-1]),
500
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
501
        mainline_revs,
502
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
503
504
    if direction == 'forward':
505
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
506
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
507
    elif direction != 'reverse':
508
        raise ValueError('invalid direction %r' % direction)
509
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
510
    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
511
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
512
513
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
514
def reverse_by_depth(merge_sorted_revisions, _depth=0):
515
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
516
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
517
    Revisions with a different depth are sorted as a group with the previous
518
    revision of that depth.  There may be no topological justification for this,
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
519
    but it looks much nicer.
520
    """
521
    zd_revisions = []
522
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
523
        if val[2] == _depth:
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
524
            zd_revisions.append([val])
525
        else:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
526
            assert val[2] > _depth
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
527
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
528
    for revisions in zd_revisions:
529
        if len(revisions) > 1:
530
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
531
    zd_revisions.reverse()
532
    result = []
533
    for chunk in zd_revisions:
534
        result.extend(chunk)
535
    return result
536
537
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
538
class LogRevision(object):
539
    """A revision to be logged (by LogFormatter.log_revision).
540
541
    A simple wrapper for the attributes of a revision to be logged.
542
    The attributes may or may not be populated, as determined by the 
543
    logging options and the log formatter capabilities.
544
    """
545
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
546
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
547
                 tags=None):
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
548
        self.rev = rev
549
        self.revno = revno
550
        self.merge_depth = merge_depth
551
        self.delta = delta
552
        self.tags = tags
553
554
794 by Martin Pool
- Merge John's nice short-log format.
555
class LogFormatter(object):
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
556
    """Abstract class to display log messages.
557
558
    At a minimum, a derived class must implement the log_revision method.
559
560
    If the LogFormatter needs to be informed of the beginning or end of
561
    a log it should implement the begin_log and/or end_log hook methods.
562
563
    A LogFormatter should define the following supports_XXX flags 
564
    to indicate which LogRevision attributes it supports:
565
566
    - supports_delta must be True if this log formatter supports delta.
567
        Otherwise the delta attribute may not be populated.
568
    - supports_merge_revisions must be True if this log formatter supports 
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
569
        merge revisions.  If not, only mainline revisions (those 
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
570
        with merge_depth == 0) will be passed to the formatter.
571
    - supports_tags must be True if this log formatter supports tags.
572
        Otherwise the tags attribute may not be populated.
573
    """
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
574
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
575
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
576
        self.to_file = to_file
577
        self.show_ids = show_ids
578
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
579
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
580
# TODO: uncomment this block after show() has been removed.
581
# Until then defining log_revision would prevent _show_log calling show() 
582
# in legacy formatters.
583
#    def log_revision(self, revision):
584
#        """Log a revision.
585
#
586
#        :param  revision:   The LogRevision to be logged.
587
#        """
588
#        raise NotImplementedError('not implemented in abstract base')
589
590
    @deprecated_method(zero_seventeen)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
591
    def show(self, revno, rev, delta):
592
        raise NotImplementedError('not implemented in abstract base')
1393.1.56 by Martin Pool
- doc and small refactoring of log code
593
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
594
    def short_committer(self, rev):
595
        return re.sub('<.*@.*>', '', rev.committer).strip(' ')
2388.1.11 by Alexander Belchenko
changes after John's review
596
597
794 by Martin Pool
- Merge John's nice short-log format.
598
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
599
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
600
    supports_merge_revisions = True
601
    supports_delta = True
602
    supports_tags = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
603
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
604
    @deprecated_method(zero_seventeen)
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
605
    def show(self, revno, rev, delta, tags=None):
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
606
        lr = LogRevision(rev, revno, 0, delta, tags)
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
607
        return self.log_revision(lr)
794 by Martin Pool
- Merge John's nice short-log format.
608
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
609
    @deprecated_method(zero_seventeen)
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
610
    def show_merge_revno(self, rev, merge_depth, revno, tags=None):
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
611
        """Show a merged revision rev, with merge_depth and a revno."""
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
612
        lr = LogRevision(rev, revno, merge_depth, tags=tags)
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
613
        return self.log_revision(lr)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
614
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
615
    def log_revision(self, revision):
616
        """Log 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)
617
        from bzrlib.osutils import format_date
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
618
        indent = '    '*revision.merge_depth
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
619
        to_file = self.to_file
620
        print >>to_file,  indent+'-' * 60
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
621
        if revision.revno is not None:
622
            print >>to_file,  indent+'revno:', revision.revno
623
        if revision.tags:
624
            print >>to_file, indent+'tags: %s' % (', '.join(revision.tags))
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
625
        if self.show_ids:
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
626
            print >>to_file, indent+'revision-id:', revision.rev.revision_id
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
627
            for parent_id in revision.rev.parent_ids:
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
628
                print >>to_file, indent+'parent:', parent_id
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
629
        print >>to_file, indent+'committer:', revision.rev.committer
2388.1.11 by Alexander Belchenko
changes after John's review
630
1185.35.17 by Aaron Bentley
Added branch nicks to long-format logs
631
        try:
632
            print >>to_file, indent+'branch nick: %s' % \
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
633
                revision.rev.properties['branch-nick']
1185.35.17 by Aaron Bentley
Added branch nicks to long-format logs
634
        except KeyError:
635
            pass
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
636
        date_str = format_date(revision.rev.timestamp,
637
                               revision.rev.timezone or 0,
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
638
                               self.show_timezone)
639
        print >>to_file,  indent+'timestamp: %s' % date_str
640
641
        print >>to_file,  indent+'message:'
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
642
        if not revision.rev.message:
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
643
            print >>to_file,  indent+'  (no message)'
644
        else:
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
645
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
646
            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.
647
                print >>to_file,  indent+'  ' + l
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
648
        if revision.delta is not None:
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
649
            revision.delta.show(to_file, self.show_ids, indent=indent)
794 by Martin Pool
- Merge John's nice short-log format.
650
651
652
class ShortLogFormatter(LogFormatter):
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
653
654
    supports_delta = True
655
656
    @deprecated_method(zero_seventeen)
794 by Martin Pool
- Merge John's nice short-log format.
657
    def show(self, revno, rev, delta):
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
658
        lr = LogRevision(rev, revno, 0, delta)
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
659
        return self.log_revision(lr)
660
661
    def log_revision(self, revision):
794 by Martin Pool
- Merge John's nice short-log format.
662
        from bzrlib.osutils import format_date
663
664
        to_file = self.to_file
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
665
        date_str = format_date(revision.rev.timestamp,
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
666
                               revision.rev.timezone or 0,
667
                               self.show_timezone)
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
668
        is_merge = ''
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
669
        if len(revision.rev.parent_ids) > 1:
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
670
            is_merge = ' [merge]'
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
671
        print >>to_file, "%5s %s\t%s%s" % (revision.revno,
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
672
                self.short_committer(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
673
                format_date(revision.rev.timestamp,
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
674
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
675
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
676
                            show_offset=False),
677
                is_merge)
794 by Martin Pool
- Merge John's nice short-log format.
678
        if self.show_ids:
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
679
            print >>to_file,  '      revision-id:', revision.rev.revision_id
680
        if not revision.rev.message:
794 by Martin Pool
- Merge John's nice short-log format.
681
            print >>to_file,  '      (no message)'
682
        else:
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
683
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
684
            for l in message.split('\n'):
794 by Martin Pool
- Merge John's nice short-log format.
685
                print >>to_file,  '      ' + l
686
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
687
        # TODO: Why not show the modified files in a shorter form as
688
        # well? rewrap them single lines of appropriate length
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
689
        if revision.delta is not None:
690
            revision.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.
691
        print >>to_file, ''
794 by Martin Pool
- Merge John's nice short-log format.
692
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
693
1185.12.25 by Aaron Bentley
Added one-line log format
694
class LineLogFormatter(LogFormatter):
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
695
696
    def __init__(self, *args, **kwargs):
697
        from bzrlib.osutils import terminal_width
698
        super(LineLogFormatter, self).__init__(*args, **kwargs)
699
        self._max_chars = terminal_width() - 1
700
1185.12.25 by Aaron Bentley
Added one-line log format
701
    def truncate(self, str, max_len):
702
        if len(str) <= max_len:
703
            return str
704
        return str[:max_len-3]+'...'
705
706
    def date_string(self, rev):
707
        from bzrlib.osutils import format_date
708
        return format_date(rev.timestamp, rev.timezone or 0, 
709
                           self.show_timezone, date_fmt="%Y-%m-%d",
710
                           show_offset=False)
711
712
    def message(self, rev):
713
        if not rev.message:
714
            return '(no message)'
715
        else:
716
            return rev.message
717
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
718
    @deprecated_method(zero_seventeen)
1185.12.25 by Aaron Bentley
Added one-line log format
719
    def show(self, revno, rev, delta):
1704.2.2 by Martin Pool
Detect terminal width using ioctl
720
        from bzrlib.osutils import terminal_width
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
721
        print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
1185.12.25 by Aaron Bentley
Added one-line log format
722
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
723
    def log_revision(self, revision):
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
724
        print >>self.to_file, self.log_string(revision.revno, revision.rev,
725
                                              self._max_chars)
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
726
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
727
    def log_string(self, revno, rev, max_chars):
728
        """Format log info into one string. Truncate tail of string
729
        :param  revno:      revision number (int) or None.
730
                            Revision numbers counts from 1.
731
        :param  rev:        revision info object
732
        :param  max_chars:  maximum length of resulting string
733
        :return:            formatted truncated string
734
        """
735
        out = []
736
        if revno:
737
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
738
            out.append("%s:" % revno)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
739
        out.append(self.truncate(self.short_committer(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
740
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
741
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
742
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
743
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
744
1185.12.27 by Aaron Bentley
Use line log for pending merges
745
def line_log(rev, max_chars):
746
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
747
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
748
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
749
750
class LogFormatterRegistry(registry.Registry):
751
    """Registry for log formatters"""
752
753
    def make_formatter(self, name, *args, **kwargs):
754
        """Construct a formatter from arguments.
755
756
        :param name: Name of the formatter to construct.  'short', 'long' and
757
            'line' are built-in.
758
        """
759
        return self.get(name)(*args, **kwargs)
760
761
    def get_default(self, branch):
762
        return self.get(branch.get_config().log_format())
763
764
765
log_formatter_registry = LogFormatterRegistry()
766
767
768
log_formatter_registry.register('short', ShortLogFormatter,
769
                                'Moderately short log format')
770
log_formatter_registry.register('long', LongLogFormatter,
771
                                'Detailed log format')
772
log_formatter_registry.register('line', LineLogFormatter,
773
                                'Log format with one line per revision')
774
794 by Martin Pool
- Merge John's nice short-log format.
775
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
776
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
777
    log_formatter_registry.register(name, formatter)
778
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
779
794 by Martin Pool
- Merge John's nice short-log format.
780
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
781
    """Construct a formatter from arguments.
782
1185.12.27 by Aaron Bentley
Use line log for pending merges
783
    name -- Name of the formatter to construct; currently 'long', 'short' and
784
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
785
    """
794 by Martin Pool
- Merge John's nice short-log format.
786
    from bzrlib.errors import BzrCommandError
787
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
788
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
789
    except KeyError:
794 by Martin Pool
- Merge John's nice short-log format.
790
        raise BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
791
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
792
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
793
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
794
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
795
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
796
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
797
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
798
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
799
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
800
    """Show the change in revision history comparing the old revision history to the new one.
801
802
    :param branch: The branch where the revisions exist
803
    :param old_rh: The old revision history
804
    :param new_rh: The new revision history
805
    :param to_file: A file to write the results to. If None, stdout will be used
806
    """
807
    if to_file is None:
808
        import sys
809
        import codecs
810
        import bzrlib
811
        to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
812
    lf = log_formatter(log_format,
813
                       show_ids=False,
814
                       to_file=to_file,
815
                       show_timezone='original')
816
817
    # This is the first index which is different between
818
    # old and new
819
    base_idx = None
820
    for i in xrange(max(len(new_rh),
821
                        len(old_rh))):
822
        if (len(new_rh) <= i
823
            or len(old_rh) <= i
824
            or new_rh[i] != old_rh[i]):
825
            base_idx = i
826
            break
827
828
    if base_idx is None:
829
        to_file.write('Nothing seems to have changed\n')
830
        return
831
    ## TODO: It might be nice to do something like show_log
832
    ##       and show the merged entries. But since this is the
833
    ##       removed revisions, it shouldn't be as important
834
    if base_idx < len(old_rh):
835
        to_file.write('*'*60)
836
        to_file.write('\nRemoved Revisions:\n')
837
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
838
            rev = branch.repository.get_revision(old_rh[i])
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
839
            lr = LogRevision(rev, i+1, 0, None)
840
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
841
        to_file.write('*'*60)
842
        to_file.write('\n\n')
843
    if base_idx < len(new_rh):
844
        to_file.write('Added Revisions:\n')
845
        show_log(branch,
846
                 lf,
847
                 None,
848
                 verbose=True,
849
                 direction='forward',
850
                 start_revision=base_idx+1,
851
                 end_revision=len(new_rh),
852
                 search=None)
853