/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
2997.1.2 by Kent Gibson
Move all imports to top of log.py
52
import codecs
53
from itertools import (
54
    izip,
55
    )
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
56
import re
2997.1.2 by Kent Gibson
Move all imports to top of log.py
57
import sys
58
from warnings import (
59
    warn,
60
    )
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
61
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
62
from bzrlib.lazy_import import lazy_import
63
lazy_import(globals(), """
64
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
65
from bzrlib import (
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
66
    config,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
67
    errors,
68
    repository as _mod_repository,
69
    revision as _mod_revision,
70
    revisionspec,
71
    trace,
72
    tsort,
73
    )
74
""")
75
76
from bzrlib import (
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
77
    registry,
2997.1.2 by Kent Gibson
Move all imports to top of log.py
78
    )
79
from bzrlib.osutils import (
80
    format_date,
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
81
    get_terminal_encoding,
2997.1.2 by Kent Gibson
Move all imports to top of log.py
82
    terminal_width,
83
    )
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
84
375 by Martin Pool
- New command touching-revisions and function to trace
85
86
def find_touching_revisions(branch, file_id):
87
    """Yield a description of revisions which affect the file_id.
88
89
    Each returned element is (revno, revision_id, description)
90
91
    This is the list of revisions where the file is either added,
92
    modified, renamed or deleted.
93
94
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
95
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
96
    """
97
    last_ie = None
98
    last_path = None
99
    revno = 1
100
    for revision_id in branch.revision_history():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
101
        this_inv = branch.repository.get_revision_inventory(revision_id)
375 by Martin Pool
- New command touching-revisions and function to trace
102
        if file_id in this_inv:
103
            this_ie = this_inv[file_id]
104
            this_path = this_inv.id2path(file_id)
105
        else:
106
            this_ie = this_path = None
107
108
        # now we know how it was last time, and how it is in this revision.
109
        # are those two states effectively the same or not?
110
111
        if not this_ie and not last_ie:
112
            # not present in either
113
            pass
114
        elif this_ie and not last_ie:
115
            yield revno, revision_id, "added " + this_path
116
        elif not this_ie and last_ie:
117
            # deleted here
118
            yield revno, revision_id, "deleted " + last_path
119
        elif this_path != last_path:
120
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
121
        elif (this_ie.text_size != last_ie.text_size
122
              or this_ie.text_sha1 != last_ie.text_sha1):
123
            yield revno, revision_id, "modified " + this_path
124
125
        last_ie = this_ie
126
        last_path = this_path
127
        revno += 1
128
129
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
130
def _enumerate_history(branch):
131
    rh = []
132
    revno = 1
133
    for rev_id in branch.revision_history():
134
        rh.append((revno, rev_id))
135
        revno += 1
136
    return rh
137
138
378 by Martin Pool
- New usage bzr log FILENAME
139
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
140
             lf,
527 by Martin Pool
- refactor log command
141
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
142
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
143
             direction='reverse',
144
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
145
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
146
             search=None,
147
             limit=None):
