/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
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
62
from bzrlib.lazy_import import lazy_import
63
lazy_import(globals(), """
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
64
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
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,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
67
    errors,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
68
    repository as _mod_repository,
69
    revision as _mod_revision,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
70
    revisionspec,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
71
    trace,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
72
    tsort,
73
    )
74
""")
75
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
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
3874.2.2 by Vincent Ladeuil
Cleanup show_log doc string.
150
    :param lf: The LogFormatter object showing the output.
151
152
    :param specific_fileid: If not None, list only the commits affecting the
153
        specified file, rather than all commits.
154
155
    :param verbose: If True show added/changed/deleted/renamed files.
156
157
    :param direction: 'reverse' (default) is latest to earliest; 'forward' is
158
        earliest to latest.
159
160
    :param start_revision: If not None, only show revisions >= start_revision
161
162
    :param end_revision: If not None, only show revisions <= end_revision
163
164
    :param search: If not None, only show revisions with matching commit
165
        messages
166
167
    :param limit: If set, shows only 'limit' revisions, all revisions are shown
168
        if None or 0.
369 by Martin Pool
- Split out log printing into new show_log function
169
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
170
    branch.lock_read()
171
    try:
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
172
        if getattr(lf, 'begin_log', None):
173
            lf.begin_log()
174
1756.1.6 by Aaron Bentley
Revert locking fix
175
        _show_log(branch, lf, specific_fileid, verbose, direction,
2466.9.1 by Kent Gibson
add bzr log --limit
176
                  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.
177
178
        if getattr(lf, 'end_log', None):
179
            lf.end_log()
1417.1.7 by Robert Collins
teach log it needs a read lock
180
    finally:
181
        branch.unlock()
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
182
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
183
1417.1.7 by Robert Collins
teach log it needs a read lock
184
def _show_log(branch,
185
             lf,
186
             specific_fileid=None,
187
             verbose=False,
188
             direction='reverse',
189
             start_revision=None,
190
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
191
             search=None,
192
             limit=None):
1417.1.7 by Robert Collins
teach log it needs a read lock
193
    """Worker function for show_log - see show_log."""
794 by Martin Pool
- Merge John's nice short-log format.
194
    if not isinstance(lf, LogFormatter):
195
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
196
    if specific_fileid:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
197
        trace.mutter('get log for file_id %r', specific_fileid)
3936.3.1 by Ian Clatworthy
refactor _show_log
198
199
    # Consult the LogFormatter about what it needs and can handle
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
200
    generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)
201
    allow_single_merge_revision = getattr(lf,
202
        'supports_single_merge_revision', False)
203
    generate_tags = getattr(lf, 'supports_tags', False)
3936.3.1 by Ian Clatworthy
refactor _show_log
204
    if generate_tags and branch.supports_tags():
205
        rev_tag_dict = branch.tags.get_reverse_tag_dict()
206
    else:
207
        rev_tag_dict = {}
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
208
    generate_delta = verbose and getattr(lf, 'supports_delta', False)
209
3936.3.1 by Ian Clatworthy
refactor _show_log
210
    # Find and print the interesting revisions
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
211
    log_count = 0
3936.3.1 by Ian Clatworthy
refactor _show_log
212
    revision_iterator = _create_log_revision_iterator(branch, start_revision,
213
        end_revision, direction, specific_fileid, search,
214
        generate_merge_revisions, allow_single_merge_revision, generate_delta)
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
215
    for revs in revision_iterator:
216
        for (rev_id, revno, merge_depth), rev, delta in revs:
217
            lr = LogRevision(rev, revno, merge_depth, delta,
218
                             rev_tag_dict.get(rev_id))
219
            lf.log_revision(lr)
220
            if limit:
221
                log_count += 1
222
                if log_count >= limit:
3660.1.1 by Robert Collins
Fix log --limit (broken by log filtering patch).
223
                    return
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
224
225
3936.3.1 by Ian Clatworthy
refactor _show_log
226
def _create_log_revision_iterator(branch, start_revision, end_revision,
227
    direction, specific_fileid, search, generate_merge_revisions,
228
    allow_single_merge_revision, generate_delta):
229
    """Create a revision iterator for log.
230
231
    :param branch: The branch being logged.
232
    :param start_revision: If not None, only show revisions >= start_revision
233
    :param end_revision: If not None, only show revisions <= end_revision
234
    :param direction: 'reverse' (default) is latest to earliest; 'forward' is
235
        earliest to latest.
236
    :param specific_fileid: If not None, list only the commits affecting the
237
        specified file.
238
    :param search: If not None, only show revisions with matching commit
239
        messages.
240
    :param generate_merge_revisions: If False, show only mainline revisions.
241
    :param allow_single_merge_revision: ????
242
    :param generate_delta: Whether to generate a delta for each revision.
243
244
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
245
        delta).
246
    """
247
    # Intial implementation - call existing functions
248
    view_revisions = calculate_view_revisions(branch, start_revision,
249
                                              end_revision, direction,
250
                                              specific_fileid,
251
                                              generate_merge_revisions,
252
                                              allow_single_merge_revision)
