/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2005-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
369 by Martin Pool
- Split out log printing into new show_log function
16
527 by Martin Pool
- refactor log command
17
"""Code to show logs of changes.
18
19
Various flavors of log can be produced:
20
21
* for one file, or the whole tree, and (not done yet) for
22
  files in a given directory
23
24
* in "verbose" mode with a description of what changed from one
25
  version to the next
26
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
27
* with files and revision-ids shown
527 by Martin Pool
- refactor log command
28
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
29
Logs are actually written out through an abstract LogFormatter
30
interface, which allows for different preferred formats.  Plugins can
31
register formats too.
32
33
Logs can be produced in either forward (oldest->newest) or reverse
34
(newest->oldest) order.
35
36
Logs can be filtered to show only revisions matching a particular
37
search string, or within a particular range of revisions.  The range
38
can be given as date/times, which are reduced to revisions before
39
calling in here.
40
41
In verbose mode we show a summary of what changed in each particular
42
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
43
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
44
logged revision.  So for example if you ask for a verbose log of
45
changes touching hello.c you will get a list of those revisions also
46
listing other things that were changed in the same revision, but not
47
all the changes since the previous revision that touched hello.c.
527 by Martin Pool
- refactor log command
48
"""
49
2997.1.2 by Kent Gibson
Move all imports to top of log.py
50
import codecs
7479.2.1 by Jelmer Vernooij
Drop python2 support.
51
from io import BytesIO
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
52
import itertools
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
53
import re
2997.1.2 by Kent Gibson
Move all imports to top of log.py
54
import sys
55
from warnings import (
56
    warn,
57
    )
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
58
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
59
from .lazy_import import lazy_import
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.
60
lazy_import(globals(), """
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
61
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
62
from breezy import (
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
63
    config,
6207.3.3 by jelmer at samba
Fix tests and the like.
64
    controldir,
3943.5.1 by Ian Clatworthy
first cut at log --show-diff
65
    diff,
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
66
    foreign,
7169.2.3 by Martin
Fix bb.test_log test failure
67
    lazy_regex,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
68
    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.
69
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
70
from breezy.i18n import gettext, ngettext
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.
71
""")
72
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
73
from . import (
6883.7.3 by Jelmer Vernooij
Avoid Tree.id2path.
74
    errors,
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
75
    registry,
6800.1.5 by Jelmer Vernooij
Fix more imports.
76
    revisionspec,
7182.1.4 by Jelmer Vernooij
Print exceptions when custom handlers raise exceptions rather than aborting.
77
    trace,
2997.1.2 by Kent Gibson
Move all imports to top of log.py
78
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
79
from .osutils import (
2997.1.2 by Kent Gibson
Move all imports to top of log.py
80
    format_date,
4379.4.1 by Ian Clatworthy
make log --long faster
81
    format_date_with_offset_in_original_timezone,
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
82
    get_diff_header_encoding,
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
83
    get_terminal_encoding,
7490.73.9 by Jelmer Vernooij
Simplify log browsing.
84
    is_inside,
2997.1.2 by Kent Gibson
Move all imports to top of log.py
85
    terminal_width,
86
    )
7479.2.2 by Jelmer Vernooij
Merge trunk.
87
from .tree import (
88
    find_previous_path,
89
    InterTree,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
90
    )
6883.5.13 by Jelmer Vernooij
Fix find_touching_revisions to use find_previous_path.
91
92
93
def find_touching_revisions(repository, last_revision, last_tree, last_path):
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
94
    """Yield a description of revisions which affect the file.
375 by Martin Pool
- New command touching-revisions and function to trace
95
96
    Each returned element is (revno, revision_id, description)
97
98
    This is the list of revisions where the file is either added,
99
    modified, renamed or deleted.
100
101
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
102
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
103
    """
6883.5.13 by Jelmer Vernooij
Fix find_touching_revisions to use find_previous_path.
104
    last_verifier = last_tree.get_file_verifier(last_path)
6883.7.3 by Jelmer Vernooij
Avoid Tree.id2path.
105
    graph = repository.get_graph()
6883.7.16 by Jelmer Vernooij
Merge trunk.
106
    history = list(graph.iter_lefthand_ancestry(last_revision, []))
6883.5.13 by Jelmer Vernooij
Fix find_touching_revisions to use find_previous_path.
107
    revno = len(history)
108
    for revision_id in history:
6883.7.3 by Jelmer Vernooij
Avoid Tree.id2path.
109
        this_tree = repository.revision_tree(revision_id)
7357.1.8 by Jelmer Vernooij
Remove the InterTree object.
110
        this_intertree = InterTree.get(this_tree, last_tree)
111
        this_path = this_intertree.find_source_path(last_path)
375 by Martin Pool
- New command touching-revisions and function to trace
112
113
        # now we know how it was last time, and how it is in this revision.
114
        # are those two states effectively the same or not?
6883.5.13 by Jelmer Vernooij
Fix find_touching_revisions to use find_previous_path.
115
        if this_path is not None and last_path is None:
116
            yield revno, revision_id, "deleted " + this_path
117
            this_verifier = this_tree.get_file_verifier(this_path)
118
        elif this_path is None and last_path is not None:
119
            yield revno, revision_id, "added " + last_path
375 by Martin Pool
- New command touching-revisions and function to trace
120
        elif this_path != last_path:
6883.5.13 by Jelmer Vernooij
Fix find_touching_revisions to use find_previous_path.
121
            yield revno, revision_id, ("renamed %s => %s" % (this_path, last_path))
122
            this_verifier = this_tree.get_file_verifier(this_path)
123
        else:
124
            this_verifier = this_tree.get_file_verifier(this_path)
125
            if (this_verifier != last_verifier):
126
                yield revno, revision_id, "modified " + this_path
375 by Martin Pool
- New command touching-revisions and function to trace
127
6829 by Jelmer Vernooij
Merge lp:~jelmer/brz/log-inventory.
128
        last_verifier = this_verifier
375 by Martin Pool
- New command touching-revisions and function to trace
129
        last_path = this_path
6883.5.14 by Jelmer Vernooij
Fix test.
130
        last_tree = this_tree
131
        if last_path is None:
132
            return
6883.5.13 by Jelmer Vernooij
Fix find_touching_revisions to use find_previous_path.
133
        revno -= 1
375 by Martin Pool
- New command touching-revisions and function to trace
134
135
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
136
def show_log(branch,
137
             lf,
138
             verbose=False,
139
             direction='reverse',
140
             start_revision=None,
141
             end_revision=None,
142
             limit=None,
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
143
             show_diff=False,
144
             match=None):
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
145
    """Write out human-readable log of commits to this branch.
146
147
    This function is being retained for backwards compatibility but
148
    should not be extended with new parameters. Use the new Logger class
149
    instead, eg. Logger(branch, rqst).show(lf), adding parameters to the
4205.1.1 by Ian Clatworthy
log multiple files and directories (Ian Clatworthy)
150
    make_log_request_dict function.
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
151
152
    :param lf: The LogFormatter object showing the output.
153
154
    :param verbose: If True show added/changed/deleted/renamed files.
155
156
    :param direction: 'reverse' (default) is latest to earliest; 'forward' is
157
        earliest to latest.
158
159
    :param start_revision: If not None, only show revisions >= start_revision
160
161
    :param end_revision: If not None, only show revisions <= end_revision
162
163
    :param limit: If set, shows only 'limit' revisions, all revisions are shown
164
        if None or 0.
165
166
    :param show_diff: If True, output a diff after each revision.
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
167
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
168
    :param match: Dictionary of search lists to use when matching revision
169
      properties.
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
170
    """
171
    if verbose:
7319.1.1 by Jelmer Vernooij
Remove unused specific_fileid argument to log.
172
        delta_type = 'full'
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
173
    else:
174
        delta_type = None
175
    if show_diff:
7319.1.1 by Jelmer Vernooij
Remove unused specific_fileid argument to log.
176
        diff_type = 'full'
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
177
    else:
178
        diff_type = None
179
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
180
    if isinstance(start_revision, int):
6965.1.3 by Jelmer Vernooij
Fix test.
181
        try:
182
            start_revision = revisionspec.RevisionInfo(branch, start_revision)
7290.19.8 by Jelmer Vernooij
Fix tests.
183
        except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
6965.1.3 by Jelmer Vernooij
Fix test.
184
            raise errors.InvalidRevisionNumber(start_revision)
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
185
186
    if isinstance(end_revision, int):
6965.1.3 by Jelmer Vernooij
Fix test.
187
        try:
188
            end_revision = revisionspec.RevisionInfo(branch, end_revision)
7290.19.8 by Jelmer Vernooij
Fix tests.
189
        except (errors.NoSuchRevision, errors.RevnoOutOfBounds):
6965.1.3 by Jelmer Vernooij
Fix test.
190
            raise errors.InvalidRevisionNumber(end_revision)
191
192
    if end_revision is not None and end_revision.revno == 0:
193
        raise errors.InvalidRevisionNumber(end_revision.revno)
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
194
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
195
    # Build the request and execute it
7319.1.1 by Jelmer Vernooij
Remove unused specific_fileid argument to log.
196
    rqst = make_log_request_dict(
197
        direction=direction,
198
        start_revision=start_revision, end_revision=end_revision,
7490.73.2 by Jelmer Vernooij
Drop unused search argument.
199
        limit=limit, delta_type=delta_type, diff_type=diff_type)
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
200
    Logger(branch, rqst).show(lf)
201
202
6123.11.4 by Martin von Gagern
Introduce an option "--omit-merges" for "bzr log".
203
# Note: This needs to be kept in sync with the defaults in
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
204
# make_log_request_dict() below
205
_DEFAULT_REQUEST_PARAMS = {
206
    'direction': 'reverse',
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
207
    'levels': None,
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
208
    'generate_tags': True,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
209
    'exclude_common_ancestry': False,
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
210
    '_match_using_deltas': True,
211
    }
212
213
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
214
def make_log_request_dict(direction='reverse', specific_files=None,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
215
                          start_revision=None, end_revision=None, limit=None,
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
216
                          message_search=None, levels=None, generate_tags=True,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
217
                          delta_type=None,
218
                          diff_type=None, _match_using_deltas=True,
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
219
                          exclude_common_ancestry=False, match=None,
6123.11.4 by Martin von Gagern
Introduce an option "--omit-merges" for "bzr log".
220
                          signature=False, omit_merges=False,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
221
                          ):
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
222
    """Convenience function for making a logging request dictionary.
223
224
    Using this function may make code slightly safer by ensuring
225
    parameters have the correct names. It also provides a reference
226
    point for documenting the supported parameters.
227
228
    :param direction: 'reverse' (default) is latest to earliest;
229
      'forward' is earliest to latest.
230
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
231
    :param specific_files: If not None, only include revisions
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
232
      affecting the specified files, rather than all revisions.
233
234
    :param start_revision: If not None, only generate
235
      revisions >= start_revision
236
237
    :param end_revision: If not None, only generate
238
      revisions <= end_revision
239
240
    :param limit: If set, generate only 'limit' revisions, all revisions
241
      are shown if None or 0.
242
243
    :param message_search: If not None, only include revisions with
244
      matching commit messages
245
246
    :param levels: the number of levels of revisions to
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
247
      generate; 1 for just the mainline; 0 for all levels, or None for
6042.1.2 by Thomi Richards
Minor changes as a result of feedback from merge proposal.
248
      a sensible default.
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
249
250
    :param generate_tags: If True, include tags for matched revisions.
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
251
`
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
252
    :param delta_type: Either 'full', 'partial' or None.
253
      'full' means generate the complete delta - adds/deletes/modifies/etc;
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
254
      'partial' means filter the delta using specific_files;
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
255
      None means do not generate any delta.
256
257
    :param diff_type: Either 'full', 'partial' or None.
258
      'full' means generate the complete diff - adds/deletes/modifies/etc;
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
259
      'partial' means filter the diff using specific_files;
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
260
      None means do not generate any diff.
261
262
    :param _match_using_deltas: a private parameter controlling the
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
263
      algorithm used for matching specific_files. This parameter
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
264
      may be removed in the future so breezy client code should NOT
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
265
      use it.
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
266
267
    :param exclude_common_ancestry: Whether -rX..Y should be interpreted as a
268
      range operator or as a graph difference.
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
269
270
    :param signature: show digital signature information
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
271
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
272
    :param match: Dictionary of list of search strings to use when filtering
273
      revisions. Keys can be 'message', 'author', 'committer', 'bugs' or
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
274
      the empty string to match any of the preceding properties.
275
6123.11.6 by Vincent Ladeuil
Add new paraneters add signature's ends, fix a test and a typo, check that no errors and no output is emitted when using assertLogRevnos.
276
    :param omit_merges: If True, commits with more than one parent are
6123.11.4 by Martin von Gagern
Introduce an option "--omit-merges" for "bzr log".
277
      omitted.
278
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
279
    """
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
280
    # Take care of old style message_search parameter
281
    if message_search:
282
        if match:
283
            if 'message' in match:
284
                match['message'].append(message_search)
285
            else:
286
                match['message'] = [message_search]
287
        else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
288
            match = {'message': [message_search]}
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
289
    return {
290
        'direction': direction,
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
291
        'specific_files': specific_files,
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
292
        'start_revision': start_revision,
293
        'end_revision': end_revision,
294
        'limit': limit,
295
        'levels': levels,
296
        'generate_tags': generate_tags,
297
        'delta_type': delta_type,
298
        'diff_type': diff_type,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
299
        'exclude_common_ancestry': exclude_common_ancestry,
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
300
        'signature': signature,
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
301
        'match': match,
6123.11.4 by Martin von Gagern
Introduce an option "--omit-merges" for "bzr log".
302
        'omit_merges': omit_merges,
4202.2.1 by Ian Clatworthy
get directory logging working again
303
        # Add 'private' attributes for features that may be deprecated
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
304
        '_match_using_deltas': _match_using_deltas,
305
    }
306
307
308
def _apply_log_request_defaults(rqst):
309
    """Apply default values to a request dictionary."""
5753.3.1 by Andrew Bennetts
Quick fix for an obvious glitch in bzrlib.log: _DEFAULT_REQUEST_PARAMS was being mutated accidentally.
310
    result = _DEFAULT_REQUEST_PARAMS.copy()
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
311
    if rqst:
312
        result.update(rqst)
313
    return result
4202.2.1 by Ian Clatworthy
get directory logging working again
314
315
6767.1.1 by Jelmer Vernooij
Fix tests with gpg.
316
def format_signature_validity(rev_id, branch):
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
317
    """get the signature validity
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
318
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
319
    :param rev_id: revision id to validate
6767.1.1 by Jelmer Vernooij
Fix tests with gpg.
320
    :param branch: branch of revision
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
321
    :return: human readable string to print to log
322
    """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
323
    from breezy import gpg
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
324
6767.1.1 by Jelmer Vernooij
Fix tests with gpg.
325
    gpg_strategy = gpg.GPGStrategy(branch.get_config_stack())
326
    result = branch.repository.verify_revision_signature(rev_id, gpg_strategy)
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
327
    if result[0] == gpg.SIGNATURE_VALID:
6583.4.2 by Reagan Sanders
Fix an issue with UTF characters in GPG names. We were trying to stick the UTF strings from the GPG subsystem into plain ASCII format strings. Changed the format strings to be UTF as well.
328
        return u"valid signature from {0}".format(result[1])
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
329
    if result[0] == gpg.SIGNATURE_KEY_MISSING:
6583.4.3 by Reagan Sanders
Reverted the UTF change to the SIGNATURE_KEY_MISSING case, as the values here will always be a key ID, and that will never be non-ASCII.
330
        return "unknown key {0}".format(result[1])
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
331
    if result[0] == gpg.SIGNATURE_NOT_VALID:
5971.1.78 by Jonathan Riddell
apparantly we have no translation support
332
        return "invalid signature!"
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
333
    if result[0] == gpg.SIGNATURE_NOT_SIGNED:
5971.1.78 by Jonathan Riddell
apparantly we have no translation support
334
        return "no signature"
5971.1.54 by Jonathan Riddell
make format_signature_validity() global for use by qbzr
335
336
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
337
class LogGenerator(object):
338
    """A generator of log revisions."""
339
340
    def iter_log_revisions(self):
341
        """Iterate over LogRevision objects.
342
343
        :return: An iterator yielding LogRevision objects.
344
        """
345
        raise NotImplementedError(self.iter_log_revisions)
346
347
348
class Logger(object):
4955.5.3 by Vincent Ladeuil
Cleanup.
349
    """An object that generates, formats and displays a log."""
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
350
351
    def __init__(self, branch, rqst):
352
        """Create a Logger.
353
354
        :param branch: the branch to log
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
355
        :param rqst: A dictionary specifying the query parameters.
356
          See make_log_request_dict() for supported values.
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
357
        """
358
        self.branch = branch
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
359
        self.rqst = _apply_log_request_defaults(rqst)
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
360
361
    def show(self, lf):
362
        """Display the log.
363
364
        :param lf: The LogFormatter object to send the output to.
365
        """
366
        if not isinstance(lf, LogFormatter):
367
            warn("not a LogFormatter instance: %r" % lf)
368
6969.3.3 by Jelmer Vernooij
Use context managers in a few more places.
369
        with self.branch.lock_read():
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
370
            if getattr(lf, 'begin_log', None):
371
                lf.begin_log()
372
            self._show_body(lf)
373
            if getattr(lf, 'end_log', None):
374
                lf.end_log()
375
376
    def _show_body(self, lf):
377
        """Show the main log output.
378
379
        Subclasses may wish to override this.
380
        """
381
        # Tweak the LogRequest based on what the LogFormatter can handle.
382
        # (There's no point generating stuff if the formatter can't display it.)
383
        rqst = self.rqst
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
384
        if rqst['levels'] is None or lf.get_levels() > rqst['levels']:
385
            # user didn't specify levels, use whatever the LF can handle:
386
            rqst['levels'] = lf.get_levels()
387
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
388
        if not getattr(lf, 'supports_tags', False):
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
389
            rqst['generate_tags'] = False
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
390
        if not getattr(lf, 'supports_delta', False):
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
391
            rqst['delta_type'] = None
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
392
        if not getattr(lf, 'supports_diff', False):
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
393
            rqst['diff_type'] = None
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
394
        if not getattr(lf, 'supports_signatures', False):
395
            rqst['signature'] = False
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
396
397
        # Find and print the interesting revisions
398
        generator = self._generator_factory(self.branch, rqst)
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
399
        try:
400
            for lr in generator.iter_log_revisions():
401
                lf.log_revision(lr)
402
        except errors.GhostRevisionUnusableHere:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
403
            raise errors.CommandError(
7143.15.2 by Jelmer Vernooij
Run autopep8.
404
                gettext('Further revision history missing.'))
4208.2.1 by Ian Clatworthy
merge indicators in log --long
405
        lf.show_advice()
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
406
407
    def _generator_factory(self, branch, rqst):
408
        """Make the LogGenerator object to use.
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
409
4202.2.3 by Ian Clatworthy
replace show_log_request with a Logger class
410
        Subclasses may wish to override this.
411
        """
7490.73.4 by Jelmer Vernooij
Refactor.
412
        return _DefaultLogGenerator(branch, **rqst)
413
414
415
def _log_revision_iterator_using_per_file_graph(
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
416
        branch, delta_type, match, levels, path, start_rev_id, end_rev_id,
7490.73.4 by Jelmer Vernooij
Refactor.
417
        direction, exclude_common_ancestry):
418
    # Get the base revisions, filtering by the revision range.
419
    # Note that we always generate the merge revisions because
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
420
    # filter_revisions_touching_path() requires them ...
7490.73.4 by Jelmer Vernooij
Refactor.
421
    view_revisions = _calc_view_revisions(
422
        branch, start_rev_id, end_rev_id,
423
        direction, generate_merge_revisions=True,
424
        exclude_common_ancestry=exclude_common_ancestry)
425
    if not isinstance(view_revisions, list):
426
        view_revisions = list(view_revisions)
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
427
    view_revisions = _filter_revisions_touching_path(
428
        branch, path, view_revisions,
7490.73.4 by Jelmer Vernooij
Refactor.
429
        include_merges=levels != 1)
430
    return make_log_rev_iterator(
431
        branch, view_revisions, delta_type, match)
432
433
434
def _log_revision_iterator_using_delta_matching(
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
435
        branch, delta_type, match, levels, specific_files, start_rev_id, end_rev_id,
7490.73.4 by Jelmer Vernooij
Refactor.
436
        direction, exclude_common_ancestry, limit):
437
    # Get the base revisions, filtering by the revision range
438
    generate_merge_revisions = levels != 1
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
439
    delayed_graph_generation = not specific_files and (
7490.73.4 by Jelmer Vernooij
Refactor.
440
        limit or start_rev_id or end_rev_id)
441
    view_revisions = _calc_view_revisions(
442
        branch, start_rev_id, end_rev_id,
443
        direction,
444
        generate_merge_revisions=generate_merge_revisions,
445
        delayed_graph_generation=delayed_graph_generation,
446
        exclude_common_ancestry=exclude_common_ancestry)
447
448
    # Apply the other filters
449
    return make_log_rev_iterator(branch, view_revisions,
450
                                 delta_type, match,
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
451
                                 files=specific_files,
7490.73.4 by Jelmer Vernooij
Refactor.
452
                                 direction=direction)
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
453
454
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
455
def _format_diff(branch, rev, diff_type, files=None):
456
    """Format a diff.
457
458
    :param branch: Branch object
459
    :param rev: Revision object
460
    :param diff_type: Type of diff to generate
461
    :param files: List of files to generate diff for (or None for all)
462
    """
7490.73.5 by Jelmer Vernooij
Factor out format_diff.
463
    repo = branch.repository
464
    if len(rev.parent_ids) == 0:
465
        ancestor_id = _mod_revision.NULL_REVISION
466
    else:
467
        ancestor_id = rev.parent_ids[0]
468
    tree_1 = repo.revision_tree(ancestor_id)
469
    tree_2 = repo.revision_tree(rev.revision_id)
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
470
    if diff_type == 'partial' and files is not None:
471
        specific_files = files
7490.73.5 by Jelmer Vernooij
Factor out format_diff.
472
    else:
473
        specific_files = None
474
    s = BytesIO()
475
    path_encoding = get_diff_header_encoding()
476
    diff.show_diff_trees(tree_1, tree_2, s, specific_files, old_label='',
477
                         new_label='', path_encoding=path_encoding)
478
    return s.getvalue()
479
480
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
481
class _StartNotLinearAncestor(Exception):
482
    """Raised when a start revision is not found walking left-hand history."""
483
484
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
485
class _DefaultLogGenerator(LogGenerator):
486
    """The default generator of log revisions."""
4202.2.1 by Ian Clatworthy
get directory logging working again
487
7490.73.4 by Jelmer Vernooij
Refactor.
488
    def __init__(
489
            self, branch, levels=None, limit=None, diff_type=None,
490
            delta_type=None, show_signature=None, omit_merges=None,
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
491
            generate_tags=None, specific_files=None, match=None,
7490.73.4 by Jelmer Vernooij
Refactor.
492
            start_revision=None, end_revision=None, direction=None,
493
            exclude_common_ancestry=None, _match_using_deltas=None,
494
            signature=None):
4202.2.1 by Ian Clatworthy
get directory logging working again
495
        self.branch = branch
7490.73.4 by Jelmer Vernooij
Refactor.
496
        self.levels = levels
497
        self.limit = limit
498
        self.diff_type = diff_type
499
        self.delta_type = delta_type
500
        self.show_signature = signature
501
        self.omit_merges = omit_merges
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
502
        self.specific_files = specific_files
7490.73.4 by Jelmer Vernooij
Refactor.
503
        self.match = match
504
        self.start_revision = start_revision
505
        self.end_revision = end_revision
506
        self.direction = direction
507
        self.exclude_common_ancestry = exclude_common_ancestry
508
        self._match_using_deltas = _match_using_deltas
509
        if generate_tags and branch.supports_tags():
4202.2.1 by Ian Clatworthy
get directory logging working again
510
            self.rev_tag_dict = branch.tags.get_reverse_tag_dict()
511
        else:
512
            self.rev_tag_dict = {}
513
514
    def iter_log_revisions(self):
515
        """Iterate over LogRevision objects.
516
517
        :return: An iterator yielding LogRevision objects.
518
        """
519
        log_count = 0
520
        revision_iterator = self._create_log_revision_iterator()
521
        for revs in revision_iterator:
522
            for (rev_id, revno, merge_depth), rev, delta in revs:
523
                # 0 levels means show everything; merge_depth counts from 0
7490.73.1 by Jelmer Vernooij
Log refactoring.
524
                if (self.levels != 0 and merge_depth is not None and
525
                        merge_depth >= self.levels):
4202.2.1 by Ian Clatworthy
get directory logging working again
526
                    continue
7490.73.1 by Jelmer Vernooij
Log refactoring.
527
                if self.omit_merges and len(rev.parent_ids) > 1:
6123.11.4 by Martin von Gagern
Introduce an option "--omit-merges" for "bzr log".
528
                    continue
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
529
                if rev is None:
530
                    raise errors.GhostRevisionUnusableHere(rev_id)
7490.73.1 by Jelmer Vernooij
Log refactoring.
531
                if self.diff_type is None:
4379.4.1 by Ian Clatworthy
make log --long faster
532
                    diff = None
533
                else:
7490.73.5 by Jelmer Vernooij
Factor out format_diff.
534
                    diff = _format_diff(
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
535
                        self.branch, rev, self.diff_type,
536
                        self.specific_files)
7490.73.1 by Jelmer Vernooij
Log refactoring.
537
                if self.show_signature:
6767.1.1 by Jelmer Vernooij
Fix tests with gpg.
538
                    signature = format_signature_validity(rev_id, self.branch)
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
539
                else:
540
                    signature = None
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
541
                yield LogRevision(
542
                    rev, revno, merge_depth, delta,
543
                    self.rev_tag_dict.get(rev_id), diff, signature)
7490.73.1 by Jelmer Vernooij
Log refactoring.
544
                if self.limit:
4202.2.1 by Ian Clatworthy
get directory logging working again
545
                    log_count += 1
7490.73.1 by Jelmer Vernooij
Log refactoring.
546
                    if log_count >= self.limit:
4202.2.1 by Ian Clatworthy
get directory logging working again
547
                        return
548
549
    def _create_log_revision_iterator(self):
550
        """Create a revision iterator for log.
551
552
        :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
553
            delta).
554
        """
7490.73.4 by Jelmer Vernooij
Refactor.
555
        start_rev_id, end_rev_id = _get_revision_limits(
7490.73.1 by Jelmer Vernooij
Log refactoring.
556
            self.branch, self.start_revision, self.end_revision)
557
        if self._match_using_deltas:
7490.73.4 by Jelmer Vernooij
Refactor.
558
            return _log_revision_iterator_using_delta_matching(
559
                self.branch,
560
                delta_type=self.delta_type,
561
                match=self.match,
562
                levels=self.levels,
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
563
                specific_files=self.specific_files,
7490.73.4 by Jelmer Vernooij
Refactor.
564
                start_rev_id=start_rev_id, end_rev_id=end_rev_id,
565
                direction=self.direction,
566
                exclude_common_ancestry=self.exclude_common_ancestry,
567
                limit=self.limit)
4202.2.1 by Ian Clatworthy
get directory logging working again
568
        else:
569
            # We're using the per-file-graph algorithm. This scales really
570
            # well but only makes sense if there is a single file and it's
571
            # not a directory
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
572
            file_count = len(self.specific_files)
4202.2.1 by Ian Clatworthy
get directory logging working again
573
            if file_count != 1:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
574
                raise errors.BzrError(
575
                    "illegal LogRequest: must match-using-deltas "
576
                    "when logging %d files" % file_count)
7490.73.4 by Jelmer Vernooij
Refactor.
577
            return _log_revision_iterator_using_per_file_graph(
578
                self.branch,
579
                delta_type=self.delta_type,
580
                match=self.match,
581
                levels=self.levels,
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
582
                path=self.specific_files[0],
7490.73.4 by Jelmer Vernooij
Refactor.
583
                start_rev_id=start_rev_id, end_rev_id=end_rev_id,
584
                direction=self.direction,
585
                exclude_common_ancestry=self.exclude_common_ancestry
586
                )
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
587
588
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
589
def _calc_view_revisions(branch, start_rev_id, end_rev_id, direction,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
590
                         generate_merge_revisions,
591
                         delayed_graph_generation=False,
592
                         exclude_common_ancestry=False,
593
                         ):
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
594
    """Calculate the revisions to view.
595
596
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
597
             a list of the same tuples.
598
    """
5097.1.13 by Vincent Ladeuil
Add more tests.
599
    if (exclude_common_ancestry and start_rev_id == end_rev_id):
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
600
        raise errors.CommandError(gettext(
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
601
            '--exclude-common-ancestry requires two different revisions'))
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
602
    if direction not in ('reverse', 'forward'):
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
603
        raise ValueError(gettext('invalid direction %r') % direction)
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
604
    br_rev_id = branch.last_revision()
605
    if br_rev_id == _mod_revision.NULL_REVISION:
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
606
        return []
607
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
608
    if (end_rev_id and start_rev_id == end_rev_id
5129.1.3 by Vincent Ladeuil
Slightly refactor the direction handling in log.
609
        and (not generate_merge_revisions
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
610
             or not _has_merges(branch, end_rev_id))):
5097.1.13 by Vincent Ladeuil
Add more tests.
611
        # If a single revision is requested, check we can handle it
7143.15.2 by Jelmer Vernooij
Run autopep8.
612
        return _generate_one_revision(branch, end_rev_id, br_rev_id,
613
                                      branch.revno())
6376.1.1 by Vincent Ladeuil
Relax constraints on bzr log -rX..Y by falling back to the slower implementation when needed
614
    if not generate_merge_revisions:
615
        try:
616
            # If we only want to see linear revisions, we can iterate ...
617
            iter_revs = _linear_view_revisions(
618
                branch, start_rev_id, end_rev_id,
619
                exclude_common_ancestry=exclude_common_ancestry)
620
            # If a start limit was given and it's not obviously an
621
            # ancestor of the end limit, check it before outputting anything
622
            if (direction == 'forward'
623
                or (start_rev_id and not _is_obvious_ancestor(
7143.15.2 by Jelmer Vernooij
Run autopep8.
624
                    branch, start_rev_id, end_rev_id))):
625
                iter_revs = list(iter_revs)
6376.1.1 by Vincent Ladeuil
Relax constraints on bzr log -rX..Y by falling back to the slower implementation when needed
626
            if direction == 'forward':
627
                iter_revs = reversed(iter_revs)
628
            return iter_revs
629
        except _StartNotLinearAncestor:
630
            # Switch to the slower implementation that may be able to find a
631
            # non-obvious ancestor out of the left-hand history.
632
            pass
633
    iter_revs = _generate_all_revisions(branch, start_rev_id, end_rev_id,
634
                                        direction, delayed_graph_generation,
635
                                        exclude_common_ancestry)
636
    if direction == 'forward':
637
        iter_revs = _rebase_merge_depth(reverse_by_depth(list(iter_revs)))
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
638
    return iter_revs
4202.2.1 by Ian Clatworthy
get directory logging working again
639
640
4215.1.1 by Ian Clatworthy
remove supports_single_merge_revision
641
def _generate_one_revision(branch, rev_id, br_rev_id, br_revno):
4202.2.1 by Ian Clatworthy
get directory logging working again
642
    if rev_id == br_rev_id:
643
        # It's the tip
644
        return [(br_rev_id, br_revno, 0)]
645
    else:
5728.5.1 by Matt Giuca
log no longer raises NoSuchRevision against revisions in the
646
        revno_str = _compute_revno_str(branch, rev_id)
4202.2.1 by Ian Clatworthy
get directory logging working again
647
        return [(rev_id, revno_str, 0)]
648
649
650
def _generate_all_revisions(branch, start_rev_id, end_rev_id, direction,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
651
                            delayed_graph_generation,
652
                            exclude_common_ancestry=False):
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
653
    # On large trees, generating the merge graph can take 30-60 seconds
3936.3.32 by Ian Clatworthy
always delay merge graph generation until necessary
654
    # so we delay doing it until a merge is detected, incrementally
4955.7.5 by Vincent Ladeuil
Fixed as per Ian's review.
655
    # returning initial (non-merge) revisions while we can.
4955.7.3 by Vincent Ladeuil
Check ancestry so we don't output random revisions.
656
657
    # The above is only true for old formats (<= 0.92), for newer formats, a
658
    # couple of seconds only should be needed to load the whole graph and the
659
    # other graph operations needed are even faster than that -- vila 100201
3936.3.32 by Ian Clatworthy
always delay merge graph generation until necessary
660
    initial_revisions = []
3936.3.37 by Ian Clatworthy
selectively delay graph generation, not always
661
    if delayed_graph_generation:
662
        try:
7143.15.2 by Jelmer Vernooij
Run autopep8.
663
            for rev_id, revno, depth in _linear_view_revisions(
664
                    branch, start_rev_id, end_rev_id, exclude_common_ancestry):
3936.3.37 by Ian Clatworthy
selectively delay graph generation, not always
665
                if _has_merges(branch, rev_id):
4955.7.3 by Vincent Ladeuil
Check ancestry so we don't output random revisions.
666
                    # The end_rev_id can be nested down somewhere. We need an
667
                    # explicit ancestry check. There is an ambiguity here as we
668
                    # may not raise _StartNotLinearAncestor for a revision that
669
                    # is an ancestor but not a *linear* one. But since we have
670
                    # loaded the graph to do the check (or calculate a dotted
5092.1.4 by Vincent Ladeuil
Fixed as per Andrew's review.
671
                    # revno), we may as well accept to show the log...  We need
672
                    # the check only if start_rev_id is not None as all
673
                    # revisions have _mod_revision.NULL_REVISION as an ancestor
674
                    # -- vila 20100319
4955.7.3 by Vincent Ladeuil
Check ancestry so we don't output random revisions.
675
                    graph = branch.repository.get_graph()
5092.1.4 by Vincent Ladeuil
Fixed as per Andrew's review.
676
                    if (start_rev_id is not None
7143.15.2 by Jelmer Vernooij
Run autopep8.
677
                            and not graph.is_ancestor(start_rev_id, end_rev_id)):
5092.1.4 by Vincent Ladeuil
Fixed as per Andrew's review.
678
                        raise _StartNotLinearAncestor()
5097.1.1 by Vincent Ladeuil
Reduce duplication.
679
                    # Since we collected the revisions so far, we need to
680
                    # adjust end_rev_id.
3936.3.37 by Ian Clatworthy
selectively delay graph generation, not always
681
                    end_rev_id = rev_id
682
                    break
683
                else:
684
                    initial_revisions.append((rev_id, revno, depth))
685
            else:
686
                # No merged revisions found
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
687
                return initial_revisions
3936.3.37 by Ian Clatworthy
selectively delay graph generation, not always
688
        except _StartNotLinearAncestor:
689
            # A merge was never detected so the lower revision limit can't
690
            # be nested down somewhere
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
691
            raise errors.CommandError(gettext('Start revision not found in'
7143.15.2 by Jelmer Vernooij
Run autopep8.
692
                                                 ' history of end revision.'))
3936.3.15 by Ian Clatworthy
faster long log for a limited range with no merges
693
5097.1.1 by Vincent Ladeuil
Reduce duplication.
694
    # We exit the loop above because we encounter a revision with merges, from
695
    # this revision, we need to switch to _graph_view_revisions.
696
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
697
    # A log including nested merges is required. If the direction is reverse,
698
    # we rebase the initial merge depths so that the development line is
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
699
    # shown naturally, i.e. just like it is for linear logging. We can easily
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
700
    # make forward the exact opposite display, but showing the merge revisions
701
    # indented at the end seems slightly nicer in that case.
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
702
    view_revisions = itertools.chain(iter(initial_revisions),
7143.15.2 by Jelmer Vernooij
Run autopep8.
703
                                     _graph_view_revisions(branch, start_rev_id, end_rev_id,
704
                                                           rebase_initial_depths=(
705
                                                               direction == 'reverse'),
706
                                                           exclude_common_ancestry=exclude_common_ancestry))
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
707
    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.
708
530 by Martin Pool
- put back verbose log support for reversed logs
709
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
710
def _has_merges(branch, rev_id):
711
    """Does a revision have multiple parents or not?"""
3936.3.40 by Ian Clatworthy
review feedback from jam
712
    parents = branch.repository.get_parent_map([rev_id]).get(rev_id, [])
713
    return len(parents) > 1
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
714
715
5728.5.1 by Matt Giuca
log no longer raises NoSuchRevision against revisions in the
716
def _compute_revno_str(branch, rev_id):
717
    """Compute the revno string from a rev_id.
718
5728.5.5 by Matt Giuca
log: If a revision is not in the branch, it now sets its revno to None
719
    :return: The revno string, or None if the revision is not in the supplied
720
        branch.
5728.5.1 by Matt Giuca
log no longer raises NoSuchRevision against revisions in the
721
    """
722
    try:
723
        revno = branch.revision_id_to_dotted_revno(rev_id)
724
    except errors.NoSuchRevision:
5728.5.5 by Matt Giuca
log: If a revision is not in the branch, it now sets its revno to None
725
        # The revision must be outside of this branch
726
        return None
5728.5.1 by Matt Giuca
log no longer raises NoSuchRevision against revisions in the
727
    else:
728
        return '.'.join(str(n) for n in revno)
729
730
3936.3.31 by Ian Clatworthy
nicer obvious ancestor checking
731
def _is_obvious_ancestor(branch, start_rev_id, end_rev_id):
732
    """Is start_rev_id an obvious ancestor of end_rev_id?"""
733
    if start_rev_id and end_rev_id:
5728.5.1 by Matt Giuca
log no longer raises NoSuchRevision against revisions in the
734
        try:
735
            start_dotted = branch.revision_id_to_dotted_revno(start_rev_id)
736
            end_dotted = branch.revision_id_to_dotted_revno(end_rev_id)
737
        except errors.NoSuchRevision:
738
            # one or both is not in the branch; not obvious
739
            return False
3936.3.31 by Ian Clatworthy
nicer obvious ancestor checking
740
        if len(start_dotted) == 1 and len(end_dotted) == 1:
741
            # both on mainline
742
            return start_dotted[0] <= end_dotted[0]
743
        elif (len(start_dotted) == 3 and len(end_dotted) == 3 and
7143.15.2 by Jelmer Vernooij
Run autopep8.
744
              start_dotted[0:1] == end_dotted[0:1]):
3936.3.31 by Ian Clatworthy
nicer obvious ancestor checking
745
            # both on same development line
746
            return start_dotted[2] <= end_dotted[2]
747
        else:
748
            # not obvious
3936.3.18 by Ian Clatworthy
faster incremental results for FILE logging
749
            return False
4955.5.3 by Vincent Ladeuil
Cleanup.
750
    # if either start or end is not specified then we use either the first or
751
    # the last revision and *they* are obvious ancestors.
3936.3.18 by Ian Clatworthy
faster incremental results for FILE logging
752
    return True
753
754
5268.4.3 by Vincent Ladeuil
Respect --exclude-common-ancestry for linear ancestries.
755
def _linear_view_revisions(branch, start_rev_id, end_rev_id,
756
                           exclude_common_ancestry=False):
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
757
    """Calculate a sequence of revisions to view, newest to oldest.
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
758
3936.3.32 by Ian Clatworthy
always delay merge graph generation until necessary
759
    :param start_rev_id: the lower revision-id
760
    :param end_rev_id: the upper revision-id
5268.4.3 by Vincent Ladeuil
Respect --exclude-common-ancestry for linear ancestries.
761
    :param exclude_common_ancestry: Whether the start_rev_id should be part of
762
        the iterated revisions.
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
763
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
764
        dotted_revno will be None for ghosts
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
765
    :raises _StartNotLinearAncestor: if a start_rev_id is specified but
5268.4.3 by Vincent Ladeuil
Respect --exclude-common-ancestry for linear ancestries.
766
        is not found walking the left-hand history
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
767
    """
3943.4.5 by John Arbash Meinel
Restore _linear_view_revisions.
768
    repo = branch.repository
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
769
    graph = repo.get_graph()
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
770
    if start_rev_id is None and end_rev_id is None:
7339.1.3 by Jelmer Vernooij
Support calculate_revnos option.
771
        if branch._format.stores_revno() or \
772
                config.GlobalStack().get('calculate_revnos'):
773
            try:
774
                br_revno, br_rev_id = branch.last_revision_info()
775
            except errors.GhostRevisionsHaveNoRevno:
776
                br_rev_id = branch.last_revision()
777
                cur_revno = None
778
            else:
779
                cur_revno = br_revno
780
        else:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
781
            br_rev_id = branch.last_revision()
782
            cur_revno = None
7339.1.3 by Jelmer Vernooij
Support calculate_revnos option.
783
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
784
        graph_iter = graph.iter_lefthand_ancestry(br_rev_id,
7143.15.2 by Jelmer Vernooij
Run autopep8.
785
                                                  (_mod_revision.NULL_REVISION,))
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
786
        while True:
787
            try:
6716.2.3 by Jelmer Vernooij
Use next(iter) and avoid unnecessary catching of StopIteration.
788
                revision_id = next(graph_iter)
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
789
            except errors.RevisionNotPresent as e:
790
                # Oops, a ghost.
791
                yield e.revision_id, None, None
792
                break
7027.4.7 by Jelmer Vernooij
Fix some tests.
793
            except StopIteration:
794
                break
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
795
            else:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
796
                yield revision_id, str(cur_revno) if cur_revno is not None else None, 0
797
                if cur_revno is not None:
798
                    cur_revno -= 1
3936.3.14 by Ian Clatworthy
bug fix
799
    else:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
800
        br_rev_id = branch.last_revision()
3936.3.14 by Ian Clatworthy
bug fix
801
        if end_rev_id is None:
802
            end_rev_id = br_rev_id
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
803
        found_start = start_rev_id is None
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
804
        graph_iter = graph.iter_lefthand_ancestry(end_rev_id,
7143.15.2 by Jelmer Vernooij
Run autopep8.
805
                                                  (_mod_revision.NULL_REVISION,))
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
806
        while True:
807
            try:
6716.2.3 by Jelmer Vernooij
Use next(iter) and avoid unnecessary catching of StopIteration.
808
                revision_id = next(graph_iter)
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
809
            except StopIteration:
810
                break
811
            except errors.RevisionNotPresent as e:
812
                # Oops, a ghost.
813
                yield e.revision_id, None, None
814
                break
815
            else:
816
                revno_str = _compute_revno_str(branch, revision_id)
817
                if not found_start and revision_id == start_rev_id:
818
                    if not exclude_common_ancestry:
819
                        yield revision_id, revno_str, 0
820
                    found_start = True
821
                    break
822
                else:
5268.4.3 by Vincent Ladeuil
Respect --exclude-common-ancestry for linear ancestries.
823
                    yield revision_id, revno_str, 0
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
824
        if not found_start:
825
            raise _StartNotLinearAncestor()
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
826
827
3936.3.32 by Ian Clatworthy
always delay merge graph generation until necessary
828
def _graph_view_revisions(branch, start_rev_id, end_rev_id,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
829
                          rebase_initial_depths=True,
830
                          exclude_common_ancestry=False):
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
831
    """Calculate revisions to view including merges, newest to oldest.
832
833
    :param branch: the branch
3936.3.32 by Ian Clatworthy
always delay merge graph generation until necessary
834
    :param start_rev_id: the lower revision-id
835
    :param end_rev_id: the upper revision-id
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
836
    :param rebase_initial_depth: should depths be rebased until a mainline
837
      revision is found?
838
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
839
    """
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
840
    if exclude_common_ancestry:
841
        stop_rule = 'with-merges-without-common-ancestry'
842
    else:
843
        stop_rule = 'with-merges'
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
844
    view_revisions = branch.iter_merge_sorted_revisions(
845
        start_revision_id=end_rev_id, stop_revision_id=start_rev_id,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
846
        stop_rule=stop_rule)
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
847
    if not rebase_initial_depths:
848
        for (rev_id, merge_depth, revno, end_of_merge
849
             ) in view_revisions:
850
            yield rev_id, '.'.join(map(str, revno)), merge_depth
851
    else:
852
        # We're following a development line starting at a merged revision.
853
        # We need to adjust depths down by the initial depth until we find
854
        # a depth less than it. Then we use that depth as the adjustment.
855
        # If and when we reach the mainline, depth adjustment ends.
856
        depth_adjustment = None
857
        for (rev_id, merge_depth, revno, end_of_merge
858
             ) in view_revisions:
859
            if depth_adjustment is None:
860
                depth_adjustment = merge_depth
861
            if depth_adjustment:
862
                if merge_depth < depth_adjustment:
4955.5.3 by Vincent Ladeuil
Cleanup.
863
                    # From now on we reduce the depth adjustement, this can be
864
                    # surprising for users. The alternative requires two passes
865
                    # which breaks the fast display of the first revision
866
                    # though.
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
867
                    depth_adjustment = merge_depth
868
                merge_depth -= depth_adjustment
869
            yield rev_id, '.'.join(map(str, revno)), merge_depth
870
871
872
def _rebase_merge_depth(view_revisions):
873
    """Adjust depths upwards so the top level is 0."""
874
    # If either the first or last revision have a merge_depth of 0, we're done
875
    if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
876
        min_depth = min([d for r, n, d in view_revisions])
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
877
        if min_depth != 0:
7143.15.2 by Jelmer Vernooij
Run autopep8.
878
            view_revisions = [(r, n, d - min_depth)
879
                              for r, n, d in view_revisions]
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
880
    return view_revisions
881
882
3936.3.16 by Ian Clatworthy
use deltas to match files in selected use cases
883
def make_log_rev_iterator(branch, view_revisions, generate_delta, search,
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
884
                          files=None, direction='reverse'):
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
885
    """Create a revision iterator for log.
886
887
    :param branch: The branch being logged.
888
    :param view_revisions: The revisions being viewed.
889
    :param generate_delta: Whether to generate a delta for each revision.
4202.2.1 by Ian Clatworthy
get directory logging working again
890
      Permitted values are None, 'full' and 'partial'.
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
891
    :param search: A user text search string.
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
892
    :param files: If non empty, only revisions matching one or more of
893
      the files are to be kept.
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
894
    :param direction: the direction in which view_revisions is sorted
3642.1.7 by Robert Collins
Review feedback.
895
    :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.
896
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
897
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
898
    # Convert view_revisions into (view, None, None) groups to fit with
899
    # the standard interface here.
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
900
    if isinstance(view_revisions, list):
3642.1.7 by Robert Collins
Review feedback.
901
        # A single batch conversion is faster than many incremental ones.
902
        # As we have all the data, do a batch conversion.
3642.1.5 by Robert Collins
Separate out batching of revisions.
903
        nones = [None] * len(view_revisions)
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
904
        log_rev_iterator = iter([list(zip(view_revisions, nones, nones))])
3642.1.5 by Robert Collins
Separate out batching of revisions.
905
    else:
906
        def _convert():
907
            for view in view_revisions:
908
                yield (view, None, None)
909
        log_rev_iterator = iter([_convert()])
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
910
    for adapter in log_adapters:
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
911
        # It would be nicer if log adapters were first class objects
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
912
        # with custom parameters. This will do for now. IGC 20090127
913
        if adapter == _make_delta_filter:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
914
            log_rev_iterator = adapter(
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
915
                branch, generate_delta, search, log_rev_iterator, files,
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
916
                direction)
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
917
        else:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
918
            log_rev_iterator = adapter(
919
                branch, generate_delta, search, log_rev_iterator)
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
920
    return log_rev_iterator
921
922
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
923
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
924
    """Create a filtered iterator of log_rev_iterator matching on a regex.
925
926
    :param branch: The branch being logged.
927
    :param generate_delta: Whether to generate a delta for each revision.
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
928
    :param match: A dictionary with properties as keys and lists of strings
929
        as values. To match, a revision may match any of the supplied strings
930
        within a single property but must match at least one string for each
931
        property.
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
932
    :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.
933
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
934
    :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.
935
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
936
    """
6716.1.1 by Jelmer Vernooij
When no --match options are specified, match is an empty dict, not None.
937
    if not match:
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
938
        return log_rev_iterator
7169.2.3 by Martin
Fix bb.test_log test failure
939
    # Use lazy_compile so mapping to InvalidPattern error occurs.
940
    searchRE = [(k, [lazy_regex.lazy_compile(x, re.IGNORECASE) for x in v])
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
941
                for k, v in match.items()]
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
942
    return _filter_re(searchRE, log_rev_iterator)
943
944
945
def _filter_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.
946
    for revs in log_rev_iterator:
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
947
        new_revs = [rev for rev in revs if _match_filter(searchRE, rev[1])]
948
        if new_revs:
949
            yield new_revs
950
7143.15.2 by Jelmer Vernooij
Run autopep8.
951
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
952
def _match_filter(searchRE, rev):
953
    strings = {
7143.15.2 by Jelmer Vernooij
Run autopep8.
954
        'message': (rev.message,),
955
        'committer': (rev.committer,),
956
        'author': (rev.get_apparent_authors()),
957
        'bugs': list(rev.iter_bugs())
958
        }
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
959
    strings[''] = [item for inner_list in strings.values()
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
960
                   for item in inner_list]
7169.2.3 by Martin
Fix bb.test_log test failure
961
    for k, v in searchRE:
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
962
        if k in strings and not _match_any_filter(strings[k], v):
963
            return False
964
    return True
965
7143.15.2 by Jelmer Vernooij
Run autopep8.
966
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
967
def _match_any_filter(strings, res):
7169.2.3 by Martin
Fix bb.test_log test failure
968
    return any(r.search(s) for r in res for s in strings)
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.
969
7143.15.2 by Jelmer Vernooij
Run autopep8.
970
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
971
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
972
                       files=None, direction='reverse'):
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.
973
    """Add revision deltas to a log iterator if needed.
974
975
    :param branch: The branch being logged.
976
    :param generate_delta: Whether to generate a delta for each revision.
4202.2.1 by Ian Clatworthy
get directory logging working again
977
      Permitted values are None, 'full' and 'partial'.
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.
978
    :param search: A user text search string.
979
    :param log_rev_iterator: An input iterator containing all revisions that
980
        could be displayed, in lists.
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
981
    :param files: If non empty, only revisions matching one or more of
982
      the files are to be kept.
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
983
    :param direction: the direction in which view_revisions is sorted
3642.1.7 by Robert Collins
Review feedback.
984
    :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.
985
        delta).