369 by Martin Pool
- Split out log printing into new show_log function
148
    """Write out human-readable log of commits to this branch.
149
794 by Martin Pool
- Merge John's nice short-log format.
150
    lf
151
        LogFormatter object to show the output.
152
527 by Martin Pool
- refactor log command
153
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
154
        If true, list only the commits affecting the specified
155
        file, rather than all commits.
156
369 by Martin Pool
- Split out log printing into new show_log function
157
    verbose
158
        If true show added/changed/deleted/renamed files.
159
527 by Martin Pool
- refactor log command
160
    direction
161
        'reverse' (default) is latest to earliest;
162
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
163
164
    start_revision
165
        If not None, only show revisions >= start_revision
166
167
    end_revision
168
        If not None, only show revisions <= end_revision
2466.9.1 by Kent Gibson
add bzr log --limit
169
170
    search
171
        If not None, only show revisions with matching commit messages
172
173
    limit
174
        If not None or 0, only show limit revisions
369 by Martin Pool
- Split out log printing into new show_log function
175
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
176
    branch.lock_read()
177
    try:
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
178
        if getattr(lf, 'begin_log', None):
179
            lf.begin_log()
180
1756.1.6 by Aaron Bentley
Revert locking fix
181
        _show_log(branch, lf, specific_fileid, verbose, direction,
2466.9.1 by Kent Gibson
add bzr log --limit
182
                  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.
183
184
        if getattr(lf, 'end_log', None):
185
            lf.end_log()
1417.1.7 by Robert Collins
teach log it needs a read lock
186
    finally:
187
        branch.unlock()
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
188
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
189
1417.1.7 by Robert Collins
teach log it needs a read lock
190
def _show_log(branch,
191
             lf,
192
             specific_fileid=None,
193
             verbose=False,
194
             direction='reverse',
195
             start_revision=None,
196
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
197
             search=None,
198
             limit=None):
1417.1.7 by Robert Collins
teach log it needs a read lock
199
    """Worker function for show_log - see show_log."""
794 by Martin Pool
- Merge John's nice short-log format.
200
    if not isinstance(lf, LogFormatter):
201
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
202
203
    if specific_fileid:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
204
        trace.mutter('get log for file_id %r', specific_fileid)
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
205
    generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)
206
    allow_single_merge_revision = getattr(lf,
207
        'supports_single_merge_revision', False)
208
    view_revisions = calculate_view_revisions(branch, start_revision,
209
                                              end_revision, direction,
210
                                              specific_fileid,
211
                                              generate_merge_revisions,
212
                                              allow_single_merge_revision)
213
    rev_tag_dict = {}
214
    generate_tags = getattr(lf, 'supports_tags', False)
215
    if generate_tags:
216
        if branch.supports_tags():
217
            rev_tag_dict = branch.tags.get_reverse_tag_dict()
218
219
    generate_delta = verbose and getattr(lf, 'supports_delta', False)
220
221
    # now we just print all the revisions
222
    log_count = 0
3642.1.5 by Robert Collins
Separate out batching of revisions.
223
    revision_iterator = make_log_rev_iterator(branch, view_revisions,
224
        generate_delta, search)
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
225
    for revs in revision_iterator:
226
        for (rev_id, revno, merge_depth), rev, delta in revs:
227
            lr = LogRevision(rev, revno, merge_depth, delta,
228
                             rev_tag_dict.get(rev_id))
229
            lf.log_revision(lr)
230
            if limit:
231
                log_count += 1
232
                if log_count >= limit:
233
                    break
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
234
235
236
def calculate_view_revisions(branch, start_revision, end_revision, direction,
237
                             specific_fileid, generate_merge_revisions,
238
                             allow_single_merge_revision):
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
239
    if (not generate_merge_revisions and start_revision is end_revision is
240
        None and direction == 'reverse' and specific_fileid is None):
241
        return _linear_view_revisions(branch)
242
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
243
    mainline_revs, rev_nos, start_rev_id, end_rev_id = \
244
        _get_mainline_revs(branch, start_revision, end_revision)
245
    if not mainline_revs:
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
246
        return []
1756.2.18 by Aaron Bentley
Factor out the revision list generation
247
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
248
    if direction == 'reverse':
249
        start_rev_id, end_rev_id = end_rev_id, start_rev_id
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
250
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
251
    generate_single_revision = False
2985.1.1 by Aaron Bentley
Better behavior when user requests a log that cannot be viewed (Kent Gibson)
252
    if ((not generate_merge_revisions)
2978.3.2 by Kent Gibson
Use in rather than has_key
253
        and ((start_rev_id and (start_rev_id not in rev_nos))
254
            or (end_rev_id and (end_rev_id not in rev_nos)))):
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
255
        generate_single_revision = ((start_rev_id == end_rev_id)
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
256
            and allow_single_merge_revision)
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
257
        if not generate_single_revision:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
258
            raise errors.BzrCommandError('Selected log formatter only supports'
259
                ' mainline revisions.')
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
260
        generate_merge_revisions = generate_single_revision
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
261
    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.
262
                          direction, include_merges=generate_merge_revisions)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
263
    view_revisions = _filter_revision_range(list(view_revs_iter),
264
                                            start_rev_id,
265
                                            end_rev_id)
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
266
    if view_revisions and generate_single_revision:
267
        view_revisions = view_revisions[0:1]
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
268
    if specific_fileid:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
269
        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.
270
                                                         specific_fileid,
271
                                                         mainline_revs,
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
272
                                                         view_revisions)
2388.1.11 by Alexander Belchenko
changes after John's review
273
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
274
    # rebase merge_depth - unless there are no revisions or 
275
    # either the first or last revision have merge_depth = 0.
276
    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
277
        min_depth = min([d for r,n,d in view_revisions])
278
        if min_depth != 0:
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
279
            view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
280
    return view_revisions
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.
281
530 by Martin Pool
- put back verbose log support for reversed logs
282
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
283
def _linear_view_revisions(branch):
284
    start_revno, start_revision_id = branch.last_revision_info()
285
    repo = branch.repository
286
    revision_ids = repo.iter_reverse_revision_history(start_revision_id)
287
    for num, revision_id in enumerate(revision_ids):
3302.1.4 by Aaron Bentley
Return revno as a string
288
        yield revision_id, str(start_revno - num), 0
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
289
290
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
291
def make_log_rev_iterator(branch, view_revisions, generate_delta, search):
292
    """Create a revision iterator for log.
293
294
    :param branch: The branch being logged.
295
    :param view_revisions: The revisions being viewed.
296
    :param generate_delta: Whether to generate a delta for each revision.
