/brz/remove-bazaar

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