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