986
    """
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
987
    if not generate_delta and not files:
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.
988
        return log_rev_iterator
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
989
    return _generate_deltas(branch.repository, log_rev_iterator,
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
990
                            generate_delta, files, direction)
991
992
993
def _generate_deltas(repository, log_rev_iterator, delta_type, files,
7143.15.2 by Jelmer Vernooij
Run autopep8.
994
                     direction):
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
995
    """Create deltas for each batch of revisions in log_rev_iterator.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
996
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
997
    If we're only generating deltas for the sake of filtering against
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
998
    files, we stop generating deltas once all files reach the
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
999
    appropriate life-cycle point. If we're receiving data newest to
1000
    oldest, then that life-cycle point is 'add', otherwise it's 'remove'.
1001
    """
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1002
    check_files = files is not None and len(files) > 0
1003
    if check_files:
1004
        file_set = set(files)
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
1005
        if direction == 'reverse':
1006
            stop_on = 'add'
1007
        else:
1008
            stop_on = 'remove'
1009
    else:
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1010
        file_set = None
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.
1011
    for revs in log_rev_iterator:
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1012
        # If we were matching against files and we've run out,
3936.3.40 by Ian Clatworthy
review feedback from jam
1013
        # there's nothing left to do
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1014
        if check_files and not file_set:
3936.3.40 by Ian Clatworthy
review feedback from jam
1015
            return
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.
1016
        revisions = [rev[1] for rev in revs]
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
1017
        new_revs = []
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1018
        if delta_type == 'full' and not check_files:
7490.71.1 by Jelmer Vernooij
Add Repository.get_revision_deltas.
1019
            deltas = repository.get_revision_deltas(revisions)
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
1020
            for rev, delta in zip(revs, deltas):
4202.2.1 by Ian Clatworthy
get directory logging working again
1021
                new_revs.append((rev[0], rev[1], delta))
1022
        else:
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1023
            deltas = repository.get_revision_deltas(
1024
                revisions, specific_files=file_set)
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
1025
            for rev, delta in zip(revs, deltas):
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1026
                if check_files:
4202.2.1 by Ian Clatworthy
get directory logging working again
1027
                    if delta is None or not delta.has_changed():
1028
                        continue
1029
                    else:
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1030
                        _update_files(delta, file_set, stop_on)
4202.2.1 by Ian Clatworthy
get directory logging working again
1031
                        if delta_type is None:
1032
                            delta = None
1033
                        elif delta_type == 'full':
1034
                            # If the file matches all the time, rebuilding
1035
                            # a full delta like this in addition to a partial
4202.2.4 by Ian Clatworthy
comment tweak from vila's review
1036
                            # one could be slow. However, it's likely that
4202.2.1 by Ian Clatworthy
get directory logging working again
1037
                            # most revisions won't get this far, making it
1038
                            # faster to filter on the partial deltas and
1039
                            # build the occasional full delta than always
1040
                            # building full deltas and filtering those.
1041
                            rev_id = rev[0][0]
1042
                            delta = repository.get_revision_delta(rev_id)
1043
                new_revs.append((rev[0], rev[1], delta))
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
1044
        yield new_revs
1045
1046
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1047
def _update_files(delta, files, stop_on):
1048
    """Update the set of files to search based on file lifecycle events.
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
1049
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1050
    :param files: a set of files to update