297
    :param search: A user text search string.
3642.1.5 by Robert Collins
Separate out batching of revisions.
298
    :return: An iterator over iterators of ((rev_id, revno, merge_depth), rev,
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
299
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
300
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
301
    # Convert view_revisions into (view, None, None) groups to fit with
302
    # the standard interface here.
303
    if type(view_revisions) == list:
304
        nones = [None] * len(view_revisions)
305
        log_rev_iterator = iter([zip(view_revisions, nones, nones)])
306
    else:
307
        def _convert():
308
            for view in view_revisions:
309
                yield (view, None, None)
310
        log_rev_iterator = iter([_convert()])
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
311
    # core log logic
3642.1.5 by Robert Collins
Separate out batching of revisions.
312
    log_rev_iterator = make_batch_filter(branch, generate_delta, search,
313
        log_rev_iterator)
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
314
    # read revision objects
3642.1.5 by Robert Collins
Separate out batching of revisions.
315
    log_rev_iterator = make_revision_objects(branch, generate_delta, search,
316
        log_rev_iterator)
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
317
    # filter on log messages
3642.1.5 by Robert Collins
Separate out batching of revisions.
318
    log_rev_iterator = make_search_filter(branch, generate_delta, search,
319
        log_rev_iterator)
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
320
    # generate deltas for things we will show
3642.1.5 by Robert Collins
Separate out batching of revisions.
321
    log_rev_iterator = make_delta_filter(branch, generate_delta, search,
322
        log_rev_iterator)
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
323
    return log_rev_iterator
324
325
3642.1.5 by Robert Collins
Separate out batching of revisions.
326
def make_search_filter(branch, generate_delta, search, log_rev_iterator):
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
327
    """Create a filtered iterator of log_rev_iterator matching on a regex.
328
329
    :param branch: The branch being logged.
330
    :param generate_delta: Whether to generate a delta for each revision.
331
    :param search: A user text search string.
332
    :param log_rev_iterator: An input iterator containing all revisions that
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
333
        could be displayed, in lists.
3642.1.5 by Robert Collins
Separate out batching of revisions.
334
    :return: An iterator over iterators of ((rev_id, revno, merge_depth), rev,
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
335
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
336
    """
337
    if search is None:
338
        return log_rev_iterator
339
    # Compile the search now to get early errors.
340
    searchRE = re.compile(search, re.IGNORECASE)
341
    return _filter_message_re(searchRE, log_rev_iterator)
342
343
344
def _filter_message_re(searchRE, log_rev_iterator):
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
345
    for revs in log_rev_iterator:
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
346
        new_revs = []
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
347
        for (rev_id, revno, merge_depth), rev, delta in revs:
348
            if searchRE.search(rev.message):
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
349
                new_revs.append(((rev_id, revno, merge_depth), rev, delta))
350
        yield new_revs
351
352
3642.1.5 by Robert Collins
Separate out batching of revisions.
353
def make_delta_filter(branch, generate_delta, search, log_rev_iterator):
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
354
    """Add revision deltas to a log iterator if needed.
355
356
    :param branch: The branch being logged.
357
    :param generate_delta: Whether to generate a delta for each revision.
358
    :param search: A user text search string.
359
    :param log_rev_iterator: An input iterator containing all revisions that
360
        could be displayed, in lists.
3642.1.5 by Robert Collins
Separate out batching of revisions.
361
    :return: An iterator over iterators of ((rev_id, revno, merge_depth), rev,
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
362
        delta).
363
    """
364
    if not generate_delta:
365
        return log_rev_iterator
366
    return _generate_deltas(branch.repository, log_rev_iterator)
367
368
369
def _generate_deltas(repository, log_rev_iterator):
370
    for revs in log_rev_iterator:
371
        revisions = [rev[1] for rev in revs]
372
        deltas = repository.get_deltas_for_revisions(revisions)
373
        revs = [(rev[0], rev[1], delta) for rev, delta in izip(revs, deltas)]
374
        yield revs
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
375
376
3642.1.5 by Robert Collins
Separate out batching of revisions.
377
def make_revision_objects(branch, generate_delta, search, log_rev_iterator):
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
378
    """Extract revision objects from the repository
379
380
    :param branch: The branch being logged.
381
    :param generate_delta: Whether to generate a delta for each revision.
382
    :param search: A user text search string.
383
    :param log_rev_iterator: An input iterator containing all revisions that
384
        could be displayed, in lists.
3642.1.5 by Robert Collins
Separate out batching of revisions.
385
    :return: An iterator over iterators of ((rev_id, revno, merge_depth), rev,
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
386
        delta).
387
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
388
    repository = branch.repository
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
389
    for revs in log_rev_iterator:
390
        # r = revision_id, n = revno, d = merge depth
391
        revision_ids = [view[0] for view, _, _ in revs]
392
        revisions = repository.get_revisions(revision_ids)
393
        revs = [(rev[0], revision, rev[2]) for rev, revision in
394
            izip(revs, revisions)]
395
        yield revs
396
397
3642.1.5 by Robert Collins
Separate out batching of revisions.
398
def make_batch_filter(branch, generate_delta, search, log_rev_iterator):
399
    """Group up a single large batch into smaller ones.
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
400
401
    :param branch: The branch being logged.
402
    :param generate_delta: Whether to generate a delta for each revision.
403
    :param search: A user text search string.
3642.1.5 by Robert Collins
Separate out batching of revisions.
404
    :param log_rev_iterator: An input iterator containing all revisions that
405
        could be displayed, in lists.
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
406
    :return: An iterator over ((rev_id, revno, merge_depth), rev, delta).
407
    """
408
    repository = branch.repository
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
409
    num = 9
3642.1.5 by Robert Collins
Separate out batching of revisions.
410
    for batch in log_rev_iterator:
411
        batch = iter(batch)
412
        while True:
413
            step = [detail for _, detail in zip(range(num), batch)]
414
            if len(step) == 0:
415
                break
416
            yield step
417
            num = min(int(num * 1.5), 200)
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
418
419
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
420
def _get_mainline_revs(branch, start_revision, end_revision):
421
    """Get the mainline revisions from the branch.
422
    
423
    Generates the list of mainline revisions for the branch.
424
    
425
    :param  branch: The branch containing the revisions. 
426
427
    :param  start_revision: The first revision to be logged.
428
            For backwards compatibility this may be a mainline integer revno,
429
            but for merge revision support a RevisionInfo is expected.
430
431
    :param  end_revision: The last revision to be logged.
432
            For backwards compatibility this may be a mainline integer revno,
433
            but for merge revision support a RevisionInfo is expected.
434
435
    :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
436
    """
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
437
    branch_revno, branch_last_revision = branch.last_revision_info()
438
    if branch_revno == 0:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
439
        return None, None, None, None
440
441
    # For mainline generation, map start_revision and end_revision to 
442
    # mainline revnos. If the revision is not on the mainline choose the 
443
    # appropriate extreme of the mainline instead - the extra will be 
444
    # filtered later.
445
    # Also map the revisions to rev_ids, to be used in the later filtering
446
    # stage.
447
    start_rev_id = None 
448
    if start_revision is None:
449
        start_revno = 1
450
    else:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
451
        if isinstance(start_revision, revisionspec.RevisionInfo):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
452
            start_rev_id = start_revision.rev_id
453
            start_revno = start_revision.revno or 1
454
        else:
455
            branch.check_real_revno(start_revision)
456
            start_revno = start_revision
457
    
458
    end_rev_id = None
459
    if end_revision is None:
3449.2.5 by John Arbash Meinel
Stop referencing the variable I removed.
460
        end_revno = branch_revno
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
461
    else:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
462
        if isinstance(end_revision, revisionspec.RevisionInfo):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
463
            end_rev_id = end_revision.rev_id
3449.2.5 by John Arbash Meinel
Stop referencing the variable I removed.
464
            end_revno = end_revision.revno or branch_revno
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
465
        else:
466
            branch.check_real_revno(end_revision)
467
            end_revno = end_revision
468
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
469
    if ((start_rev_id == _mod_revision.NULL_REVISION)
470
        or (end_rev_id == _mod_revision.NULL_REVISION)):
471
        raise errors.BzrCommandError('Logging revision 0 is invalid.')
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
472
    if start_revno > end_revno:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
473
        raise errors.BzrCommandError("Start revision must be older than "
474
                                     "the end revision.")
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
475
3449.2.7 by John Arbash Meinel
Minor tweak from Ian
476
    if end_revno < start_revno:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
477
        return None, None, None, None
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
478
    cur_revno = branch_revno
479
    rev_nos = {}
480
    mainline_revs = []
481
    for revision_id in branch.repository.iter_reverse_revision_history(
482
                        branch_last_revision):
483
        if cur_revno < start_revno:
3449.2.2 by John Arbash Meinel
Fix bug #172649. Cleanup, and handle the case where we are logging to the first revision.
484
            # We have gone far enough, but we always add 1 more revision
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
485
            rev_nos[revision_id] = cur_revno
486
            mainline_revs.append(revision_id)
487
            break
488
        if cur_revno <= end_revno:
489
            rev_nos[revision_id] = cur_revno
490
            mainline_revs.append(revision_id)
491
        cur_revno -= 1
3449.2.2 by John Arbash Meinel
Fix bug #172649. Cleanup, and handle the case where we are logging to the first revision.
492
    else:
493
        # We walked off the edge of all revisions, so we add a 'None' marker
494
        mainline_revs.append(None)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
495
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
496
    mainline_revs.reverse()
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
497
498
    # override the mainline to look like the revision history.
499
    return mainline_revs, rev_nos, start_rev_id, end_rev_id
500
501
502
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
503
    """Filter view_revisions based on revision ranges.
504
505
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth) 
506
            tuples to be filtered.
