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