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