507
508
    :param start_rev_id: If not NONE specifies the first revision to be logged.
509
            If NONE then all revisions up to the end_rev_id are logged.
510
511
    :param end_rev_id: If not NONE specifies the last revision to be logged.
512
            If NONE then all revisions up to the end of the log are logged.
513
514
    :return: The filtered view_revisions.
515
    """
516
    if start_rev_id or end_rev_id: 
517
        revision_ids = [r for r, n, d in view_revisions]
518
        if start_rev_id:
519
            start_index = revision_ids.index(start_rev_id)
520
        else:
521
            start_index = 0
522
        if start_rev_id == end_rev_id:
523
            end_index = start_index
524
        else:
525
            if end_rev_id:
526
                end_index = revision_ids.index(end_rev_id)
527
            else:
528
                end_index = len(view_revisions) - 1
529
        # To include the revisions merged into the last revision, 
530
        # extend end_rev_id down to, but not including, the next rev
531
        # with the same or lesser merge_depth
532
        end_merge_depth = view_revisions[end_index][2]
533
        try:
534
            for index in xrange(end_index+1, len(view_revisions)+1):
535
                if view_revisions[index][2] <= end_merge_depth:
536
                    end_index = index - 1
537
                    break
538
        except IndexError:
539
            # if the search falls off the end then log to the end as well
540
            end_index = len(view_revisions) - 1
541
        view_revisions = view_revisions[start_index:end_index+1]
542
    return view_revisions
543
544
545
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
546
                                       view_revs_iter):
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
547
    """Return the list of revision ids which touch a given file id.