1051
    :param stop_on: either 'add' or 'remove' - take files out of the
1052
      files set once their add or remove entry is detected respectively
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
1053
    """
4202.2.1 by Ian Clatworthy
get directory logging working again
1054
    if stop_on == 'add':
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1055
        for item in delta.added:
1056
            if item.path[1] in files:
1057
                files.remove(item.path[1])
1058
        for item in delta.copied + delta.renamed:
7490.73.9 by Jelmer Vernooij
Simplify log browsing.
1059
            if item.path[1] in files:
1060
                files.remove(item.path[1])
1061
                files.add(item.path[0])
1062
            if item.kind[1] == 'directory':
1063
                for path in list(files):
1064
                    if is_inside(item.path[1], path):
1065
                        files.remove(path)
1066
                        files.add(item.path[0] + path[len(item.path[1]):])
4202.2.1 by Ian Clatworthy
get directory logging working again
1067
    elif stop_on == 'delete':
1068
        for item in delta.removed:
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1069
            if item.path[0] in files:
1070
                files.remove(item.path[0])
1071
        for item in delta.copied + delta.renamed:
7490.73.9 by Jelmer Vernooij
Simplify log browsing.
1072
            if item.path[0] in files:
1073
                files.remove(item.path[0])
1074
                files.add(item.path[1])
1075
            if item.kind[0] == 'directory':
1076
                for path in list(files):
1077
                    if is_inside(item.path[0], path):
1078
                        files.remove(path)
1079
                        files.add(item.path[1] + path[len(item.path[0]):])
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
1080
1081
3642.1.7 by Robert Collins
Review feedback.
1082
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.
1083
    """Extract revision objects from the repository
