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