548
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
549
    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.
550
    This includes the revisions which directly change the file id,
551
    and the revisions which merge these changes. So if the
552
    revision graph is::
553
        A
554
        |\
555
        B C
556
        |/
557
        D
558
559
    And 'C' changes a file, then both C and D will be returned.
560
561
    This will also can be restricted based on a subset of the mainline.
2359.1.8 by John Arbash Meinel
doc
562
563
    :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.
564
    """
565
    # find all the revisions that change the specific file
566
    # build the ancestry of each revision in the graph
567
    # - only listing the ancestors that change the specific file.
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
568
    graph = branch.repository.get_graph()
569
    # This asks for all mainline revisions, which means we only have to spider
570
    # sideways, rather than depth history. That said, its still size-of-history
571
    # and should be addressed.
3373.5.1 by John Arbash Meinel
bzr log bzr:// was failing at the first revision because it was trying to
572
    # mainline_revisions always includes an extra revision at the beginning, so
573
    # don't request it.
3287.6.8 by Robert Collins
Reduce code duplication as per review.
574
    parent_map = dict(((key, value) for key, value in
3373.5.1 by John Arbash Meinel
bzr log bzr:// was failing at the first revision because it was trying to
575
        graph.iter_ancestry(mainline_revisions[1:]) if value is not None))
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
576
    sorted_rev_list = tsort.topo_sort(parent_map.items())
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
577
    text_keys = [(file_id, rev_id) for rev_id in sorted_rev_list]
578
    modified_text_versions = branch.repository.texts.get_parent_map(text_keys)
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
579
    ancestry = {}
580
    for rev in sorted_rev_list:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
581
        text_key = (file_id, rev)
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
582
        parents = parent_map[rev]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
583
        if text_key not in modified_text_versions and len(parents) == 1:
2359.1.9 by John Arbash Meinel
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
584
            # We will not be adding anything new, so just use a reference to
585
            # the parent ancestry.
586
            rev_ancestry = ancestry[parents[0]]
587
        else:
588
            rev_ancestry = set()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
589
            if text_key in modified_text_versions:
2359.1.9 by John Arbash Meinel
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
590
                rev_ancestry.add(rev)
591
            for parent in parents:
3373.2.1 by John Arbash Meinel
Fix bug #209948, properly skip over ghosts when displaying the changes for a single file.
592
                if parent not in ancestry:
593
                    # parent is a Ghost, which won't be present in
594
                    # sorted_rev_list, but we may access it later, so create an
595
                    # empty node for it
596
                    ancestry[parent] = set()
2359.1.9 by John Arbash Meinel
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
597
                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.
598
        ancestry[rev] = rev_ancestry
599
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
600
    def is_merging_rev(r):
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
601
        parents = parent_map[r]
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
602
        if len(parents) > 1:
603
            leftparent = parents[0]
604
            for rightparent in parents[1:]:
605
                if not ancestry[leftparent].issuperset(
606
                        ancestry[rightparent]):
607
                    return True
608
        return False
609
610
    # filter from the view the revisions that did not change or merge 
611
    # the specific file
612
    return [(r, n, d) for r, n, d in view_revs_iter
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
613
            if (file_id, r) in modified_text_versions or is_merging_rev(r)]
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
614
615
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
616
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
617
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
618
    """Produce an iterator of revisions to show
