/brz/remove-bazaar

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