1084
1085
    :param branch: The branch being logged.
1086
    :param generate_delta: Whether to generate a delta for each revision.
1087
    :param search: A user text search string.
1088
    :param log_rev_iterator: An input iterator containing all revisions that
1089
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
1090
    :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.
1091
        delta).
1092
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
1093
    repository = branch.repository
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
1094
    for revs in log_rev_iterator:
1095
        # r = revision_id, n = revno, d = merge depth
1096
        revision_ids = [view[0] for view, _, _ in revs]
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
1097
        revisions = dict(repository.iter_revisions(revision_ids))
1098
        yield [(rev[0], revisions[rev[0][0]], rev[2]) for rev in revs]
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
1099
1100
3642.1.7 by Robert Collins
Review feedback.
1101
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):
3642.1.5 by Robert Collins
Separate out batching of revisions.
1102
    """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.
1103
1104
    :param branch: The branch being logged.
1105
    :param generate_delta: Whether to generate a delta for each revision.
1106
    :param search: A user text search string.
3642.1.5 by Robert Collins
Separate out batching of revisions.
1107
    :param log_rev_iterator: An input iterator containing all revisions that
1108
        could be displayed, in lists.
3874.2.4 by Vincent Ladeuil
Fix too long lines.
1109
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
1110
        delta).
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
1111
    """
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
1112
    num = 9
3642.1.5 by Robert Collins
Separate out batching of revisions.
1113
    for batch in log_rev_iterator:
1114
        batch = iter(batch)
1115
        while True:
1116
            step = [detail for _, detail in zip(range(num), batch)]
1117
            if len(step) == 0:
1118
                break
1119
            yield step
1120
            num = min(int(num * 1.5), 200)
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
1121
1122
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
1123
def _get_revision_limits(branch, start_revision, end_revision):
1124
    """Get and check revision limits.
1125
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1126
    :param branch: The branch containing the revisions.
1127
1128
    :param start_revision: The first revision to be logged, as a RevisionInfo.
1129
1130
    :param end_revision: The last revision to be logged, as a RevisionInfo
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1131
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1132
    :return: (start_rev_id, end_rev_id) tuple.
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1133
    """
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1134
    start_rev_id = None
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
1135
    start_revno = None
1136
    if start_revision is not None:
1137
        if not isinstance(start_revision, revisionspec.RevisionInfo):
1138
            raise TypeError(start_revision)
1139
        start_rev_id = start_revision.rev_id
1140
        start_revno = start_revision.revno