619
    :return: an iterator of (revision_id, revno, merge_depth)
620
    (if there is no revno for a revision, None is supplied)
621
    """
1756.2.22 by Aaron Bentley
Apply review comments
622
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
623
        revision_ids = mainline_revs[1:]
624
        if direction == 'reverse':
625
            revision_ids.reverse()
626
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
627
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
628
        return
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
629
    graph = branch.repository.get_graph()
630
    # This asks for all mainline revisions, which means we only have to spider
631
    # sideways, rather than depth history. That said, its still size-of-history
632
    # and should be addressed.
3373.5.4 by John Arbash Meinel
Track down another bogus location. Only triggered with --long
633
    # mainline_revisions always includes an extra revision at the beginning, so
634
    # don't request it.
3287.6.8 by Robert Collins
Reduce code duplication as per review.
635
    parent_map = dict(((key, value) for key, value in
3373.5.4 by John Arbash Meinel
Track down another bogus location. Only triggered with --long
636
        graph.iter_ancestry(mainline_revs[1:]) if value is not None))
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
637
    # filter out ghosts; merge_sort errors on ghosts.
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
638
    rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
639
    merge_sorted_revisions = tsort.merge_sort(
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
640
        rev_graph,
1756.2.18 by Aaron Bentley
Factor out the revision list generation
641
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
642
        mainline_revs,
643
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
644
645
    if direction == 'forward':
646
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
647
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
648
    elif direction != 'reverse':
649
        raise ValueError('invalid direction %r' % direction)
650
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
651
    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
652
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
653
654
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
655
def reverse_by_depth(merge_sorted_revisions, _depth=0):
656
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
657
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
658
    Revisions with a different depth are sorted as a group with the previous
659
    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
660
    but it looks much nicer.
661
    """
662
    zd_revisions = []
663
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
664
        if val[2] == _depth:
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
665
            zd_revisions.append([val])
666
        else:
667
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
668
    for revisions in zd_revisions:
669
        if len(revisions) > 1:
670
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
671
    zd_revisions.reverse()
672
    result = []
673
    for chunk in zd_revisions:
674
        result.extend(chunk)
675
    return result
676
677
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.
678
class LogRevision(object):
679
    """A revision to be logged (by LogFormatter.log_revision).
680
681
    A simple wrapper for the attributes of a revision to be logged.
682
    The attributes may or may not be populated, as determined by the 
683
    logging options and the log formatter capabilities.
684
    """
685
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
686
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
687
                 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.
688
        self.rev = rev
689
        self.revno = revno
690
        self.merge_depth = merge_depth
691
        self.delta = delta
692
        self.tags = tags
693
694
794 by Martin Pool
- Merge John's nice short-log format.
695
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.
696
    """Abstract class to display log messages.
697
698
    At a minimum, a derived class must implement the log_revision method.
699
700
    If the LogFormatter needs to be informed of the beginning or end of
701
    a log it should implement the begin_log and/or end_log hook methods.
702
703
    A LogFormatter should define the following supports_XXX flags 
704
    to indicate which LogRevision attributes it supports:
705
706
    - supports_delta must be True if this log formatter supports delta.
707
        Otherwise the delta attribute may not be populated.
708
    - supports_merge_revisions must be True if this log formatter supports 
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
709
        merge revisions.  If not, and if supports_single_merge_revisions is
710
        also not True, then only mainline revisions will be passed to the 
711
        formatter.
712
    - supports_single_merge_revision must be True if this log formatter
713
        supports logging only a single merge revision.  This flag is
714
        only relevant if supports_merge_revisions is not True.
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.
715
    - supports_tags must be True if this log formatter supports tags.
716
        Otherwise the tags attribute may not be populated.
3144.7.1 by Guillermo Gonzalez
* added show_properties to LonLogFormat and the hooks to register custom functions
717
718
    Plugins can register functions to show custom revision properties using
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
719
    the properties_handler_registry. The registered function
3144.7.1 by Guillermo Gonzalez
* added show_properties to LonLogFormat and the hooks to register custom functions
720
    must respect the following interface description:
3144.7.2 by Guillermo Gonzalez
* cleanup a bit the interface
721
        def my_show_properties(properties_dict):
722
            # code that returns a dict {'name':'value'} of the properties 
723
            # to be shown
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.
724
    """
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
725
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
726
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
727
        self.to_file = to_file
728
        self.show_ids = show_ids
