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