253
    return make_log_rev_iterator(branch, view_revisions, generate_delta, search)
254
255
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
256
def calculate_view_revisions(branch, start_revision, end_revision, direction,
257
                             specific_fileid, generate_merge_revisions,
258
                             allow_single_merge_revision):
3936.3.1 by Ian Clatworthy
refactor _show_log
259
    if (not generate_merge_revisions
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
260
        and start_revision is end_revision is None
261
        and direction == 'reverse'
262
        and specific_fileid is None):
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
263
        return _linear_view_revisions(branch)
264
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
265
    mainline_revs, rev_nos, start_rev_id, end_rev_id = _get_mainline_revs(
266
        branch, start_revision, end_revision)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
267
    if not mainline_revs:
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
268
        return []
1756.2.18 by Aaron Bentley
Factor out the revision list generation
269
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
270
    generate_single_revision = False
2985.1.1 by Aaron Bentley
Better behavior when user requests a log that cannot be viewed (Kent Gibson)
271
    if ((not generate_merge_revisions)
2978.3.2 by Kent Gibson
Use in rather than has_key
272
        and ((start_rev_id and (start_rev_id not in rev_nos))
273
            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.
274
        generate_single_revision = ((start_rev_id == end_rev_id)
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
275
            and allow_single_merge_revision)
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
276
        if not generate_single_revision:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
277
            raise errors.BzrCommandError('Selected log formatter only supports'
278
                ' mainline revisions.')
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
279
        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.
280
    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.
281
                          direction, include_merges=generate_merge_revisions)
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
282
283
    if direction == 'reverse':
284
        start_rev_id, end_rev_id = end_rev_id, start_rev_id
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
285
    view_revisions = _filter_revision_range(list(view_revs_iter),
286
                                            start_rev_id,
287
                                            end_rev_id)
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
288
    if view_revisions and generate_single_revision:
289
        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.
290
    if specific_fileid:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
291
        view_revisions = _filter_revisions_touching_file_id(branch,
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
292
                                                            specific_fileid,
293
                                                            view_revisions)
2388.1.11 by Alexander Belchenko
changes after John's review
294
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
295
    # rebase merge_depth - unless there are no revisions or 
296
    # either the first or last revision have merge_depth = 0.
297
    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
298
        min_depth = min([d for r,n,d in view_revisions])
299
        if min_depth != 0:
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
300
            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
301
    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.
302
530 by Martin Pool
- put back verbose log support for reversed logs
303
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
304
def _linear_view_revisions(branch):
305
    start_revno, start_revision_id = branch.last_revision_info()
306
    repo = branch.repository
307
    revision_ids = repo.iter_reverse_revision_history(start_revision_id)
308
    for num, revision_id in enumerate(revision_ids):
3302.1.4 by Aaron Bentley
Return revno as a string
309
        yield revision_id, str(start_revno - num), 0
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
310
311
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
312
def make_log_rev_iterator(branch, view_revisions, generate_delta, search):
313
    """Create a revision iterator for log.
314
315
    :param branch: The branch being logged.
316
    :param view_revisions: The revisions being viewed.
317
    :param generate_delta: Whether to generate a delta for each revision.
318
    :param search: A user text search string.
3642.1.7 by Robert Collins
Review feedback.
319
    :return: An iterator over lists 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.
320
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
321
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
322
    # Convert view_revisions into (view, None, None) groups to fit with
323
    # the standard interface here.
324
    if type(view_revisions) == list:
3642.1.7 by Robert Collins
Review feedback.
325
        # A single batch conversion is faster than many incremental ones.
326
        # As we have all the data, do a batch conversion.
3642.1.5 by Robert Collins
Separate out batching of revisions.
327
        nones = [None] * len(view_revisions)
328
        log_rev_iterator = iter([zip(view_revisions, nones, nones)])
329
    else:
330
        def _convert():
331
            for view in view_revisions:
332
                yield (view, None, None)
333
        log_rev_iterator = iter([_convert()])
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
334
    for adapter in log_adapters:
335
        log_rev_iterator = adapter(branch, generate_delta, search,
336
            log_rev_iterator)
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
337
    return log_rev_iterator
338
339
3642.1.7 by Robert Collins
Review feedback.
340
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.
341
    """Create a filtered iterator of log_rev_iterator matching on a regex.
342
343
    :param branch: The branch being logged.
344
    :param generate_delta: Whether to generate a delta for each revision.
345
    :param search: A user text search string.
346
    :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.
347
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
348
    :return: An iterator over lists 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.
349
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
350
    """
351
    if search is None:
352
        return log_rev_iterator
353
    # Compile the search now to get early errors.
354
    searchRE = re.compile(search, re.IGNORECASE)
355
    return _filter_message_re(searchRE, log_rev_iterator)
356
357
358
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.
359
    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.
360
        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.
361
        for (rev_id, revno, merge_depth), rev, delta in revs:
362
            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.
363
                new_revs.append(((rev_id, revno, merge_depth), rev, delta))
364
        yield new_revs
365
366
3642.1.7 by Robert Collins
Review feedback.
367
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.
368
    """Add revision deltas to a log iterator if needed.
369
370
    :param branch: The branch being logged.
371
    :param generate_delta: Whether to generate a delta for each revision.
372
    :param search: A user text search string.
373
    :param log_rev_iterator: An input iterator containing all revisions that
374
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
375
    :return: An iterator over lists 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.
376
        delta).