729
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
730
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.
731
# TODO: uncomment this block after show() has been removed.
732
# Until then defining log_revision would prevent _show_log calling show() 
733
# in legacy formatters.
734
#    def log_revision(self, revision):
735
#        """Log a revision.
736
#
737
#        :param  revision:   The LogRevision to be logged.
738
#        """
739
#        raise NotImplementedError('not implemented in abstract base')
740
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
741
    def short_committer(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
742
        name, address = config.parse_username(rev.committer)
743
        if name:
3063.3.1 by Lukáš Lalinský
Fall back to showing e-mail in ``log --short/--line`` if the committer/author has only e-mail.
744
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
745
        return address
2388.1.11 by Alexander Belchenko
changes after John's review
746
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.
747
    def short_author(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
748
        name, address = config.parse_username(rev.get_apparent_author())
749
        if name:
3063.3.1 by Lukáš Lalinský
Fall back to showing e-mail in ``log --short/--line`` if the committer/author has only e-mail.
750
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
751
        return address
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
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
753
    def show_properties(self, revision, indent):
3144.7.8 by Guillermo Gonzalez
* added error handling (and logging) to LogFormatter.show_properties when a handler raise an error
754
        """Displays the custom properties returned by each registered handler.
755
        
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
756
        If a registered handler raises an error it is propagated.
3144.7.5 by Guillermo Gonzalez
* some improvements to the doctstring in show_properties method and in LogFormatter
757
        """
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
758
        for key, handler in properties_handler_registry.iteritems():
759
            for key, value in handler(revision).items():
760
                self.to_file.write(indent + key + ': ' + value + '\n')
3144.7.8 by Guillermo Gonzalez
* added error handling (and logging) to LogFormatter.show_properties when a handler raise an error
761
2388.1.11 by Alexander Belchenko
changes after John's review
762
794 by Martin Pool
- Merge John's nice short-log format.
763
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
764
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.
765
    supports_merge_revisions = True
766
    supports_delta = True
767
    supports_tags = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
768
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.
769
    def log_revision(self, revision):
770
        """Log a revision, either merged or not."""
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
771
        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.
772
        to_file = self.to_file
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
773
        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.
774
        if revision.revno is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
775
            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.
776
        if revision.tags:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
777
            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.
778
        if self.show_ids:
3257.2.1 by Adeodato Simó
Add a space after "revision-id:" in log output.
779
            to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
780
            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.
781
            for parent_id in revision.rev.parent_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
782
                to_file.write(indent + 'parent: %s\n' % (parent_id,))
3144.7.11 by Guillermo Gonzalez
* updates LongLogFormatter to pass revision instead of the properties dict to show_properties method
783
        self.show_properties(revision.rev, indent)
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.
784
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
785
        author = revision.rev.properties.get('author', None)
786
        if author is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
787
            to_file.write(indent + 'author: %s\n' % (author,))
788
        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.
789
790
        branch_nick = revision.rev.properties.get('branch-nick', None)
791
        if branch_nick is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
792
            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.
793
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.
794
        date_str = format_date(revision.rev.timestamp,
795
                               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.
796
                               self.show_timezone)
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
797
        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.
798
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
799
        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.
800
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
801
            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.
802
        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.
803
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
804
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
805
                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.
806
        if revision.delta is not None:
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
807
            revision.delta.show(to_file, self.show_ids, indent=indent)
794 by Martin Pool
- Merge John's nice short-log format.
808
809
810
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.
811
812
    supports_delta = True
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
813
    supports_single_merge_revision = True
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.
814
815
    def log_revision(self, revision):
794 by Martin Pool
- Merge John's nice short-log format.
816
        to_file = self.to_file
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
817
        is_merge = ''
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
818
        if len(revision.rev.parent_ids) > 1:
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
819
            is_merge = ' [merge]'
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
820
        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.
821
                self.short_author(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
822
                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.
823
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
824
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
825
                            show_offset=False),
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
826
                is_merge))
794 by Martin Pool
- Merge John's nice short-log format.
827
        if self.show_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
828
            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.
829
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
830
            to_file.write('      (no message)\n')
794 by Martin Pool
- Merge John's nice short-log format.
831
        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.
832
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
833
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
834
                to_file.write('      %s\n' % (l,))
794 by Martin Pool
- Merge John's nice short-log format.
835
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
836
        # TODO: Why not show the modified files in a shorter form as
837
        # 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.
838
        if revision.delta is not None:
839
            revision.delta.show(to_file, self.show_ids)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
840
        to_file.write('\n')
794 by Martin Pool
- Merge John's nice short-log format.
841
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
842
1185.12.25 by Aaron Bentley
Added one-line log format
843
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.
844
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
845
    supports_single_merge_revision = True
846
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.
847
    def __init__(self, *args, **kwargs):
848
        super(LineLogFormatter, self).__init__(*args, **kwargs)
849
        self._max_chars = terminal_width() - 1