1141
    if start_revno is None:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1142
        start_revno = 1
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1143
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1144
    end_rev_id = None
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
1145
    end_revno = None
1146
    if end_revision is not None:
1147
        if not isinstance(end_revision, revisionspec.RevisionInfo):
1148
            raise TypeError(start_revision)
1149
        end_rev_id = end_revision.rev_id
1150
        end_revno = end_revision.revno
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1151
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
1152
    if branch.last_revision() != _mod_revision.NULL_REVISION:
3936.3.4 by Ian Clatworthy
fix empty_branch log
1153
        if (start_rev_id == _mod_revision.NULL_REVISION
7143.15.2 by Jelmer Vernooij
Run autopep8.
1154
                or end_rev_id == _mod_revision.NULL_REVISION):
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
1155
            raise errors.CommandError(
7143.15.2 by Jelmer Vernooij
Run autopep8.
1156
                gettext('Logging revision 0 is invalid.'))
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
1157
        if end_revno is not None and start_revno > end_revno:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
1158
            raise errors.CommandError(
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
1159
                gettext("Start revision must be older than the end revision."))
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1160
    return (start_rev_id, end_rev_id)
1161
1162
1163
def _get_mainline_revs(branch, start_revision, end_revision):
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
1164
    """Get the mainline revisions from the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1165
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1166
    Generates the list of mainline revisions for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1167
1168
    :param  branch: The branch containing the revisions.
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1169
1170
    :param  start_revision: The first revision to be logged.
1171
            For backwards compatibility this may be a mainline integer revno,
1172
            but for merge revision support a RevisionInfo is expected.
1173
1174
    :param  end_revision: The last revision to be logged.
1175
            For backwards compatibility this may be a mainline integer revno,
1176
            but for merge revision support a RevisionInfo is expected.
1177
1178
    :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
1179
    """
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1180
    branch_revno, branch_last_revision = branch.last_revision_info()
1181
    if branch_revno == 0:
1182
        return None, None, None, None
1183
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1184
    # For mainline generation, map start_revision and end_revision to
1185
    # mainline revnos. If the revision is not on the mainline choose the
1186
    # appropriate extreme of the mainline instead - the extra will be
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1187
    # filtered later.
1188
    # Also map the revisions to rev_ids, to be used in the later filtering
1189
    # stage.
1190
    start_rev_id = None
1191
    if start_revision is None:
1192
        start_revno = 1
1193
    else:
1194
        if isinstance(start_revision, revisionspec.RevisionInfo):
1195
            start_rev_id = start_revision.rev_id
1196
            start_revno = start_revision.revno or 1
1197
        else:
1198
            branch.check_real_revno(start_revision)
1199
            start_revno = start_revision
1200
1201
    end_rev_id = None
1202
    if end_revision is None:
1203
        end_revno = branch_revno
1204
    else:
1205
        if isinstance(end_revision, revisionspec.RevisionInfo):
1206
            end_rev_id = end_revision.rev_id
1207
            end_revno = end_revision.revno or branch_revno
1208
        else:
1209
            branch.check_real_revno(end_revision)
1210
            end_revno = end_revision
1211
1212
    if ((start_rev_id == _mod_revision.NULL_REVISION)
7143.15.2 by Jelmer Vernooij
Run autopep8.
1213
            or (end_rev_id == _mod_revision.NULL_REVISION)):
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
1214
        raise errors.CommandError(gettext('Logging revision 0 is invalid.'))
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1215
    if start_revno > end_revno:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
1216
        raise errors.CommandError(gettext("Start revision must be older "
7143.15.2 by Jelmer Vernooij
Run autopep8.
1217
                                             "than the end revision."))
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1218
1219
    if end_revno < start_revno:
1220
        return None, None, None, None
1221
    cur_revno = branch_revno
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
1222
    rev_nos = {}
1223
    mainline_revs = []
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
1224
    graph = branch.repository.get_graph()
1225
    for revision_id in graph.iter_lefthand_ancestry(
1226
            branch_last_revision, (_mod_revision.NULL_REVISION,)):
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
1227
        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.
1228
            # 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()'
1229
            rev_nos[revision_id] = cur_revno
1230
            mainline_revs.append(revision_id)
1231
            break
1232
        if cur_revno <= end_revno:
1233
            rev_nos[revision_id] = cur_revno
1234
            mainline_revs.append(revision_id)
1235
        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.
1236
    else:
1237
        # We walked off the edge of all revisions, so we add a 'None' marker
1238
        mainline_revs.append(None)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1239
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
1240
    mainline_revs.reverse()
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1241
1242
    # override the mainline to look like the revision history.
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1243
    return mainline_revs, rev_nos, start_rev_id, end_rev_id
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1244
1245
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1246
def _filter_revisions_touching_path(branch, path, view_revisions,
1247
                                    include_merges=True):
1248
    r"""Return the list of revision ids which touch a given path.
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1249
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1250
    The function filters view_revisions and returns a subset.
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1251
    This includes the revisions which directly change the path,
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1252
    and the revisions which merge these changes. So if the
1253
    revision graph is::
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1254
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1255
        A-.
1256
        |\ \
1257
        B C E
1258
        |/ /
1259
        D |
1260
        |\|
1261
        | F
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1262
        |/
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1263
        G
1264
1265
    And 'C' changes a file, then both C and D will be returned. F will not be
1266
    returned even though it brings the changes to C into the branch starting
1267
    with E. (Note that if we were using F as the tip instead of G, then we
1268
    would see C, D, F.)
1269
1270
    This will also be restricted based on a subset of the mainline.
1271
1272
    :param branch: The branch where we can get text revision information.
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
1273
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1274
    :param path: Filter out revisions that do not touch path.
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
1275
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1276
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1277
        tuples. This is the list of revisions which will be filtered. It is
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
1278
        assumed that view_revisions is in merge_sort order (i.e. newest
1279
        revision first ).
1280
3940.1.3 by Ian Clatworthy
fix code
1281
    :param include_merges: include merge revisions in the result or not
1282
2359.1.8 by John Arbash Meinel
doc
1283
    :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.
1284
    """
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1285
    # Lookup all possible text keys to determine which ones actually modified
1286
    # the file.
5815.5.12 by Jelmer Vernooij
Fix use of file graph.
1287
    graph = branch.repository.get_file_graph()
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
1288
    start_tree = branch.repository.revision_tree(view_revisions[0][0])
1289
    file_id = start_tree.path2id(path)
5815.5.10 by Jelmer Vernooij
Fix two issues pointed out by John.
1290
    get_parent_map = graph.get_parent_map
5815.5.8 by Jelmer Vernooij
Use traditional (fileid, revision) entries in file graph.
1291
    text_keys = [(file_id, rev_id) for rev_id, revno, depth in view_revisions]
4183.3.1 by Vincent Ladeuil
Fix bug #346431 by allowing log._filter_revisions_touching_file_id to be
1292
    next_keys = None
3711.3.16 by John Arbash Meinel
Doc update.
1293
    # Looking up keys in batches of 1000 can cut the time in half, as well as
1294
    # memory consumption. GraphIndex *does* like to look for a few keys in
1295
    # 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.
1296
    # TODO: This code needs to be re-evaluated periodically as we tune the
1297
    #       indexing layer. We might consider passing in hints as to the known
1298
    #       access pattern (sparse/clustered, high success rate/low success
1299
    #       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.
1300
    modified_text_revisions = set()
1301
    chunk_size = 1000
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1302
    for start in range(0, len(text_keys), chunk_size):
3711.3.15 by John Arbash Meinel
Work around GraphIndex inefficiencies by requesting keys 1000 at a time.
1303
        next_keys = text_keys[start:start + chunk_size]
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1304
        # 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.
1305
        modified_text_revisions.update(
5815.5.10 by Jelmer Vernooij
Fix two issues pointed out by John.
1306
            [k[1] for k in get_parent_map(next_keys)])
3711.3.15 by John Arbash Meinel
Work around GraphIndex inefficiencies by requesting keys 1000 at a time.
1307
    del text_keys, next_keys
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
1308
1309
    result = []
1310
    # Track what revisions will merge the current revision, replace entries
1311
    # with 'None' when they have been added to result
1312
    current_merge_stack = [None]
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1313
    for info in view_revisions:
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
1314
        rev_id, revno, depth = info
1315
        if depth == len(current_merge_stack):
1316
            current_merge_stack.append(info)
1317
        else:
1318
            del current_merge_stack[depth + 1:]
1319
            current_merge_stack[-1] = info
1320
1321
        if rev_id in modified_text_revisions:
1322
            # This needs to be logged, along with the extra revisions
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1323
            for idx in range(len(current_merge_stack)):
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
1324
                node = current_merge_stack[idx]
1325
                if node is not None:
3940.1.3 by Ian Clatworthy
fix code
1326
                    if include_merges or node[2] == 0:
1327
                        result.append(node)
1328
                        current_merge_stack[idx] = None
3711.3.4 by John Arbash Meinel
Significantly faster, but consuming more memory.
1329
    return result
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1330
1331
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1332
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1333
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1334
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1335
    Revisions with a different depth are sorted as a group with the previous
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
1336
    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
1337
    but it looks much nicer.
1338
    """
3842.2.6 by Vincent Ladeuil
Fix typo.
1339
    # 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.
1340
    merge_sorted_revisions = [(None, None, _depth)] + merge_sorted_revisions
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1341
    zd_revisions = []
1342
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1343
        if val[2] == _depth:
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1344
            # Each revision at the current depth becomes a chunk grouping all
1345
            # higher depth revisions.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1346
            zd_revisions.append([val])
1347
        else:
1348
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1349
    for revisions in zd_revisions:
1350
        if len(revisions) > 1:
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1351
            # 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.
1352
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1353
    zd_revisions.reverse()
1354
    result = []
1355
    for chunk in zd_revisions:
1356
        result.extend(chunk)
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1357
    if _depth == 0:
1358
        # Top level call, get rid of the fake revisions that have been added
1359
        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
1360
    return result
1361
1362
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.
1363
class LogRevision(object):
1364
    """A revision to be logged (by LogFormatter.log_revision).
1365
1366
    A simple wrapper for the attributes of a revision to be logged.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1367
    The attributes may or may not be populated, as determined by the
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.
1368
    logging options and the log formatter capabilities.
1369
    """
1370
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
1371
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1372
                 tags=None, diff=None, signature=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.
1373
        self.rev = rev
5728.5.7 by Matt Giuca
log: Avoid using a conditional expression for Python 2.4 compatibility.
1374
        if revno is None:
1375
            self.revno = None
1376
        else:
1377
            self.revno = str(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.
1378
        self.merge_depth = merge_depth
1379
        self.delta = delta
1380
        self.tags = tags
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1381
        self.diff = diff
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1382
        self.signature = signature
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.
1383
1384
794 by Martin Pool
- Merge John's nice short-log format.
1385
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.
1386
    """Abstract class to display log messages.
1387
1388
    At a minimum, a derived class must implement the log_revision method.
1389
1390
    If the LogFormatter needs to be informed of the beginning or end of
1391
    a log it should implement the begin_log and/or end_log hook methods.
1392
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1393
    A LogFormatter should define the following supports_XXX flags
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.
1394
    to indicate which LogRevision attributes it supports:
1395
1396
    - supports_delta must be True if this log formatter supports delta.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1397
      Otherwise the delta attribute may not be populated.  The 'delta_format'
1398
      attribute describes whether the 'short_status' format (1) or the long
1399
      one (2) should be used.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1400
1401
    - supports_merge_revisions must be True if this log formatter supports
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1402
      merge revisions.  If not, then only mainline revisions will be passed
1403
      to the formatter.
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1404
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1405
    - preferred_levels is the number of levels this formatter defaults to.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1406
      The default value is zero meaning display all levels.
1407
      This value is only relevant if supports_merge_revisions is True.
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1408
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.
1409
    - supports_tags must be True if this log formatter supports tags.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1410
      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
1411
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1412
    - supports_diff must be True if this log formatter supports diffs.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1413
      Otherwise the diff attribute may not be populated.
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1414
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1415
    - supports_signatures must be True if this log formatter supports GPG
1416
      signatures.
1417
3144.7.1 by Guillermo Gonzalez
* added show_properties to LonLogFormat and the hooks to register custom functions
1418
    Plugins can register functions to show custom revision properties using
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
1419
    the properties_handler_registry. The registered function
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1420
    must respect the following interface description::
1421
3144.7.2 by Guillermo Gonzalez
* cleanup a bit the interface
1422
        def my_show_properties(properties_dict):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1423
            # code that returns a dict {'name':'value'} of the properties
3144.7.2 by Guillermo Gonzalez
* cleanup a bit the interface
1424
            # 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.
1425
    """
3947.1.10 by Ian Clatworthy
review feedback from vila
1426
    preferred_levels = 0
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1427
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
1428
    def __init__(self, to_file, show_ids=False, show_timezone='original',
4955.4.5 by Vincent Ladeuil
Start reproducing the problems reported in the bug.
1429
                 delta_format=None, levels=None, show_advice=False,
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1430
                 to_exact_file=None, author_list_handler=None):
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1431
        """Create a LogFormatter.
1432
1433
        :param to_file: the file to output to
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
1434
        :param to_exact_file: if set, gives an output stream to which
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1435
             non-Unicode diffs are written.
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1436
        :param show_ids: if True, revision-ids are to be displayed
1437
        :param show_timezone: the timezone to use
1438
        :param delta_format: the level of delta information to display
4221.2.3 by Ian Clatworthy
jam feedback: don't show advice if --levels explicitly given
1439
          or None to leave it to the formatter to decide
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1440
        :param levels: the number of levels to display; None or -1 to
1441
          let the log formatter decide.
4221.2.3 by Ian Clatworthy
jam feedback: don't show advice if --levels explicitly given
1442
        :param show_advice: whether to show advice at the end of the
1443
          log or not
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1444
        :param author_list_handler: callable generating a list of
