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