377
    """
378
    if not generate_delta:
379
        return log_rev_iterator
380
    return _generate_deltas(branch.repository, log_rev_iterator)
381
382
383
def _generate_deltas(repository, log_rev_iterator):
3642.1.7 by Robert Collins
Review feedback.
384
    """Create deltas for each batch of revisions 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.
385
    for revs in log_rev_iterator:
386
        revisions = [rev[1] for rev in revs]
387
        deltas = repository.get_deltas_for_revisions(revisions)
388
        revs = [(rev[0], rev[1], delta) for rev, delta in izip(revs, deltas)]
389
        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.
390
391
3642.1.7 by Robert Collins
Review feedback.
392
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.
393
    """Extract revision objects from the repository
394
395
    :param branch: The branch being logged.
396
    :param generate_delta: Whether to generate a delta for each revision.
397
    :param search: A user text search string.
398
    :param log_rev_iterator: An input iterator containing all revisions that
399
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
400
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
401
        delta).
402
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
403
    repository = branch.repository
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
404
    for revs in log_rev_iterator:
405
        # r = revision_id, n = revno, d = merge depth
406
        revision_ids = [view[0] for view, _, _ in revs]
407
        revisions = repository.get_revisions(revision_ids)
408
        revs = [(rev[0], revision, rev[2]) for rev, revision in
409
            izip(revs, revisions)]
410
        yield revs
411
412
3642.1.7 by Robert Collins
Review feedback.
413
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):
3642.1.5 by Robert Collins
Separate out batching of revisions.
414
    """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.
415
416
    :param branch: The branch being logged.
417
    :param generate_delta: Whether to generate a delta for each revision.
418
    :param search: A user text search string.
3642.1.5 by Robert Collins
Separate out batching of revisions.
419
    :param log_rev_iterator: An input iterator containing all revisions that
420
        could be displayed, in lists.
3874.2.4 by Vincent Ladeuil
Fix too long lines.
421
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
422
        delta).
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
423
    """
424
    repository = branch.repository
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
425
    num = 9
3642.1.5 by Robert Collins
Separate out batching of revisions.
426
    for batch in log_rev_iterator:
427
        batch = iter(batch)
428
        while True:
429
            step = [detail for _, detail in zip(range(num), batch)]
430
            if len(step) == 0:
431
                break
432
            yield step
433
            num = min(int(num * 1.5), 200)
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
434
435
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
436
def _get_mainline_revs(branch, start_revision, end_revision):
437
    """Get the mainline revisions from the branch.
438
    
439
    Generates the list of mainline revisions for the branch.
440
    
441
    :param  branch: The branch containing the revisions. 
442
443
    :param  start_revision: The first revision to be logged.
444
            For backwards compatibility this may be a mainline integer revno,
445
            but for merge revision support a RevisionInfo is expected.
446
447
    :param  end_revision: The last revision to be logged.
448
            For backwards compatibility this may be a mainline integer revno,
449
            but for merge revision support a RevisionInfo is expected.
450
451
    :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
452
    """
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
453
    branch_revno, branch_last_revision = branch.last_revision_info()
454
    if branch_revno == 0:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
455
        return None, None, None, None
456
457
    # For mainline generation, map start_revision and end_revision to 
458
    # mainline revnos. If the revision is not on the mainline choose the 
459
    # appropriate extreme of the mainline instead - the extra will be 
460
    # filtered later.
461
    # Also map the revisions to rev_ids, to be used in the later filtering
462
    # stage.
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
463
    start_rev_id = None
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
464
    if start_revision is None:
465
        start_revno = 1
466
    else:
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
467
        if isinstance(start_revision, revisionspec.RevisionInfo):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
468
            start_rev_id = start_revision.rev_id
469
            start_revno = start_revision.revno or 1
470
        else:
471
            branch.check_real_revno(start_revision)
472
            start_revno = start_revision
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
473
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
474
    end_rev_id = None
475
    if end_revision is None:
3449.2.5 by John Arbash Meinel
Stop referencing the variable I removed.
476
        end_revno = branch_revno
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
477
    else:
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
478
        if isinstance(end_revision, revisionspec.RevisionInfo):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
479
            end_rev_id = end_revision.rev_id
3449.2.5 by John Arbash Meinel
Stop referencing the variable I removed.
480
            end_revno = end_revision.revno or branch_revno
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
481
        else:
482
            branch.check_real_revno(end_revision)
483
            end_revno = end_revision
484
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
485
    if ((start_rev_id == _mod_revision.NULL_REVISION)
486
        or (end_rev_id == _mod_revision.NULL_REVISION)):
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
487
        raise errors.BzrCommandError('Logging revision 0 is invalid.')
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
488
    if start_revno > end_revno:
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
489
        raise errors.BzrCommandError("Start revision must be older than "
490
                                     "the end revision.")
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
491
3449.2.7 by John Arbash Meinel
Minor tweak from Ian
492
    if end_revno < start_revno:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
493
        return None, None, None, None
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
494
    cur_revno = branch_revno
495
    rev_nos = {}
496
    mainline_revs = []
497
    for revision_id in branch.repository.iter_reverse_revision_history(
498
                        branch_last_revision):
499
        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.
500
            # 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()'
501
            rev_nos[revision_id] = cur_revno
502
            mainline_revs.append(revision_id)
503
            break
504
        if cur_revno <= end_revno:
505
            rev_nos[revision_id] = cur_revno
506
            mainline_revs.append(revision_id)
507
        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.
508
    else:
509
        # We walked off the edge of all revisions, so we add a 'None' marker
510
        mainline_revs.append(None)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
511
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
512
    mainline_revs.reverse()
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
513
514
    # override the mainline to look like the revision history.
515
    return mainline_revs, rev_nos, start_rev_id, end_rev_id
516
517
518
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
519
    """Filter view_revisions based on revision ranges.