850
1185.12.25 by Aaron Bentley
Added one-line log format
851
    def truncate(self, str, max_len):
852
        if len(str) <= max_len:
853
            return str
854
        return str[:max_len-3]+'...'
855
856
    def date_string(self, rev):
857
        return format_date(rev.timestamp, rev.timezone or 0, 
858
                           self.show_timezone, date_fmt="%Y-%m-%d",
859
                           show_offset=False)
860
861
    def message(self, rev):
862
        if not rev.message:
863
            return '(no message)'
864
        else:
865
            return rev.message
866
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.
867
    def log_revision(self, revision):
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
868
        self.to_file.write(self.log_string(revision.revno, revision.rev,
869
                                              self._max_chars))
870
        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.
871
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
872
    def log_string(self, revno, rev, max_chars):
873
        """Format log info into one string. Truncate tail of string
874
        :param  revno:      revision number (int) or None.
875
                            Revision numbers counts from 1.
876
        :param  rev:        revision info object
877
        :param  max_chars:  maximum length of resulting string
878
        :return:            formatted truncated string
879
        """
880
        out = []
881
        if revno:
882
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
883
            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.
884
        out.append(self.truncate(self.short_author(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
885
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
886
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
887
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
888
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
889
1185.12.27 by Aaron Bentley
Use line log for pending merges
890
def line_log(rev, max_chars):
891
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
892
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
893
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
894
895
class LogFormatterRegistry(registry.Registry):
896
    """Registry for log formatters"""
897
898
    def make_formatter(self, name, *args, **kwargs):
899
        """Construct a formatter from arguments.
900
901
        :param name: Name of the formatter to construct.  'short', 'long' and
902
            'line' are built-in.
903
        """
904
        return self.get(name)(*args, **kwargs)
905
906
    def get_default(self, branch):
907
        return self.get(branch.get_config().log_format())
908
909
910
log_formatter_registry = LogFormatterRegistry()
911
912
913
log_formatter_registry.register('short', ShortLogFormatter,
914
                                'Moderately short log format')
915
log_formatter_registry.register('long', LongLogFormatter,
916
                                'Detailed log format')
917
log_formatter_registry.register('line', LineLogFormatter,
918
                                'Log format with one line per revision')
919
794 by Martin Pool
- Merge John's nice short-log format.
920
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
921
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
922
    log_formatter_registry.register(name, formatter)
923
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
924
794 by Martin Pool
- Merge John's nice short-log format.
925
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
926
    """Construct a formatter from arguments.
927
1185.12.27 by Aaron Bentley
Use line log for pending merges
928
    name -- Name of the formatter to construct; currently 'long', 'short' and
929
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
930
    """
794 by Martin Pool
- Merge John's nice short-log format.
931
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
932
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
933
    except KeyError:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
934
        raise errors.BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
935
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
936
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
937
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
938
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
939
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
940
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
941
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
942
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
943
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
944
                           log_format='long'):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
945
    """Show the change in revision history comparing the old revision history to the new one.
946
947
    :param branch: The branch where the revisions exist
948
    :param old_rh: The old revision history
949
    :param new_rh: The new revision history
950
    :param to_file: A file to write the results to. If None, stdout will be used
951
    """
952
    if to_file is None:
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
953
        to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
954
            errors='replace')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
955
    lf = log_formatter(log_format,
956
                       show_ids=False,
957
                       to_file=to_file,
958
                       show_timezone='original')
959
960
    # This is the first index which is different between
961
    # old and new
962
    base_idx = None
963
    for i in xrange(max(len(new_rh),
964
                        len(old_rh))):
965
        if (len(new_rh) <= i
966
            or len(old_rh) <= i
967
            or new_rh[i] != old_rh[i]):
968
            base_idx = i
969
            break
970
971
    if base_idx is None:
972
        to_file.write('Nothing seems to have changed\n')
973
        return
974
    ## TODO: It might be nice to do something like show_log
975
    ##       and show the merged entries. But since this is the
976
    ##       removed revisions, it shouldn't be as important
977
    if base_idx < len(old_rh):
978
        to_file.write('*'*60)
979
        to_file.write('\nRemoved Revisions:\n')
980
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
981
            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
982
            lr = LogRevision(rev, i+1, 0, None)
983
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
984
        to_file.write('*'*60)
985
        to_file.write('\n\n')
986
    if base_idx < len(new_rh):
987
        to_file.write('Added Revisions:\n')
988
        show_log(branch,
989
                 lf,
990
                 None,
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
991
                 verbose=False,
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
992
                 direction='forward',
993
                 start_revision=base_idx+1,
994
                 end_revision=len(new_rh),
995
                 search=None)
996
3144.7.4 by Guillermo Gonzalez
* move the function regisstry into a real Registry instead of a list
997
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
998
properties_handler_registry = registry.Registry()