1445
          authors to display for a given revision
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1446
        """
794 by Martin Pool
- Merge John's nice short-log format.
1447
        self.to_file = to_file
4110.1.1 by Alexander Belchenko
Fixed problem with `log -p` and non-ascii content of files: show_diff should write the diff to exact [stdout] stream.
1448
        # 'exact' stream used to show diff, it should print content 'as is'
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
1449
        # and should not try to decode/encode it to unicode to avoid bug
1450
        # #328007
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1451
        if to_exact_file is not None:
1452
            self.to_exact_file = to_exact_file
1453
        else:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
1454
            # XXX: somewhat hacky; this assumes it's a codec writer; it's
1455
            # better for code that expects to get diffs to pass in the exact
1456
            # file stream
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1457
            self.to_exact_file = getattr(to_file, 'stream', to_file)
794 by Martin Pool
- Merge John's nice short-log format.
1458
        self.show_ids = show_ids
1459
        self.show_timezone = show_timezone
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
1460
        if delta_format is None:
1461
            # Ensures backward compatibility
7143.15.2 by Jelmer Vernooij
Run autopep8.
1462
            delta_format = 2  # long format
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
1463
        self.delta_format = delta_format
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1464
        self.levels = levels
4221.2.3 by Ian Clatworthy
jam feedback: don't show advice if --levels explicitly given
1465
        self._show_advice = show_advice
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1466
        self._merge_count = 0
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1467
        self._author_list_handler = author_list_handler
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1468
3947.1.10 by Ian Clatworthy
review feedback from vila
1469
    def get_levels(self):
1470
        """Get the number of levels to display or 0 for all."""
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1471
        if getattr(self, 'supports_merge_revisions', False):
1472
            if self.levels is None or self.levels == -1:
4217.2.1 by Ian Clatworthy
fix log advice when the # of levels is implicit
1473
                self.levels = self.preferred_levels
1474
        else:
1475
            self.levels = 1
1476
        return self.levels
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1477
3947.1.10 by Ian Clatworthy
review feedback from vila
1478
    def log_revision(self, revision):
1479
        """Log a revision.
1480
1481
        :param  revision:   The LogRevision to be logged.
1482
        """
1483
        raise NotImplementedError('not implemented in abstract base')
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.
1484
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1485
    def show_advice(self):
1486
        """Output user advice, if any, when the log is completed."""
4221.2.3 by Ian Clatworthy
jam feedback: don't show advice if --levels explicitly given
1487
        if self._show_advice and self.levels == 1 and self._merge_count > 0:
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1488
            advice_sep = self.get_advice_separator()
1489
            if advice_sep:
1490
                self.to_file.write(advice_sep)
4208.2.2 by Ian Clatworthy
show --levels 0 in advice, not just -n0
1491
            self.to_file.write(
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
1492
                "Use --include-merged or -n0 to see merged revisions.\n")
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1493
1494
    def get_advice_separator(self):
1495
        """Get the text separating the log from the closing advice."""
1496
        return ''
1497
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
1498
    def short_committer(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1499
        name, address = config.parse_username(rev.committer)
1500
        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.
1501
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1502
        return address
2388.1.11 by Alexander Belchenko
changes after John's review
1503
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.
1504
    def short_author(self, rev):
4081.3.14 by Martin von Gagern
Pass keyword arguments of authors method by name.
1505
        return self.authors(rev, 'first', short=True, sep=', ')
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1506
1507
    def authors(self, rev, who, short=False, sep=None):
4081.3.13 by Martin von Gagern
Added extensive docstring and comments to authors method.
1508
        """Generate list of authors, taking --authors option into account.
1509
1510
        The caller has to specify the name of a author list handler,
1511
        as provided by the author list registry, using the ``who``
1512
        argument.  That name only sets a default, though: when the
1513
        user selected a different author list generation using the
1514
        ``--authors`` command line switch, as represented by the
1515
        ``author_list_handler`` constructor argument, that value takes
1516
        precedence.
1517
1518
        :param rev: The revision for which to generate the list of authors.
1519
        :param who: Name of the default handler.
1520
        :param short: Whether to shorten names to either name or address.
1521
        :param sep: What separator to use for automatic concatenation.
1522
        """
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1523
        if self._author_list_handler is not None:
4081.3.13 by Martin von Gagern
Added extensive docstring and comments to authors method.
1524
            # The user did specify --authors, which overrides the default
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1525
            author_list_handler = self._author_list_handler
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1526
        else:
4081.3.13 by Martin von Gagern
Added extensive docstring and comments to authors method.
1527
            # The user didn't specify --authors, so we use the caller's default
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1528
            author_list_handler = author_list_registry.get(who)
1529
        names = author_list_handler(rev)
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1530
        if short:
1531
            for i in range(len(names)):
1532
                name, address = config.parse_username(names[i])
1533
                if name:
1534
                    names[i] = name
1535
                else:
1536
                    names[i] = address
1537
        if sep is not None:
1538
            names = sep.join(names)
1539
        return names
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.
1540
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1541
    def merge_marker(self, revision):
4213.1.1 by Ian Clatworthy
merge indicators in log --long (Ian Clatworthy)
1542
        """Get the merge marker to include in the output or '' if none."""
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1543
        if len(revision.rev.parent_ids) > 1:
1544
            self._merge_count += 1
1545
            return ' [merge]'
1546
        else:
1547
            return ''
1548
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
1549
    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
1550
        """Displays the custom properties returned by each registered handler.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1551
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
1552
        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
1553
        """
4379.4.1 by Ian Clatworthy
make log --long faster
1554
        for line in self.custom_properties(revision):
1555
            self.to_file.write("%s%s\n" % (indent, line))
1556
1557
    def custom_properties(self, revision):
1558
        """Format the custom properties returned by each registered handler.
1559
1560
        If a registered handler raises an error it is propagated.
1561
1562
        :return: a list of formatted lines (excluding trailing newlines)
1563
        """
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1564
        lines = self._foreign_info_properties(revision)
1565
        for key, handler in properties_handler_registry.iteritems():
7182.1.4 by Jelmer Vernooij
Print exceptions when custom handlers raise exceptions rather than aborting.
1566
            try:
1567
                lines.extend(self._format_properties(handler(revision)))
7182.1.5 by Jelmer Vernooij
Review comments.
1568
            except Exception:
7182.1.4 by Jelmer Vernooij
Print exceptions when custom handlers raise exceptions rather than aborting.
1569
                trace.log_exception_quietly()
1570
                trace.print_exception(sys.exc_info(), self.to_file)
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1571
        return lines
1572
1573
    def _foreign_info_properties(self, rev):
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1574
        """Custom log displayer for foreign revision identifiers.
1575
1576
        :param rev: Revision object.
1577
        """
1578
        # Revision comes directly from a foreign repository
1579
        if isinstance(rev, foreign.ForeignRevision):
5092.1.2 by Vincent Ladeuil
Fix bug #519862.
1580
            return self._format_properties(
1581
                rev.mapping.vcs.show_foreign_revid(rev.foreign_revid))
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1582
1583
        # Imported foreign revision revision ids always contain :
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
1584
        if b":" not in rev.revision_id:
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1585
            return []
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1586
1587
        # Revision was once imported from a foreign repository
1588
        try:
1589
            foreign_revid, mapping = \
1590
                foreign.foreign_vcs_registry.parse_revision_id(rev.revision_id)
1591
        except errors.InvalidRevisionId:
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1592
            return []
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1593
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1594
        return self._format_properties(
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1595
            mapping.vcs.show_foreign_revid(foreign_revid))
1596
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1597
    def _format_properties(self, properties):
4379.4.1 by Ian Clatworthy
make log --long faster
1598
        lines = []
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1599
        for key, value in properties.items():
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1600
            lines.append(key + ': ' + value)
4379.4.1 by Ian Clatworthy
make log --long faster
1601
        return lines
3144.7.8 by Guillermo Gonzalez
* added error handling (and logging) to LogFormatter.show_properties when a handler raise an error
1602
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1603
    def show_diff(self, to_file, diff, indent):
7045.1.13 by Jelmer Vernooij
Fix a few more tests.
1604
        encoding = get_terminal_encoding()
1605
        for l in diff.rstrip().split(b'\n'):
7045.1.21 by Jelmer Vernooij
Review comments & test fixes.
1606
            to_file.write(indent + l.decode(encoding, 'ignore') + '\n')
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1607
2388.1.11 by Alexander Belchenko
changes after John's review
1608
4379.4.1 by Ian Clatworthy
make log --long faster
1609
# Separator between revisions in long format
1610
_LONG_SEP = '-' * 60
1611
1612
794 by Martin Pool
- Merge John's nice short-log format.
1613
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
1614
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.
1615
    supports_merge_revisions = True
4206.1.1 by Ian Clatworthy
log mainline by default
1616
    preferred_levels = 1
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.
1617
    supports_delta = True
1618
    supports_tags = True
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1619
    supports_diff = True
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1620
    supports_signatures = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
1621
4379.4.1 by Ian Clatworthy
make log --long faster
1622
    def __init__(self, *args, **kwargs):
1623
        super(LongLogFormatter, self).__init__(*args, **kwargs)
1624
        if self.show_timezone == 'original':
1625
            self.date_string = self._date_string_original_timezone
1626
        else:
1627
            self.date_string = self._date_string_with_timezone
1628
1629
    def _date_string_with_timezone(self, rev):
1630
        return format_date(rev.timestamp, rev.timezone or 0,
1631
                           self.show_timezone)
1632
1633
    def _date_string_original_timezone(self, rev):
1634
        return format_date_with_offset_in_original_timezone(rev.timestamp,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1635
                                                            rev.timezone or 0)
4379.4.1 by Ian Clatworthy
make log --long faster
1636
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.
1637
    def log_revision(self, revision):
1638
        """Log a revision, either merged or not."""
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
1639
        indent = '    ' * revision.merge_depth
4379.4.1 by Ian Clatworthy
make log --long faster
1640
        lines = [_LONG_SEP]
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.
1641
        if revision.revno is not None:
4379.4.1 by Ian Clatworthy
make log --long faster
1642
            lines.append('revno: %s%s' % (revision.revno,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1643
                                          self.merge_marker(revision)))
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.
1644
        if revision.tags:
7029.4.9 by Jelmer Vernooij
Predictable tag order.
1645
            lines.append('tags: %s' % (', '.join(sorted(revision.tags))))
5728.5.6 by Matt Giuca
log: 'long' and 'short' log formats now always show the revision-id for any
1646
        if self.show_ids or revision.revno is None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1647
            lines.append('revision-id: %s' %
1648
                         (revision.rev.revision_id.decode('utf-8'),))
5728.5.6 by Matt Giuca
log: 'long' and 'short' log formats now always show the revision-id for any
1649
        if self.show_ids:
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1650
            for parent_id in revision.rev.parent_ids:
7045.1.1 by Jelmer Vernooij
Fix another 300 tests.
1651
                lines.append('parent: %s' % (parent_id.decode('utf-8'),))
4379.4.1 by Ian Clatworthy
make log --long faster
1652
        lines.extend(self.custom_properties(revision.rev))
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.
1653
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
1654
        committer = revision.rev.committer
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1655
        authors = self.authors(revision.rev, 'all')
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
1656
        if authors != [committer]:
4379.4.1 by Ian Clatworthy
make log --long faster
1657
            lines.append('author: %s' % (", ".join(authors),))
1658
        lines.append('committer: %s' % (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.
1659
1660
        branch_nick = revision.rev.properties.get('branch-nick', None)
1661
        if branch_nick is not None:
4379.4.1 by Ian Clatworthy
make log --long faster
1662
            lines.append('branch nick: %s' % (branch_nick,))
1663
1664
        lines.append('timestamp: %s' % (self.date_string(revision.rev),))
1665
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1666
        if revision.signature is not None:
1667
            lines.append('signature: ' + revision.signature)
1668
4379.4.1 by Ian Clatworthy
make log --long faster
1669
        lines.append('message:')
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1670
        if not revision.rev.message:
4379.4.1 by Ian Clatworthy
make log --long faster
1671
            lines.append('  (no message)')
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
1672
        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.
1673
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
1674
            for l in message.split('\n'):
4379.4.1 by Ian Clatworthy
make log --long faster
1675
                lines.append('  %s' % (l,))
1676
1677
        # Dump the output, appending the delta and diff if requested
1678
        to_file = self.to_file
1679
        to_file.write("%s%s\n" % (indent, ('\n' + indent).join(lines)))
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.
1680
        if revision.delta is not None:
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
1681
            # Use the standard status output to display changes
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1682
            from breezy.delta import report_delta
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
1683
            report_delta(to_file, revision.delta, short_status=False,
5076.4.4 by Arnaud Jeansen
Add a unified report_delta method
1684
                         show_ids=self.show_ids, indent=indent)
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1685
        if revision.diff is not None:
1686
            to_file.write(indent + 'diff:\n')
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1687
            to_file.flush()
3943.5.6 by Ian Clatworthy
feedback from jam's review
1688
            # Note: we explicitly don't indent the diff (relative to the
1689
            # revision information) so that the output can be fed to patch -p0
4110.1.1 by Alexander Belchenko
Fixed problem with `log -p` and non-ascii content of files: show_diff should write the diff to exact [stdout] stream.
1690
            self.show_diff(self.to_exact_file, revision.diff, indent)
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1691
            self.to_exact_file.flush()
794 by Martin Pool
- Merge John's nice short-log format.
1692
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1693
    def get_advice_separator(self):
1694
        """Get the text separating the log from the closing advice."""
1695
        return '-' * 60 + '\n'
1696
794 by Martin Pool
- Merge John's nice short-log format.
1697
1698
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.
1699
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1700
    supports_merge_revisions = True
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1701
    preferred_levels = 1
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.
1702
    supports_delta = True
3946.3.1 by Ian Clatworthy
extend ShortLogFormatter & LineLogFormatter to support tags
1703
    supports_tags = True
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1704
    supports_diff = 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.
1705
3947.1.9 by Ian Clatworthy
get offset right when dotted-revno in column 1
1706
    def __init__(self, *args, **kwargs):
1707
        super(ShortLogFormatter, self).__init__(*args, **kwargs)
1708
        self.revno_width_by_depth = {}
1709
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.
1710
    def log_revision(self, revision):
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1711
        # We need two indents: one per depth and one for the information
1712
        # relative to that indent. Most mainline revnos are 5 chars or
3970.1.1 by Ian Clatworthy
log -n/--levels (Ian Clatworthy)
1713
        # less while dotted revnos are typically 11 chars or less. Once
3947.1.9 by Ian Clatworthy
get offset right when dotted-revno in column 1
1714
        # calculated, we need to remember the offset for a given depth
1715
        # as we might be starting from a dotted revno in the first column
1716
        # and we want subsequent mainline revisions to line up.
1717
        depth = revision.merge_depth
1718
        indent = '    ' * depth
1719
        revno_width = self.revno_width_by_depth.get(depth)
1720
        if revno_width is None:
5728.5.5 by Matt Giuca
log: If a revision is not in the branch, it now sets its revno to None
1721
            if revision.revno is None or revision.revno.find('.') == -1:
3947.1.10 by Ian Clatworthy
review feedback from vila
1722
                # mainline revno, e.g. 12345
3947.1.9 by Ian Clatworthy
get offset right when dotted-revno in column 1
1723
                revno_width = 5
1724
            else:
3947.1.10 by Ian Clatworthy
review feedback from vila
1725
                # dotted revno, e.g. 12345.10.55
1726
                revno_width = 11
3947.1.9 by Ian Clatworthy
get offset right when dotted-revno in column 1
1727
            self.revno_width_by_depth[depth] = revno_width
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1728
        offset = ' ' * (revno_width + 1)
1729
794 by Martin Pool
- Merge John's nice short-log format.
1730
        to_file = self.to_file
3946.3.1 by Ian Clatworthy
extend ShortLogFormatter & LineLogFormatter to support tags
1731
        tags = ''
1732
        if revision.tags:
7029.4.9 by Jelmer Vernooij
Predictable tag order.
1733
            tags = ' {%s}' % (', '.join(sorted(revision.tags)))
3947.1.8 by Ian Clatworthy
merge bzr.dev r3954
1734
        to_file.write(indent + "%*s %s\t%s%s%s\n" % (revno_width,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1735
                                                     revision.revno or "", self.short_author(
1736
                                                         revision.rev),
1737
                                                     format_date(revision.rev.timestamp,
1738
                                                                 revision.rev.timezone or 0,
1739
                                                                 self.show_timezone, date_fmt="%Y-%m-%d",
1740
                                                                 show_offset=False),
1741
                                                     tags, self.merge_marker(revision)))
1742
        self.show_properties(revision.rev, indent + offset)
5728.5.6 by Matt Giuca
log: 'long' and 'short' log formats now always show the revision-id for any
1743
        if self.show_ids or revision.revno is None:
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1744
            to_file.write(indent + offset + 'revision-id:%s\n'
7067.13.1 by Jelmer Vernooij
Some more fixes for Python 3.
1745
                          % (revision.rev.revision_id.decode('utf-8'),))
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.
1746
        if not revision.rev.message:
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1747
            to_file.write(indent + offset + '(no message)\n')
794 by Martin Pool
- Merge John's nice short-log format.
1748
        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.
1749
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
1750
            for l in message.split('\n'):
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1751
                to_file.write(indent + offset + '%s\n' % (l,))
794 by Martin Pool
- Merge John's nice short-log format.
1752
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.
1753
        if revision.delta is not None:
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
1754
            # Use the standard status output to display changes
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1755
            from breezy.delta import report_delta
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
1756
            report_delta(to_file, revision.delta,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1757
                         short_status=self.delta_format == 1,
5076.4.4 by Arnaud Jeansen
Add a unified report_delta method
1758
                         show_ids=self.show_ids, indent=indent + offset)
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1759
        if revision.diff is not None:
4110.1.1 by Alexander Belchenko
Fixed problem with `log -p` and non-ascii content of files: show_diff should write the diff to exact [stdout] stream.
1760
            self.show_diff(self.to_exact_file, revision.diff, '      ')
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
1761
        to_file.write('\n')
794 by Martin Pool
- Merge John's nice short-log format.
1762
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1763
1185.12.25 by Aaron Bentley
Added one-line log format
1764
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.
1765
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1766
    supports_merge_revisions = True
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1767
    preferred_levels = 1
3946.3.1 by Ian Clatworthy
extend ShortLogFormatter & LineLogFormatter to support tags
1768
    supports_tags = True
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
1769
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.
1770
    def __init__(self, *args, **kwargs):
1771
        super(LineLogFormatter, self).__init__(*args, **kwargs)
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1772
        width = terminal_width()
1773
        if width is not None:
1774
            # we need one extra space for terminals that wrap on last char
1775
            width = width - 1
1776
        self._max_chars = width
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.
1777
1185.12.25 by Aaron Bentley
Added one-line log format
1778
    def truncate(self, str, max_len):
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1779
        if max_len is None or len(str) <= max_len:
1185.12.25 by Aaron Bentley
Added one-line log format
1780
            return str
7143.15.2 by Jelmer Vernooij
Run autopep8.
1781
        return str[:max_len - 3] + '...'
1185.12.25 by Aaron Bentley
Added one-line log format
1782
1783
    def date_string(self, rev):
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1784
        return format_date(rev.timestamp, rev.timezone or 0,
1185.12.25 by Aaron Bentley
Added one-line log format
1785
                           self.show_timezone, date_fmt="%Y-%m-%d",
1786
                           show_offset=False)
1787
1788
    def message(self, rev):
1789
        if not rev.message:
1790
            return '(no message)'
1791
        else:
1792
            return rev.message
1793
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.
1794
    def log_revision(self, revision):
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1795
        indent = '  ' * revision.merge_depth
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
1796
        self.to_file.write(self.log_string(revision.revno, revision.rev,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1797
                                           self._max_chars, revision.tags, indent))
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
1798
        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.
1799
3947.1.8 by Ian Clatworthy
merge bzr.dev r3954
1800
    def log_string(self, revno, rev, max_chars, tags=None, prefix=''):
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1801
        """Format log info into one string. Truncate tail of string
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1802
1803
        :param revno:      revision number or None.
