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