520
521
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth) 
522
            tuples to be filtered.
523
524
    :param start_rev_id: If not NONE specifies the first revision to be logged.
525
            If NONE then all revisions up to the end_rev_id are logged.
526
527
    :param end_rev_id: If not NONE specifies the last revision to be logged.
528
            If NONE then all revisions up to the end of the log are logged.
529
530
    :return: The filtered view_revisions.
531
    """
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
532
    if start_rev_id or end_rev_id:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
533
        revision_ids = [r for r, n, d in view_revisions]
534
        if start_rev_id:
535
            start_index = revision_ids.index(start_rev_id)
536
        else:
537
            start_index = 0
538
        if start_rev_id == end_rev_id:
539
            end_index = start_index
540
        else:
541
            if end_rev_id:
542
                end_index = revision_ids.index(end_rev_id)
543
            else:
544
                end_index = len(view_revisions) - 1
545
        # To include the revisions merged into the last revision, 
546
        # extend end_rev_id down to, but not including, the next rev
547
        # with the same or lesser merge_depth
548
        end_merge_depth = view_revisions[end_index][2]
549
        try:
550
            for index in xrange(end_index+1, len(view_revisions)+1):
551
                if view_revisions[index][2] <= end_merge_depth:
552
                    end_index = index - 1
553
                    break
554
        except IndexError:
555
            # if the search falls off the end then log to the end as well
556
            end_index = len(view_revisions) - 1
557
        view_revisions = view_revisions[start_index:end_index+1]
558
    return view_revisions
559
560
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
561
def _filter_revisions_touching_file_id(branch, file_id, view_revisions):
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
562
    r"""Return the list of revision ids which touch a given file id.
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
563
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
564
    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.
565
    This includes the revisions which directly change the file id,
566
    and the revisions which merge these changes. So if the
567
    revision graph is::
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
568
        A-.
569
        |\ \
570
        B C E
571
        |/ /
572
        D |
573
        |\|
574
        | F
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
575
        |/
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
576
        G
577
578
    And 'C' changes a file, then both C and D will be returned. F will not be
579
    returned even though it brings the changes to C into the branch starting
580
    with E. (Note that if we were using F as the tip instead of G, then we
581
    would see C, D, F.)
582
583
    This will also be restricted based on a subset of the mainline.
584
585
    :param branch: The branch where we can get text revision information.
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
586
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
587
    :param file_id: Filter out revisions that do not touch file_id.
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
588
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
589
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
590
        tuples. This is the list of revisions which will be filtered. It is
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
591
        assumed that view_revisions is in merge_sort order (i.e. newest
592
        revision first ).
593
2359.1.8 by John Arbash Meinel
doc
594
    :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.
595
    """
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
596
    # Lookup all possible text keys to determine which ones actually modified
597
    # the file.
598
    text_keys = [(file_id, rev_id) for rev_id, revno, depth in view_revisions]
3711.3.16 by John Arbash Meinel
Doc update.
599
    # Looking up keys in batches of 1000 can cut the time in half, as well as
600
    # memory consumption. GraphIndex *does* like to look for a few keys in
601
    # parallel, it just doesn't like looking for *lots* of keys in parallel.
3711.3.19 by John Arbash Meinel
Add a TODO discussing how our index requests should evolve.
602
    # TODO: This code needs to be re-evaluated periodically as we tune the
603
    #       indexing layer. We might consider passing in hints as to the known
604
    #       access pattern (sparse/clustered, high success rate/low success
605
    #       rate). This particular access is clustered with a low success rate.
3711.3.15 by John Arbash Meinel
Work around GraphIndex inefficiencies by requesting keys 1000 at a time.
606
    get_parent_map = branch.repository.texts.get_parent_map
607
    modified_text_revisions = set()
608
    chunk_size = 1000
609
    for start in xrange(0, len(text_keys), chunk_size):
610
        next_keys = text_keys[start:start + chunk_size]
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
611
        # Only keep the revision_id portion of the key
3711.3.15 by John Arbash Meinel
Work around GraphIndex inefficiencies by requesting keys 1000 at a time.
612
        modified_text_revisions.update(
613
            [k[1] for k in get_parent_map(next_keys)])
614
    del text_keys, next_keys
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
615
616
    result = []
617
    # Track what revisions will merge the current revision, replace entries
618
    # with 'None' when they have been added to result
619
    current_merge_stack = [None]
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
620
    for info in view_revisions:
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
621
        rev_id, revno, depth = info
622
        if depth == len(current_merge_stack):
623
            current_merge_stack.append(info)
624
        else:
625
            del current_merge_stack[depth + 1:]
626
            current_merge_stack[-1] = info
627
628
        if rev_id in modified_text_revisions:
629
            # This needs to be logged, along with the extra revisions
630
            for idx in xrange(len(current_merge_stack)):
631
                node = current_merge_stack[idx]
632
                if node is not None:
633
                    result.append(node)
634
                    current_merge_stack[idx] = None
3711.3.4 by John Arbash Meinel
Significantly faster, but consuming more memory.
635
    return result
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
636
637
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
638
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
639
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
640
    """Produce an iterator of revisions to show