1804
                           Revision numbers counts from 1.
1805
        :param rev:        revision object
1806
        :param max_chars:  maximum length of resulting string
1807
        :param tags:       list of tags or None
1808
        :param prefix:     string to prefix each line
1809
        :return:           formatted truncated string
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1810
        """
1811
        out = []
1812
        if revno:
1813
            # show revno only when is not None
3946.3.4 by Ian Clatworthy
minor cleanup
1814
            out.append("%s:" % revno)
5725.1.1 by Neil Martinsen-Burrell
Scale author field with length of line in LineLogFormatter
1815
        if max_chars is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
1816
            out.append(self.truncate(
1817
                self.short_author(rev), (max_chars + 3) // 4))
5725.1.1 by Neil Martinsen-Burrell
Scale author field with length of line in LineLogFormatter
1818
        else:
1819
            out.append(self.short_author(rev))
1185.12.25 by Aaron Bentley
Added one-line log format
1820
        out.append(self.date_string(rev))
3983.2.1 by Neil Martinsen-Burrell
add merge indication to the line format
1821
        if len(rev.parent_ids) > 1:
1822
            out.append('[merge]')
3946.3.3 by Ian Clatworthy
feedback from jelmer re position of tags in --line
1823
        if tags:
7029.4.9 by Jelmer Vernooij
Predictable tag order.
1824
            tag_str = '{%s}' % (', '.join(sorted(tags)))
3946.3.3 by Ian Clatworthy
feedback from jelmer re position of tags in --line
1825
            out.append(tag_str)
1740.2.5 by Aaron Bentley
Merge from bzr.dev
1826
        out.append(rev.get_summary())
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1827
        return self.truncate(prefix + " ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
1828
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1829
4129.1.1 by Andrea Bolognani
Renamed the ChangeLogLogFormatter class to GnuChangelogLogFormatter.
1830
class GnuChangelogLogFormatter(LogFormatter):
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1831
1832
    supports_merge_revisions = True
1833
    supports_delta = True
1834
1835
    def log_revision(self, revision):
1836
        """Log a revision, either merged or not."""
1837
        to_file = self.to_file
1838
1839
        date_str = format_date(revision.rev.timestamp,
1840
                               revision.rev.timezone or 0,
1841
                               self.show_timezone,
1842
                               date_fmt='%Y-%m-%d',
1843
                               show_offset=False)
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1844
        committer_str = self.authors(revision.rev, 'first', sep=', ')
4081.3.6 by Martin von Gagern
Drop space to make John happy.
1845
        committer_str = committer_str.replace(' <', '  <')
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1846
        to_file.write('%s  %s\n\n' % (date_str, committer_str))
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1847
4137.1.1 by James Westby
Small improvements to the GNU ChangeLog formatter.
1848
        if revision.delta is not None and revision.delta.has_changed():
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1849
            for c in revision.delta.added + revision.delta.removed + revision.delta.modified:
7358.11.3 by Jelmer Vernooij
TreeDelta holds TreeChange objects rather than tuples of various sizes.
1850
                if c.path[0] is None:
1851
                    path = c.path[1]
1852
                else:
1853
                    path = c.path[0]
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1854
                to_file.write('\t* %s:\n' % (path,))
7358.17.1 by Jelmer Vernooij
Add TreeDelta.copied and TreeChange.copied fields.
1855
            for c in revision.delta.renamed + revision.delta.copied:
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1856
                # For renamed files, show both the old and the new path
7358.11.3 by Jelmer Vernooij
TreeDelta holds TreeChange objects rather than tuples of various sizes.
1857
                to_file.write('\t* %s:\n\t* %s:\n' % (c.path[0], c.path[1]))
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1858
            to_file.write('\n')
1859
1860
        if not revision.rev.message:
1861
            to_file.write('\tNo commit message\n')
1862
        else:
1863
            message = revision.rev.message.rstrip('\r\n')
1864
            for l in message.split('\n'):
1865
                to_file.write('\t%s\n' % (l.lstrip(),))
1866
            to_file.write('\n')
1867
1868
1185.12.27 by Aaron Bentley
Use line log for pending merges
1869
def line_log(rev, max_chars):
1870
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1871
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
1872
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1873
1874
class LogFormatterRegistry(registry.Registry):
1875
    """Registry for log formatters"""
1876
1877
    def make_formatter(self, name, *args, **kwargs):
1878
        """Construct a formatter from arguments.
1879
1880
        :param name: Name of the formatter to construct.  'short', 'long' and
1881
            'line' are built-in.
1882
        """
1883
        return self.get(name)(*args, **kwargs)
1884
1885
    def get_default(self, branch):
6175.2.1 by Vincent Ladeuil
Migrate log_format to the config stacks.
1886
        c = branch.get_config_stack()
1887
        return self.get(c.get('log_format'))
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1888
1889
1890
log_formatter_registry = LogFormatterRegistry()
1891
1892
1893
log_formatter_registry.register('short', ShortLogFormatter,
6259.2.8 by Martin Packman
Add full stops to various registry help strings
1894
                                'Moderately short log format.')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1895
log_formatter_registry.register('long', LongLogFormatter,
6259.2.8 by Martin Packman
Add full stops to various registry help strings
1896
                                'Detailed log format.')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1897
log_formatter_registry.register('line', LineLogFormatter,
6259.2.8 by Martin Packman
Add full stops to various registry help strings
1898
                                'Log format with one line per revision.')
4129.1.1 by Andrea Bolognani
Renamed the ChangeLogLogFormatter class to GnuChangelogLogFormatter.
1899
log_formatter_registry.register('gnu-changelog', GnuChangelogLogFormatter,
6259.2.8 by Martin Packman
Add full stops to various registry help strings
1900
                                'Format used by GNU ChangeLog files.')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1901
794 by Martin Pool
- Merge John's nice short-log format.
1902
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1903
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1904
    log_formatter_registry.register(name, formatter)
1905
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1906
794 by Martin Pool
- Merge John's nice short-log format.
1907
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
1908
    """Construct a formatter from arguments.
1909
1185.12.27 by Aaron Bentley
Use line log for pending merges
1910
    name -- Name of the formatter to construct; currently 'long', 'short' and
1911
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
1912
    """
794 by Martin Pool
- Merge John's nice short-log format.
1913
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1914
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
1915
    except KeyError:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
1916
        raise errors.CommandError(
7143.15.2 by Jelmer Vernooij
Run autopep8.
1917
            gettext("unknown log formatter: %r") % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1918
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1919
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1920
def author_list_all(rev):
1921
    return rev.get_apparent_authors()[:]
1922
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1923
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1924
def author_list_first(rev):
1925
    lst = rev.get_apparent_authors()
1926
    try:
1927
        return [lst[0]]
1928
    except IndexError:
1929
        return []
1930
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1931
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1932
def author_list_committer(rev):
1933
    return [rev.committer]
1934
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1935
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1936
author_list_registry = registry.Registry()
1937
1938
author_list_registry.register('all', author_list_all,
1939
                              'All authors')
1940
1941
author_list_registry.register('first', author_list_first,
1942
                              'The first author')
1943
1944
author_list_registry.register('committer', author_list_committer,
1945
                              'The committer')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1946
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1947
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
1948
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
1949
                           log_format='long'):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1950
    """Show the change in revision history comparing the old revision history to the new one.
1951
1952
    :param branch: The branch where the revisions exist
1953
    :param old_rh: The old revision history
1954
    :param new_rh: The new revision history
1955
    :param to_file: A file to write the results to. If None, stdout will be used
1956
    """
1957
    if to_file is None:
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
1958
        to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
7143.15.2 by Jelmer Vernooij
Run autopep8.
1959
                                                            errors='replace')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1960
    lf = log_formatter(log_format,
1961
                       show_ids=False,
1962
                       to_file=to_file,
1963
                       show_timezone='original')
1964
1965
    # This is the first index which is different between
1966
    # old and new
1967
    base_idx = None
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1968
    for i in range(max(len(new_rh), len(old_rh))):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1969
        if (len(new_rh) <= i
1970
            or len(old_rh) <= i
7143.15.2 by Jelmer Vernooij
Run autopep8.
1971
                or new_rh[i] != old_rh[i]):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1972
            base_idx = i
1973
            break
1974
1975
    if base_idx is None:
1976
        to_file.write('Nothing seems to have changed\n')
1977
        return
7143.15.2 by Jelmer Vernooij
Run autopep8.
1978
    # TODO: It might be nice to do something like show_log
1979
    # and show the merged entries. But since this is the
1980
    # removed revisions, it shouldn't be as important
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1981
    if base_idx < len(old_rh):
7143.15.2 by Jelmer Vernooij
Run autopep8.
1982
        to_file.write('*' * 60)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1983
        to_file.write('\nRemoved Revisions:\n')
1984
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1985
            rev = branch.repository.get_revision(old_rh[i])
7143.15.2 by Jelmer Vernooij
Run autopep8.
1986
            lr = LogRevision(rev, i + 1, 0, None)
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
1987
            lf.log_revision(lr)
7143.15.2 by Jelmer Vernooij
Run autopep8.
1988
        to_file.write('*' * 60)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1989
        to_file.write('\n\n')
1990
    if base_idx < len(new_rh):
1991
        to_file.write('Added Revisions:\n')
1992
        show_log(branch,
1993
                 lf,
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
1994
                 verbose=False,
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1995
                 direction='forward',
7143.15.2 by Jelmer Vernooij
Run autopep8.
1996
                 start_revision=base_idx + 1,
7490.73.2 by Jelmer Vernooij
Drop unused search argument.
1997
                 end_revision=len(new_rh))
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1998
3144.7.4 by Guillermo Gonzalez
* move the function regisstry into a real Registry instead of a list
1999
3848.1.7 by Aaron Bentley
Use repository in get_history_change
2000
def get_history_change(old_revision_id, new_revision_id, repository):
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
2001
    """Calculate the uncommon lefthand history between two revisions.