641
    :return: an iterator of (revision_id, revno, merge_depth)
642
    (if there is no revno for a revision, None is supplied)
643
    """
1756.2.22 by Aaron Bentley
Apply review comments
644
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
645
        revision_ids = mainline_revs[1:]
646
        if direction == 'reverse':
647
            revision_ids.reverse()
648
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
649
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
650
        return
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
651
    graph = branch.repository.get_graph()
652
    # This asks for all mainline revisions, which means we only have to spider
653
    # sideways, rather than depth history. That said, its still size-of-history
654
    # and should be addressed.
3373.5.4 by John Arbash Meinel
Track down another bogus location. Only triggered with --long
655
    # mainline_revisions always includes an extra revision at the beginning, so
656
    # don't request it.
3287.6.8 by Robert Collins
Reduce code duplication as per review.
657
    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
658
        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.
659
    # filter out ghosts; merge_sort errors on ghosts.
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
660
    rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
661
    merge_sorted_revisions = tsort.merge_sort(
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
662
        rev_graph,
1756.2.18 by Aaron Bentley
Factor out the revision list generation
663
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
664
        mainline_revs,
665
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
666
667
    if direction == 'forward':
668
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
669
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
670
    elif direction != 'reverse':
671
        raise ValueError('invalid direction %r' % direction)
672
3874.2.4 by Vincent Ladeuil
Fix too long lines.
673
    for (sequence, rev_id, merge_depth, revno, end_of_merge
674
         ) in merge_sorted_revisions:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
675
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
676
677
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
678
def reverse_by_depth(merge_sorted_revisions, _depth=0):
679
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
680
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
681
    Revisions with a different depth are sorted as a group with the previous
682
    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
683
    but it looks much nicer.
684
    """
3842.2.6 by Vincent Ladeuil
Fix typo.
685
    # Add a fake revision at start so that we can always attach sub revisions
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
686
    merge_sorted_revisions = [(None, None, _depth)] + merge_sorted_revisions
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
687
    zd_revisions = []
688
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
689
        if val[2] == _depth:
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
690
            # Each revision at the current depth becomes a chunk grouping all
691
            # higher depth revisions.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
692
            zd_revisions.append([val])
693
        else:
694
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
695
    for revisions in zd_revisions:
696
        if len(revisions) > 1:
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
697
            # We have higher depth revisions, let reverse them locally
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
698
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
699
    zd_revisions.reverse()
700
    result = []
701
    for chunk in zd_revisions:
702
        result.extend(chunk)
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
703
    if _depth == 0:
704
        # Top level call, get rid of the fake revisions that have been added
705
        result = [r for r in result if r[0] is not None and r[1] is not None]
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
706
    return result
707
708
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.
709
class LogRevision(object):
710
    """A revision to be logged (by LogFormatter.log_revision).
711
712
    A simple wrapper for the attributes of a revision to be logged.
713
    The attributes may or may not be populated, as determined by the 
714
    logging options and the log formatter capabilities.
715
    """
716
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
717
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
718
                 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.
719
        self.rev = rev
720
        self.revno = revno
721
        self.merge_depth = merge_depth
722
        self.delta = delta
723
        self.tags = tags
724
725
794 by Martin Pool
- Merge John's nice short-log format.
726
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.
727
    """Abstract class to display log messages.
728
729
    At a minimum, a derived class must implement the log_revision method.
730
731
    If the LogFormatter needs to be informed of the beginning or end of
732
    a log it should implement the begin_log and/or end_log hook methods.
733
734
    A LogFormatter should define the following supports_XXX flags 
735
    to indicate which LogRevision attributes it supports:
736
737
    - supports_delta must be True if this log formatter supports delta.
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
738
        Otherwise the delta attribute may not be populated.  The 'delta_format'
739
        attribute describes whether the 'short_status' format (1) or the long
740
        one (2) sould be used.
741
 
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.
742
    - 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.
743
        merge revisions.  If not, and if supports_single_merge_revisions is
744
        also not True, then only mainline revisions will be passed to the 
745
        formatter.
746
    - supports_single_merge_revision must be True if this log formatter
747
        supports logging only a single merge revision.  This flag is
748
        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.
749
    - supports_tags must be True if this log formatter supports tags.
750
        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
751
752
    Plugins can register functions to show custom revision properties using
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
753
    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
754
    must respect the following interface description:
3144.7.2 by Guillermo Gonzalez
* cleanup a bit the interface
755
        def my_show_properties(properties_dict):
756
            # code that returns a dict {'name':'value'} of the properties 
757
            # 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.
758
    """
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
759
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
760
    def __init__(self, to_file, show_ids=False, show_timezone='original',
761
                 delta_format=None):
794 by Martin Pool
- Merge John's nice short-log format.
762
        self.to_file = to_file
763
        self.show_ids = show_ids
764
        self.show_timezone = show_timezone
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
765
        if delta_format is None:
766
            # Ensures backward compatibility
767
            delta_format = 2 # long format
768
        self.delta_format = delta_format
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
769
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.
770
# TODO: uncomment this block after show() has been removed.
771
# Until then defining log_revision would prevent _show_log calling show() 
772
# in legacy formatters.
773
#    def log_revision(self, revision):
774
#        """Log a revision.
775
#
776
#        :param  revision:   The LogRevision to be logged.
777
#        """
778
#        raise NotImplementedError('not implemented in abstract base')
779
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
780
    def short_committer(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
781
        name, address = config.parse_username(rev.committer)
782
        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.
783
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
784
        return address
2388.1.11 by Alexander Belchenko
changes after John's review
785
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.
786
    def short_author(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
787
        name, address = config.parse_username(rev.get_apparent_author())
788
        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.
789
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
790
        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.
791
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
792
    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
793
        """Displays the custom properties returned by each registered handler.
794
        
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
795
        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
796
        """
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
797
        for key, handler in properties_handler_registry.iteritems():
798
            for key, value in handler(revision).items():
799
                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
800
2388.1.11 by Alexander Belchenko
changes after John's review
801
794 by Martin Pool
- Merge John's nice short-log format.
802
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
803
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.
804
    supports_merge_revisions = True
805
    supports_delta = True
806
    supports_tags = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
807
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.
808
    def log_revision(self, revision):
809
        """Log a revision, either merged or not."""
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
810
        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.
811
        to_file = self.to_file
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
812
        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.
813
        if revision.revno is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
814
            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.
815
        if revision.tags:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
816
            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.
817
        if self.show_ids:
3257.2.1 by Adeodato Simó
Add a space after "revision-id:" in log output.
818
            to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
819
            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.
820
            for parent_id in revision.rev.parent_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
821
                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
822
        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.
823
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
824
        author = revision.rev.properties.get('author', None)
825
        if author is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
826
            to_file.write(indent + 'author: %s\n' % (author,))
827
        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.
828
829
        branch_nick = revision.rev.properties.get('branch-nick', None)
830
        if branch_nick is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
831
            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.
832
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.
833
        date_str = format_date(revision.rev.timestamp,
834
                               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.
835
                               self.show_timezone)
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
836
        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.
837
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
838
        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.
839
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
840
            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.
841
        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.
842
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
843
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
844
                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.
845
        if revision.delta is not None:
3874.1.7 by Vincent Ladeuil
Restrict '-v' change to log --short only.
846
            # We don't respect delta_format for compatibility
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
847
            revision.delta.show(to_file, self.show_ids, indent=indent,
3874.1.7 by Vincent Ladeuil
Restrict '-v' change to log --short only.
848
                                short_status=False)
794 by Martin Pool
- Merge John's nice short-log format.
849
850
851
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.
852
853
    supports_delta = True
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
854
    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.
855
856
    def log_revision(self, revision):
794 by Martin Pool
- Merge John's nice short-log format.
857
        to_file = self.to_file
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
858
        is_merge = ''
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
859
        if len(revision.rev.parent_ids) > 1:
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
860
            is_merge = ' [merge]'
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
861
        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.
862
                self.short_author(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
863
                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.
864
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
865
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
866
                            show_offset=False),
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
867
                is_merge))