2002
2003
    :param old_revision_id: The original revision id.
2004
    :param new_revision_id: The new revision id.
3848.1.22 by Aaron Bentley
Fix spelling
2005
    :param repository: The repository to use for the calculation.
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
2006
2007
    return old_history, new_history
2008
    """
3848.1.6 by Aaron Bentley
Implement get_history_change
2009
    old_history = []
2010
    old_revisions = set()
2011
    new_history = []
2012
    new_revisions = set()
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
2013
    graph = repository.get_graph()
2014
    new_iter = graph.iter_lefthand_ancestry(new_revision_id)
2015
    old_iter = graph.iter_lefthand_ancestry(old_revision_id)
3848.1.6 by Aaron Bentley
Implement get_history_change
2016
    stop_revision = None
2017
    do_old = True
2018
    do_new = True
2019
    while do_new or do_old:
2020
        if do_new:
2021
            try:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2022
                new_revision = next(new_iter)
3848.1.6 by Aaron Bentley
Implement get_history_change
2023
            except StopIteration:
2024
                do_new = False
2025
            else:
2026
                new_history.append(new_revision)
2027
                new_revisions.add(new_revision)
2028
                if new_revision in old_revisions:
2029
                    stop_revision = new_revision
2030
                    break
2031
        if do_old:
2032
            try:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
2033
                old_revision = next(old_iter)
3848.1.6 by Aaron Bentley
Implement get_history_change
2034
            except StopIteration:
2035
                do_old = False
2036
            else:
2037
                old_history.append(old_revision)
2038
                old_revisions.add(old_revision)
2039
                if old_revision in new_revisions:
2040
                    stop_revision = old_revision
2041
                    break
2042
    new_history.reverse()
2043
    old_history.reverse()
2044
    if stop_revision is not None:
2045
        new_history = new_history[new_history.index(stop_revision) + 1:]
2046
        old_history = old_history[old_history.index(stop_revision) + 1:]
2047
    return old_history, new_history
2048
2049
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
2050
def show_branch_change(branch, output, old_revno, old_revision_id):
2051
    """Show the changes made to a branch.
2052
2053
    :param branch: The branch to show changes about.
2054
    :param output: A file-like object to write changes to.
2055
    :param old_revno: The revno of the old tip.
2056
    :param old_revision_id: The revision_id of the old tip.
2057
    """
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2058
    new_revno, new_revision_id = branch.last_revision_info()
2059
    old_history, new_history = get_history_change(old_revision_id,
2060
                                                  new_revision_id,
2061
                                                  branch.repository)
2062
    if old_history == [] and new_history == []:
2063
        output.write('Nothing seems to have changed\n')
2064
        return
2065
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
2066
    log_format = log_formatter_registry.get_default(branch)
2067
    lf = log_format(show_ids=False, to_file=output, show_timezone='original')
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2068
    if old_history != []:
7143.15.2 by Jelmer Vernooij
Run autopep8.
2069
        output.write('*' * 60)
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2070
        output.write('\nRemoved Revisions:\n')
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
2071
        show_flat_log(branch.repository, old_history, old_revno, lf)
7143.15.2 by Jelmer Vernooij
Run autopep8.
2072
        output.write('*' * 60)
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2073
        output.write('\n\n')
2074
    if new_history != []:
3848.1.9 by Aaron Bentley
new/old sections are omitted as appropriate.
2075
        output.write('Added Revisions:\n')
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2076
        start_revno = new_revno - len(new_history) + 1
7319.1.1 by Jelmer Vernooij
Remove unused specific_fileid argument to log.
2077
        show_log(branch, lf, verbose=False, direction='forward',
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
2078
                 start_revision=start_revno)
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2079
2080
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
2081
def show_flat_log(repository, history, last_revno, lf):
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
2082
    """Show a simple log of the specified history.
2083
2084
    :param repository: The repository to retrieve revisions from.
2085
    :param history: A list of revision_ids indicating the lefthand history.
2086
    :param last_revno: The revno of the last revision_id in the history.
2087
    :param lf: The log formatter to use.
2088
    """
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
2089
    revisions = repository.get_revisions(history)
2090
    for i, rev in enumerate(revisions):
2091
        lr = LogRevision(rev, i + last_revno, 0, None)
2092
        lf.log_revision(lr)
2093
2094
7356.1.1 by Jelmer Vernooij
Use ExitStack context rather than brz-specific OperationWithCleanup.
2095
def _get_info_for_log_files(revisionspec_list, file_list, exit_stack):
7490.73.7 by Jelmer Vernooij
Avoid using file ids in log.
2096
    """Find files and kinds given a list of files and a revision range.
4202.2.1 by Ian Clatworthy
get directory logging working again
2097
2098
    We search for files at the end of the range. If not found there,
2099
    we try the start of the range.
2100
2101
    :param revisionspec_list: revision range as parsed on the command line
2102
    :param file_list: the list of paths given on the command line;
2103
      the first of these can be a branch location or a file path,
2104
      the remainder must be file paths
7356.1.1 by Jelmer Vernooij
Use ExitStack context rather than brz-specific OperationWithCleanup.
2105
    :param exit_stack: When the branch returned is read locked,
2106
      an unlock call will be queued to the exit stack.
4202.2.1 by Ian Clatworthy
get directory logging working again
2107
    :return: (branch, info_list, start_rev_info, end_rev_info) where
7490.73.8 by Jelmer Vernooij
Avoid using file ids in log.
2108
      info_list is a list of (relative_path, found, kind) tuples where
4202.2.1 by Ian Clatworthy
get directory logging working again
2109
      kind is one of values 'directory', 'file', 'symlink', 'tree-reference'.
4634.90.1 by Andrew Bennetts
Fix ObjectNotLocked error during 'bzr log' by acquiring branch read lock as soon as cmd_log acquires the branch, only releasing it at the end.
2110
      branch will be read-locked.
3943.6.4 by Ian Clatworthy
review feedback from vila
2111
    """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2112
    from breezy.builtins import _get_revision_range
6207.3.3 by jelmer at samba
Fix tests and the like.
2113
    tree, b, path = controldir.ControlDir.open_containing_tree_or_branch(
2114
        file_list[0])
7356.1.1 by Jelmer Vernooij
Use ExitStack context rather than brz-specific OperationWithCleanup.
2115
    exit_stack.enter_context(b.lock_read())
4202.2.1 by Ian Clatworthy
get directory logging working again
2116
    # XXX: It's damn messy converting a list of paths to relative paths when
2117
    # those paths might be deleted ones, they might be on a case-insensitive
2118
    # filesystem and/or they might be in silly locations (like another branch).
2119
    # For example, what should "log bzr://branch/dir/file1 file2" do? (Is
2120
    # file2 implicitly in the same dir as file1 or should its directory be
2121
    # taken from the current tree somehow?) For now, this solves the common
2122
    # case of running log in a nested directory, assuming paths beyond the
2123
    # first one haven't been deleted ...
2124
    if tree:
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
2125
        relpaths = [path] + tree.safe_relpath_files(file_list[1:])
4202.2.1 by Ian Clatworthy
get directory logging working again
2126
    else:
2127
        relpaths = [path] + file_list[1:]
2128
    info_list = []
2129
    start_rev_info, end_rev_info = _get_revision_range(revisionspec_list, b,
7143.15.2 by Jelmer Vernooij
Run autopep8.
2130
                                                       "log")
4296.2.1 by Jelmer Vernooij
Don't retrieve the tree if log is called on the root.
2131
    if relpaths in ([], [u'']):
2132
        return b, [], start_rev_info, end_rev_info
4202.2.1 by Ian Clatworthy
get directory logging working again
2133
    if start_rev_info is None and end_rev_info is None:
3943.6.4 by Ian Clatworthy
review feedback from vila
2134
        if tree is None:
2135
            tree = b.basis_tree()
4202.2.1 by Ian Clatworthy
get directory logging working again
2136
        tree1 = None
2137
        for fp in relpaths:
7490.73.8 by Jelmer Vernooij
Avoid using file ids in log.
2138
            kind = _get_kind_for_file(tree, fp)
7490.73.9 by Jelmer Vernooij
Simplify log browsing.
2139
            if not kind:
4202.2.1 by Ian Clatworthy
get directory logging working again
2140
                # go back to when time began
2141
                if tree1 is None:
2142
                    try:
2143
                        rev1 = b.get_rev_id(1)
2144
                    except errors.NoSuchRevision:
2145
                        # No history at all
2146
                        kind = None
2147
                    else:
2148
                        tree1 = b.repository.revision_tree(rev1)
2149
                if tree1:
7490.73.8 by Jelmer Vernooij
Avoid using file ids in log.
2150
                    kind = _get_kind_for_file(tree1, fp)
7490.73.9 by Jelmer Vernooij
Simplify log browsing.
2151
            info_list.append((fp, kind))
3943.6.4 by Ian Clatworthy
review feedback from vila
2152
4202.2.1 by Ian Clatworthy
get directory logging working again
2153
    elif start_rev_info == end_rev_info:
3943.6.4 by Ian Clatworthy
review feedback from vila
2154
        # One revision given - file must exist in it
4202.2.1 by Ian Clatworthy
get directory logging working again
2155
        tree = b.repository.revision_tree(end_rev_info.rev_id)
2156
        for fp in relpaths:
7490.73.8 by Jelmer Vernooij
Avoid using file ids in log.
2157
            kind = _get_kind_for_file(tree, fp)
7490.73.9 by Jelmer Vernooij
Simplify log browsing.
2158
            info_list.append((fp, kind))
3943.6.4 by Ian Clatworthy
review feedback from vila
2159
4202.2.1 by Ian Clatworthy
get directory logging working again
2160
    else:
3943.6.4 by Ian Clatworthy
review feedback from vila
2161
        # Revision range given. Get the file-id from the end tree.
2162
        # If that fails, try the start tree.
4202.2.1 by Ian Clatworthy
get directory logging working again
2163
        rev_id = end_rev_info.rev_id
3943.6.4 by Ian Clatworthy
review feedback from vila
2164
        if rev_id is None:
2165
            tree = b.basis_tree()
2166
        else:
4202.2.1 by Ian Clatworthy
get directory logging working again
2167
            tree = b.repository.revision_tree(rev_id)
2168
        tree1 = None
2169
        for fp in relpaths:
7490.73.8 by Jelmer Vernooij
Avoid using file ids in log.
2170
            kind = _get_kind_for_file(tree, fp)
7490.73.9 by Jelmer Vernooij
Simplify log browsing.
2171
            if not kind:
4202.2.1 by Ian Clatworthy
get directory logging working again
2172
                if tree1 is None:
2173
                    rev_id = start_rev_info.rev_id
2174
                    if rev_id is None:
2175
                        rev1 = b.get_rev_id(1)
2176
                        tree1 = b.repository.revision_tree(rev1)
2177
                    else:
2178
                        tree1 = b.repository.revision_tree(rev_id)
7490.73.8 by Jelmer Vernooij
Avoid using file ids in log.
2179
                kind = _get_kind_for_file(tree1, fp)
7490.73.9 by Jelmer Vernooij
Simplify log browsing.
2180
            info_list.append((fp, kind))
4202.2.1 by Ian Clatworthy
get directory logging working again
2181
    return b, info_list, start_rev_info, end_rev_info
2182
2183
7490.73.8 by Jelmer Vernooij
Avoid using file ids in log.
2184
def _get_kind_for_file(tree, path):
7490.73.3 by Jelmer Vernooij
Avoid relying on file ids.
2185
    """Return the kind of a path or None if it doesn't exist."""
2186
    with tree.lock_read():
2187
        try:
2188
            return tree.stored_kind(path)
2189
        except errors.NoSuchFile:
2190
            return None
3943.6.4 by Ian Clatworthy
review feedback from vila
2191
2192
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
2193
properties_handler_registry = registry.Registry()
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
2194
4921.2.1 by Neil Martinsen-Burrell
include bug fixes in log output
2195
# Use the properties handlers to print out bug information if available
7143.15.2 by Jelmer Vernooij
Run autopep8.
2196
2197
4921.2.1 by Neil Martinsen-Burrell
include bug fixes in log output
2198
def _bugs_properties_handler(revision):
7182.1.3 by Jelmer Vernooij
use standard bug URL parser in breezy.log.
2199
    fixed_bug_urls = []
2200
    related_bug_urls = []
2201
    for bug_url, status in revision.iter_bugs():
2202
        if status == 'fixed':
2203
            fixed_bug_urls.append(bug_url)
2204
        elif status == 'related':
2205
            related_bug_urls.append(bug_url)
7131.10.2 by Jelmer Vernooij
Support related in log as well.
2206
    ret = {}
7182.1.3 by Jelmer Vernooij
use standard bug URL parser in breezy.log.
2207
    if fixed_bug_urls:
2208
        text = ngettext('fixes bug', 'fixes bugs', len(fixed_bug_urls))
2209
        ret[text] = ' '.join(fixed_bug_urls)
2210
    if related_bug_urls:
2211
        text = ngettext('related bug', 'related bugs',
2212
                        len(related_bug_urls))
2213
        ret[text] = ' '.join(related_bug_urls)
7131.10.2 by Jelmer Vernooij
Support related in log as well.
2214
    return ret
4921.2.1 by Neil Martinsen-Burrell
include bug fixes in log output
2215
7143.15.2 by Jelmer Vernooij
Run autopep8.
2216
4921.2.1 by Neil Martinsen-Burrell
include bug fixes in log output
2217
properties_handler_registry.register('bugs_properties_handler',
2218
                                     _bugs_properties_handler)
2219
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2220
2221
# adapters which revision ids to log are filtered. When log is called, the
2222
# log_rev_iterator is adapted through each of these factory methods.
2223
# Plugins are welcome to mutate this list in any way they like - as long
2224
# as the overall behaviour is preserved. At this point there is no extensible
2225
# mechanism for getting parameters to each factory method, and until there is
2226
# this won't be considered a stable api.
2227
log_adapters = [
2228
    # core log logic
3642.1.7 by Robert Collins
Review feedback.
2229
    _make_batch_filter,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2230
    # read revision objects
3642.1.7 by Robert Collins
Review feedback.
2231
    _make_revision_objects,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2232
    # filter on log messages
3642.1.7 by Robert Collins
Review feedback.
2233
    _make_search_filter,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2234
    # generate deltas for things we will show
3642.1.7 by Robert Collins
Review feedback.
2235
    _make_delta_filter
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2236
    ]