794 by Martin Pool
- Merge John's nice short-log format.
868
        if self.show_ids:
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
869
            to_file.write('      revision-id:%s\n'
870
                          % (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.
871
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
872
            to_file.write('      (no message)\n')
794 by Martin Pool
- Merge John's nice short-log format.
873
        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.
874
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
875
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
876
                to_file.write('      %s\n' % (l,))
794 by Martin Pool
- Merge John's nice short-log format.
877
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.
878
        if revision.delta is not None:
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
879
            revision.delta.show(to_file, self.show_ids,
880
                                short_status=self.delta_format==1)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
881
        to_file.write('\n')
794 by Martin Pool
- Merge John's nice short-log format.
882
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
883
1185.12.25 by Aaron Bentley
Added one-line log format
884
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.
885
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
886
    supports_single_merge_revision = True
887
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.
888
    def __init__(self, *args, **kwargs):
889
        super(LineLogFormatter, self).__init__(*args, **kwargs)
890
        self._max_chars = terminal_width() - 1
891
1185.12.25 by Aaron Bentley
Added one-line log format
892
    def truncate(self, str, max_len):
893
        if len(str) <= max_len:
894
            return str
895
        return str[:max_len-3]+'...'
896
897
    def date_string(self, rev):
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
898
        return format_date(rev.timestamp, rev.timezone or 0,
1185.12.25 by Aaron Bentley
Added one-line log format
899
                           self.show_timezone, date_fmt="%Y-%m-%d",
900
                           show_offset=False)
901
902
    def message(self, rev):
903
        if not rev.message:
904
            return '(no message)'
905
        else:
906
            return rev.message
907
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.
908
    def log_revision(self, revision):
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
909
        self.to_file.write(self.log_string(revision.revno, revision.rev,
910
                                              self._max_chars))
911
        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.
912
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
913
    def log_string(self, revno, rev, max_chars):
914
        """Format log info into one string. Truncate tail of string
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
915
        :param  revno:      revision number or None.
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
916
                            Revision numbers counts from 1.
917
        :param  rev:        revision info object
918
        :param  max_chars:  maximum length of resulting string
919
        :return:            formatted truncated string
920
        """
921
        out = []
922
        if revno:
923
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
924
            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.
925
        out.append(self.truncate(self.short_author(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
926
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
927
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
928
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
929
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
930
1185.12.27 by Aaron Bentley
Use line log for pending merges
931
def line_log(rev, max_chars):
932
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
933
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
934
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
935
936
class LogFormatterRegistry(registry.Registry):
937
    """Registry for log formatters"""
938
939
    def make_formatter(self, name, *args, **kwargs):
940
        """Construct a formatter from arguments.
941
942
        :param name: Name of the formatter to construct.  'short', 'long' and
943
            'line' are built-in.
944
        """
945
        return self.get(name)(*args, **kwargs)
946
947
    def get_default(self, branch):
948
        return self.get(branch.get_config().log_format())
949
950
951
log_formatter_registry = LogFormatterRegistry()
952
953
954
log_formatter_registry.register('short', ShortLogFormatter,
955
                                'Moderately short log format')
956
log_formatter_registry.register('long', LongLogFormatter,
957
                                'Detailed log format')
958
log_formatter_registry.register('line', LineLogFormatter,
959
                                'Log format with one line per revision')
960
794 by Martin Pool
- Merge John's nice short-log format.
961
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
962
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
963
    log_formatter_registry.register(name, formatter)
964
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
965
794 by Martin Pool
- Merge John's nice short-log format.
966
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
967
    """Construct a formatter from arguments.
968
1185.12.27 by Aaron Bentley
Use line log for pending merges
969
    name -- Name of the formatter to construct; currently 'long', 'short' and
970
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
971
    """
794 by Martin Pool
- Merge John's nice short-log format.
972
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
973
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
974
    except KeyError:
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
975
        raise errors.BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
976
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
977
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
978
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
979
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
980
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
981
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
982
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
983
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
984
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
985
                           log_format='long'):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
986
    """Show the change in revision history comparing the old revision history to the new one.
987
988
    :param branch: The branch where the revisions exist
989
    :param old_rh: The old revision history
990
    :param new_rh: The new revision history
991
    :param to_file: A file to write the results to. If None, stdout will be used
992
    """
993
    if to_file is None:
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
994
        to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
995
            errors='replace')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
996
    lf = log_formatter(log_format,
997
                       show_ids=False,
998
                       to_file=to_file,
999
                       show_timezone='original')
1000
1001
    # This is the first index which is different between
1002
    # old and new
1003
    base_idx = None
1004
    for i in xrange(max(len(new_rh),
1005
                        len(old_rh))):
1006
        if (len(new_rh) <= i
1007
            or len(old_rh) <= i
1008
            or new_rh[i] != old_rh[i]):
1009
            base_idx = i
1010
            break
1011
1012
    if base_idx is None:
1013
        to_file.write('Nothing seems to have changed\n')
1014
        return
1015
    ## TODO: It might be nice to do something like show_log
1016
    ##       and show the merged entries. But since this is the
1017
    ##       removed revisions, it shouldn't be as important
1018
    if base_idx < len(old_rh):
1019
        to_file.write('*'*60)
1020
        to_file.write('\nRemoved Revisions:\n')
1021
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1022
            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
1023
            lr = LogRevision(rev, i+1, 0, None)
1024
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1025
        to_file.write('*'*60)
1026
        to_file.write('\n\n')
1027
    if base_idx < len(new_rh):
1028
        to_file.write('Added Revisions:\n')
1029
        show_log(branch,
1030
                 lf,
1031
                 None,
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
1032
                 verbose=False,
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1033
                 direction='forward',
1034
                 start_revision=base_idx+1,
1035
                 end_revision=len(new_rh),
1036
                 search=None)
1037
3144.7.4 by Guillermo Gonzalez
* move the function regisstry into a real Registry instead of a list
1038
3848.1.7 by Aaron Bentley
Use repository in get_history_change
1039
def get_history_change(old_revision_id, new_revision_id, repository):
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1040
    """Calculate the uncommon lefthand history between two revisions.
1041
1042
    :param old_revision_id: The original revision id.
1043
    :param new_revision_id: The new revision id.
3848.1.22 by Aaron Bentley
Fix spelling
1044
    :param repository: The repository to use for the calculation.
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1045
1046
    return old_history, new_history
1047
    """
3848.1.6 by Aaron Bentley
Implement get_history_change
1048
    old_history = []
1049
    old_revisions = set()
1050
    new_history = []
1051
    new_revisions = set()
3848.1.7 by Aaron Bentley
Use repository in get_history_change
1052
    new_iter = repository.iter_reverse_revision_history(new_revision_id)
1053
    old_iter = repository.iter_reverse_revision_history(old_revision_id)
3848.1.6 by Aaron Bentley
Implement get_history_change
1054
    stop_revision = None
1055
    do_old = True
1056
    do_new = True
1057
    while do_new or do_old:
1058
        if do_new:
1059
            try:
1060
                new_revision = new_iter.next()
1061
            except StopIteration:
1062
                do_new = False
1063
            else:
1064
                new_history.append(new_revision)
1065
                new_revisions.add(new_revision)
1066
                if new_revision in old_revisions:
1067
                    stop_revision = new_revision
1068
                    break
1069
        if do_old:
1070
            try:
1071
                old_revision = old_iter.next()
1072
            except StopIteration:
1073
                do_old = False
1074
            else:
1075
                old_history.append(old_revision)
1076
                old_revisions.add(old_revision)
1077
                if old_revision in new_revisions:
1078
                    stop_revision = old_revision
1079
                    break
1080
    new_history.reverse()
1081
    old_history.reverse()
1082
    if stop_revision is not None:
1083
        new_history = new_history[new_history.index(stop_revision) + 1:]
1084
        old_history = old_history[old_history.index(stop_revision) + 1:]
1085
    return old_history, new_history
1086
1087
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1088
def show_branch_change(branch, output, old_revno, old_revision_id):
1089
    """Show the changes made to a branch.
1090
1091
    :param branch: The branch to show changes about.
1092
    :param output: A file-like object to write changes to.
1093
    :param old_revno: The revno of the old tip.
1094
    :param old_revision_id: The revision_id of the old tip.
1095
    """
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1096
    new_revno, new_revision_id = branch.last_revision_info()
1097
    old_history, new_history = get_history_change(old_revision_id,
1098
                                                  new_revision_id,
1099
                                                  branch.repository)
1100
    if old_history == [] and new_history == []:
1101
        output.write('Nothing seems to have changed\n')
1102
        return
1103
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
1104
    log_format = log_formatter_registry.get_default(branch)
1105
    lf = log_format(show_ids=False, to_file=output, show_timezone='original')
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1106
    if old_history != []:
1107
        output.write('*'*60)
1108
        output.write('\nRemoved Revisions:\n')
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
1109
        show_flat_log(branch.repository, old_history, old_revno, lf)
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1110
        output.write('*'*60)
1111
        output.write('\n\n')
1112
    if new_history != []:
3848.1.9 by Aaron Bentley
new/old sections are omitted as appropriate.
1113
        output.write('Added Revisions:\n')
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1114
        start_revno = new_revno - len(new_history) + 1
1115
        show_log(branch, lf, None, verbose=False, direction='forward',
1116
                 start_revision=start_revno,)
1117
1118
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
1119
def show_flat_log(repository, history, last_revno, lf):
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1120
    """Show a simple log of the specified history.
1121
1122
    :param repository: The repository to retrieve revisions from.
1123
    :param history: A list of revision_ids indicating the lefthand history.
1124
    :param last_revno: The revno of the last revision_id in the history.
1125
    :param lf: The log formatter to use.
1126
    """
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
1127
    start_revno = last_revno - len(history) + 1
1128
    revisions = repository.get_revisions(history)
1129
    for i, rev in enumerate(revisions):
1130
        lr = LogRevision(rev, i + last_revno, 0, None)
1131
        lf.log_revision(lr)
1132
1133
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
1134
properties_handler_registry = registry.Registry()
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
1135
properties_handler_registry.register_lazy("foreign",
1136
                                          "bzrlib.foreign",
1137
                                          "show_foreign_properties")
1138
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1139
1140
# adapters which revision ids to log are filtered. When log is called, the
1141
# log_rev_iterator is adapted through each of these factory methods.
1142
# Plugins are welcome to mutate this list in any way they like - as long
1143
# as the overall behaviour is preserved. At this point there is no extensible
1144
# mechanism for getting parameters to each factory method, and until there is
1145
# this won't be considered a stable api.
1146
log_adapters = [
1147
    # core log logic
3642.1.7 by Robert Collins
Review feedback.
1148
    _make_batch_filter,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1149
    # read revision objects
3642.1.7 by Robert Collins
Review feedback.
1150
    _make_revision_objects,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1151
    # filter on log messages
3642.1.7 by Robert Collins
Review feedback.
1152
    _make_search_filter,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1153
    # generate deltas for things we will show
3642.1.7 by Robert Collins
Review feedback.
1154
    _make_delta_filter
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1155
    ]