/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:
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
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
467
                if levels != 0 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
762
            else:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
763
                yield revision_id, str(cur_revno) if cur_revno is not None else None, 0
764
                if cur_revno is not None:
765
                    cur_revno -= 1
3936.3.14 by Ian Clatworthy
bug fix
766
    else:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
767
        br_rev_id = branch.last_revision()
3936.3.14 by Ian Clatworthy
bug fix
768
        if end_rev_id is None:
769
            end_rev_id = br_rev_id
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
770
        found_start = start_rev_id is None
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
771
        graph_iter = graph.iter_lefthand_ancestry(end_rev_id,
772
            (_mod_revision.NULL_REVISION,))
773
        while True:
774
            try:
6716.2.3 by Jelmer Vernooij
Use next(iter) and avoid unnecessary catching of StopIteration.
775
                revision_id = next(graph_iter)
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
776
            except StopIteration:
777
                break
778
            except errors.RevisionNotPresent as e:
779
                # Oops, a ghost.
780
                yield e.revision_id, None, None
781
                break
782
            else:
783
                revno_str = _compute_revno_str(branch, revision_id)
784
                if not found_start and revision_id == start_rev_id:
785
                    if not exclude_common_ancestry:
786
                        yield revision_id, revno_str, 0
787
                    found_start = True
788
                    break
789
                else:
5268.4.3 by Vincent Ladeuil
Respect --exclude-common-ancestry for linear ancestries.
790
                    yield revision_id, revno_str, 0
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
791
        if not found_start:
792
            raise _StartNotLinearAncestor()
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
793
794
3936.3.32 by Ian Clatworthy
always delay merge graph generation until necessary
795
def _graph_view_revisions(branch, start_rev_id, end_rev_id,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
796
                          rebase_initial_depths=True,
797
                          exclude_common_ancestry=False):
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
798
    """Calculate revisions to view including merges, newest to oldest.
799
800
    :param branch: the branch
3936.3.32 by Ian Clatworthy
always delay merge graph generation until necessary
801
    :param start_rev_id: the lower revision-id
802
    :param end_rev_id: the upper revision-id
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
803
    :param rebase_initial_depth: should depths be rebased until a mainline
804
      revision is found?
805
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
806
    """
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
807
    if exclude_common_ancestry:
808
        stop_rule = 'with-merges-without-common-ancestry'
809
    else:
810
        stop_rule = 'with-merges'
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
811
    view_revisions = branch.iter_merge_sorted_revisions(
812
        start_revision_id=end_rev_id, stop_revision_id=start_rev_id,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
813
        stop_rule=stop_rule)
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
814
    if not rebase_initial_depths:
815
        for (rev_id, merge_depth, revno, end_of_merge
816
             ) in view_revisions:
817
            yield rev_id, '.'.join(map(str, revno)), merge_depth
818
    else:
819
        # We're following a development line starting at a merged revision.
820
        # We need to adjust depths down by the initial depth until we find
821
        # a depth less than it. Then we use that depth as the adjustment.
822
        # If and when we reach the mainline, depth adjustment ends.
823
        depth_adjustment = None
824
        for (rev_id, merge_depth, revno, end_of_merge
825
             ) in view_revisions:
826
            if depth_adjustment is None:
827
                depth_adjustment = merge_depth
828
            if depth_adjustment:
829
                if merge_depth < depth_adjustment:
4955.5.3 by Vincent Ladeuil
Cleanup.
830
                    # From now on we reduce the depth adjustement, this can be
831
                    # surprising for users. The alternative requires two passes
832
                    # which breaks the fast display of the first revision
833
                    # though.
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
834
                    depth_adjustment = merge_depth
835
                merge_depth -= depth_adjustment
836
            yield rev_id, '.'.join(map(str, revno)), merge_depth
837
838
839
def _rebase_merge_depth(view_revisions):
840
    """Adjust depths upwards so the top level is 0."""
841
    # If either the first or last revision have a merge_depth of 0, we're done
842
    if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
843
        min_depth = min([d for r, n, d in view_revisions])
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
844
        if min_depth != 0:
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
845
            view_revisions = [(r, n, d-min_depth) for r, n, d in view_revisions]
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
846
    return view_revisions
847
848
3936.3.16 by Ian Clatworthy
use deltas to match files in selected use cases
849
def make_log_rev_iterator(branch, view_revisions, generate_delta, search,
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
850
        file_ids=None, direction='reverse'):
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
851
    """Create a revision iterator for log.
852
853
    :param branch: The branch being logged.
854
    :param view_revisions: The revisions being viewed.
855
    :param generate_delta: Whether to generate a delta for each revision.
4202.2.1 by Ian Clatworthy
get directory logging working again
856
      Permitted values are None, 'full' and 'partial'.
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
857
    :param search: A user text search string.
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
858
    :param file_ids: If non empty, only revisions matching one or more of
859
      the file-ids are to be kept.
860
    :param direction: the direction in which view_revisions is sorted
3642.1.7 by Robert Collins
Review feedback.
861
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
862
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
863
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
864
    # Convert view_revisions into (view, None, None) groups to fit with
865
    # the standard interface here.
6619.3.18 by Jelmer Vernooij
Run 2to3 idioms fixer.
866
    if isinstance(view_revisions, list):
3642.1.7 by Robert Collins
Review feedback.
867
        # A single batch conversion is faster than many incremental ones.
868
        # As we have all the data, do a batch conversion.
3642.1.5 by Robert Collins
Separate out batching of revisions.
869
        nones = [None] * len(view_revisions)
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
870
        log_rev_iterator = iter([list(zip(view_revisions, nones, nones))])
3642.1.5 by Robert Collins
Separate out batching of revisions.
871
    else:
872
        def _convert():
873
            for view in view_revisions:
874
                yield (view, None, None)
875
        log_rev_iterator = iter([_convert()])
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
876
    for adapter in log_adapters:
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
877
        # It would be nicer if log adapters were first class objects
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
878
        # with custom parameters. This will do for now. IGC 20090127
879
        if adapter == _make_delta_filter:
880
            log_rev_iterator = adapter(branch, generate_delta,
881
                search, log_rev_iterator, file_ids, direction)
882
        else:
883
            log_rev_iterator = adapter(branch, generate_delta,
884
                search, log_rev_iterator)
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
885
    return log_rev_iterator
886
887
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
888
def _make_search_filter(branch, generate_delta, match, log_rev_iterator):
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
889
    """Create a filtered iterator of log_rev_iterator matching on a regex.
890
891
    :param branch: The branch being logged.
892
    :param generate_delta: Whether to generate a delta for each revision.
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
893
    :param match: A dictionary with properties as keys and lists of strings
894
        as values. To match, a revision may match any of the supplied strings
895
        within a single property but must match at least one string for each
896
        property.
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
897
    :param log_rev_iterator: An input iterator containing all revisions that
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
898
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
899
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
900
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
901
    """
6716.1.1 by Jelmer Vernooij
When no --match options are specified, match is an empty dict, not None.
902
    if not match:
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
903
        return log_rev_iterator
6026.2.2 by Vincent Ladeuil
Delete the deprecated log.calculate_view_revisions and its associated test.
904
    searchRE = [(k, [re.compile(x, re.IGNORECASE) for x in v])
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
905
                for k, v in match.items()]
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
906
    return _filter_re(searchRE, log_rev_iterator)
907
908
909
def _filter_re(searchRE, log_rev_iterator):
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
910
    for revs in log_rev_iterator:
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
911
        new_revs = [rev for rev in revs if _match_filter(searchRE, rev[1])]
912
        if new_revs:
913
            yield new_revs
914
915
def _match_filter(searchRE, rev):
916
    strings = {
917
               'message': (rev.message,),
918
               'committer': (rev.committer,),
919
               'author': (rev.get_apparent_authors()),
920
               'bugs': list(rev.iter_bugs())
921
               }
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
922
    strings[''] = [item for inner_list in strings.values()
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
923
                   for item in inner_list]
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
924
    for (k, v) in searchRE:
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
925
        if k in strings and not _match_any_filter(strings[k], v):
926
            return False
927
    return True
928
929
def _match_any_filter(strings, res):
6631.4.2 by Martin
Remove uses of filter with None as first argument
930
    return any(re.search(s) for re in res for s in strings)
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
931
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
932
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
933
    fileids=None, direction='reverse'):
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
934
    """Add revision deltas to a log iterator if needed.
935
936
    :param branch: The branch being logged.
937
    :param generate_delta: Whether to generate a delta for each revision.
4202.2.1 by Ian Clatworthy
get directory logging working again
938
      Permitted values are None, 'full' and 'partial'.
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
939
    :param search: A user text search string.
940
    :param log_rev_iterator: An input iterator containing all revisions that
941
        could be displayed, in lists.
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
942
    :param fileids: If non empty, only revisions matching one or more of
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
943
      the file-ids are to be kept.
944
    :param direction: the direction in which view_revisions is sorted
3642.1.7 by Robert Collins
Review feedback.
945
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
946
        delta).
947
    """
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
948
    if not generate_delta and not fileids:
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
949
        return log_rev_iterator
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
950
    return _generate_deltas(branch.repository, log_rev_iterator,
951
        generate_delta, fileids, direction)
952
953
4202.2.1 by Ian Clatworthy
get directory logging working again
954
def _generate_deltas(repository, log_rev_iterator, delta_type, fileids,
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
955
    direction):
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
956
    """Create deltas for each batch of revisions in log_rev_iterator.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
957
3936.3.36 by Ian Clatworthy
minor comment polish & refactoring
958
    If we're only generating deltas for the sake of filtering against
959
    file-ids, we stop generating deltas once all file-ids reach the
960
    appropriate life-cycle point. If we're receiving data newest to
961
    oldest, then that life-cycle point is 'add', otherwise it's 'remove'.
962
    """
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
963
    check_fileids = fileids is not None and len(fileids) > 0
964
    if check_fileids:
965
        fileid_set = set(fileids)
966
        if direction == 'reverse':
967
            stop_on = 'add'
968
        else:
969
            stop_on = 'remove'
970
    else:
971
        fileid_set = None
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
972
    for revs in log_rev_iterator:
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
973
        # If we were matching against fileids and we've run out,
3936.3.40 by Ian Clatworthy
review feedback from jam
974
        # there's nothing left to do
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
975
        if check_fileids and not fileid_set:
3936.3.40 by Ian Clatworthy
review feedback from jam
976
            return
3642.1.3 by Robert Collins
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
977
        revisions = [rev[1] for rev in revs]
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
978
        new_revs = []
4202.2.1 by Ian Clatworthy
get directory logging working again
979
        if delta_type == 'full' and not check_fileids:
980
            deltas = repository.get_deltas_for_revisions(revisions)
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
981
            for rev, delta in zip(revs, deltas):
4202.2.1 by Ian Clatworthy
get directory logging working again
982
                new_revs.append((rev[0], rev[1], delta))
983
        else:
984
            deltas = repository.get_deltas_for_revisions(revisions, fileid_set)
6631.2.1 by Martin
Run 2to3 zip fixer and refactor
985
            for rev, delta in zip(revs, deltas):
4202.2.1 by Ian Clatworthy
get directory logging working again
986
                if check_fileids:
987
                    if delta is None or not delta.has_changed():
988
                        continue
989
                    else:
990
                        _update_fileids(delta, fileid_set, stop_on)
991
                        if delta_type is None:
992
                            delta = None
993
                        elif delta_type == 'full':
994
                            # If the file matches all the time, rebuilding
995
                            # a full delta like this in addition to a partial
4202.2.4 by Ian Clatworthy
comment tweak from vila's review
996
                            # one could be slow. However, it's likely that
4202.2.1 by Ian Clatworthy
get directory logging working again
997
                            # most revisions won't get this far, making it
998
                            # faster to filter on the partial deltas and
999
                            # build the occasional full delta than always
1000
                            # building full deltas and filtering those.
1001
                            rev_id = rev[0][0]
1002
                            delta = repository.get_revision_delta(rev_id)
1003
                new_revs.append((rev[0], rev[1], delta))
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
1004
        yield new_revs
1005
1006
4202.2.1 by Ian Clatworthy
get directory logging working again
1007
def _update_fileids(delta, fileids, stop_on):
1008
    """Update the set of file-ids to search based on file lifecycle events.
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
1009
4202.2.1 by Ian Clatworthy
get directory logging working again
1010
    :param fileids: a set of fileids to update
3936.3.33 by Ian Clatworthy
only generate deltas for file matching as long as necessary
1011
    :param stop_on: either 'add' or 'remove' - take file-ids out of the
1012
      fileids set once their add or remove entry is detected respectively
1013
    """
4202.2.1 by Ian Clatworthy
get directory logging working again
1014
    if stop_on == 'add':
1015
        for item in delta.added:
1016
            if item[1] in fileids:
1017
                fileids.remove(item[1])
1018
    elif stop_on == 'delete':
1019
        for item in delta.removed:
1020
            if item[1] in fileids:
1021
                fileids.remove(item[1])
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
1022
1023
3642.1.7 by Robert Collins
Review feedback.
1024
def _make_revision_objects(branch, generate_delta, search, log_rev_iterator):
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
1025
    """Extract revision objects from the repository
1026
1027
    :param branch: The branch being logged.
1028
    :param generate_delta: Whether to generate a delta for each revision.
1029
    :param search: A user text search string.
1030
    :param log_rev_iterator: An input iterator containing all revisions that
1031
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
1032
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
1033
        delta).
1034
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
1035
    repository = branch.repository
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
1036
    for revs in log_rev_iterator:
1037
        # r = revision_id, n = revno, d = merge depth
1038
        revision_ids = [view[0] for view, _, _ in revs]
6716.2.2 by Jelmer Vernooij
Deal with ghost revisions in mainline in bzr log.
1039
        revisions = dict(repository.iter_revisions(revision_ids))
1040
        yield [(rev[0], revisions[rev[0][0]], rev[2]) for rev in revs]
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
1041
1042
3642.1.7 by Robert Collins
Review feedback.
1043
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):
3642.1.5 by Robert Collins
Separate out batching of revisions.
1044
    """Group up a single large batch into smaller ones.
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
1045
1046
    :param branch: The branch being logged.
1047
    :param generate_delta: Whether to generate a delta for each revision.
1048
    :param search: A user text search string.
3642.1.5 by Robert Collins
Separate out batching of revisions.
1049
    :param log_rev_iterator: An input iterator containing all revisions that
1050
        could be displayed, in lists.
3874.2.4 by Vincent Ladeuil
Fix too long lines.
1051
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
1052
        delta).
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
1053
    """
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
1054
    num = 9
3642.1.5 by Robert Collins
Separate out batching of revisions.
1055
    for batch in log_rev_iterator:
1056
        batch = iter(batch)
1057
        while True:
1058
            step = [detail for _, detail in zip(range(num), batch)]
1059
            if len(step) == 0:
1060
                break
1061
            yield step
1062
            num = min(int(num * 1.5), 200)
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
1063
1064
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
1065
def _get_revision_limits(branch, start_revision, end_revision):
1066
    """Get and check revision limits.
1067
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
1068
    :param  branch: The branch containing the revisions.
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1069
1070
    :param  start_revision: The first revision to be logged.
1071
            but for merge revision support a RevisionInfo is expected.
1072
1073
    :param  end_revision: The last revision to be logged.
1074
            For backwards compatibility this may be a mainline integer revno,
1075
            but for merge revision support a RevisionInfo is expected.
1076
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1077
    :return: (start_rev_id, end_rev_id) tuple.
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1078
    """
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1079
    start_rev_id = None
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
1080
    start_revno = None
1081
    if start_revision is not None:
1082
        if not isinstance(start_revision, revisionspec.RevisionInfo):
1083
            raise TypeError(start_revision)
1084
        start_rev_id = start_revision.rev_id
1085
        start_revno = start_revision.revno
1086
    if start_revno is None:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1087
        start_revno = 1
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1088
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1089
    end_rev_id = None
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
1090
    end_revno = None
1091
    if end_revision is not None:
1092
        if not isinstance(end_revision, revisionspec.RevisionInfo):
1093
            raise TypeError(start_revision)
1094
        end_rev_id = end_revision.rev_id
1095
        end_revno = end_revision.revno
1096
    if end_revno is None:
1097
        try:
1098
            end_revno = branch.revno()
1099
        except errors.GhostRevisionsHaveNoRevno:
1100
            end_revno = None
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1101
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
1102
    if branch.last_revision() != _mod_revision.NULL_REVISION:
3936.3.4 by Ian Clatworthy
fix empty_branch log
1103
        if (start_rev_id == _mod_revision.NULL_REVISION
1104
            or end_rev_id == _mod_revision.NULL_REVISION):
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
1105
            raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
1106
        if end_revno is not None and start_revno > end_revno:
6138.3.15 by Jonathan Riddell
wrapping at 80 chars
1107
            raise errors.BzrCommandError(gettext("Start revision must be "
1108
                                         "older than the end revision."))
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1109
    return (start_rev_id, end_rev_id)
1110
1111
1112
def _get_mainline_revs(branch, start_revision, end_revision):
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
1113
    """Get the mainline revisions from the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1114
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1115
    Generates the list of mainline revisions for the branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1116
1117
    :param  branch: The branch containing the revisions.
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1118
1119
    :param  start_revision: The first revision to be logged.
1120
            For backwards compatibility this may be a mainline integer revno,
1121
            but for merge revision support a RevisionInfo is expected.
1122
1123
    :param  end_revision: The last revision to be logged.
1124
            For backwards compatibility this may be a mainline integer revno,
1125
            but for merge revision support a RevisionInfo is expected.
1126
1127
    :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
1128
    """
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1129
    branch_revno, branch_last_revision = branch.last_revision_info()
1130
    if branch_revno == 0:
1131
        return None, None, None, None
1132
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1133
    # For mainline generation, map start_revision and end_revision to
1134
    # mainline revnos. If the revision is not on the mainline choose the
1135
    # appropriate extreme of the mainline instead - the extra will be
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1136
    # filtered later.
1137
    # Also map the revisions to rev_ids, to be used in the later filtering
1138
    # stage.
1139
    start_rev_id = None
1140
    if start_revision is None:
1141
        start_revno = 1
1142
    else:
1143
        if isinstance(start_revision, revisionspec.RevisionInfo):
1144
            start_rev_id = start_revision.rev_id
1145
            start_revno = start_revision.revno or 1
1146
        else:
1147
            branch.check_real_revno(start_revision)
1148
            start_revno = start_revision
1149
1150
    end_rev_id = None
1151
    if end_revision is None:
1152
        end_revno = branch_revno
1153
    else:
1154
        if isinstance(end_revision, revisionspec.RevisionInfo):
1155
            end_rev_id = end_revision.rev_id
1156
            end_revno = end_revision.revno or branch_revno
1157
        else:
1158
            branch.check_real_revno(end_revision)
1159
            end_revno = end_revision
1160
1161
    if ((start_rev_id == _mod_revision.NULL_REVISION)
1162
        or (end_rev_id == _mod_revision.NULL_REVISION)):
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
1163
        raise errors.BzrCommandError(gettext('Logging revision 0 is invalid.'))
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1164
    if start_revno > end_revno:
6138.3.15 by Jonathan Riddell
wrapping at 80 chars
1165
        raise errors.BzrCommandError(gettext("Start revision must be older "
1166
                                     "than the end revision."))
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1167
1168
    if end_revno < start_revno:
1169
        return None, None, None, None
1170
    cur_revno = branch_revno
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
1171
    rev_nos = {}
1172
    mainline_revs = []
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
1173
    graph = branch.repository.get_graph()
1174
    for revision_id in graph.iter_lefthand_ancestry(
1175
            branch_last_revision, (_mod_revision.NULL_REVISION,)):
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
1176
        if cur_revno < start_revno:
3449.2.2 by John Arbash Meinel
Fix bug #172649. Cleanup, and handle the case where we are logging to the first revision.
1177
            # We have gone far enough, but we always add 1 more revision
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
1178
            rev_nos[revision_id] = cur_revno
1179
            mainline_revs.append(revision_id)
1180
            break
1181
        if cur_revno <= end_revno:
1182
            rev_nos[revision_id] = cur_revno
1183
            mainline_revs.append(revision_id)
1184
        cur_revno -= 1
3449.2.2 by John Arbash Meinel
Fix bug #172649. Cleanup, and handle the case where we are logging to the first revision.
1185
    else:
1186
        # We walked off the edge of all revisions, so we add a 'None' marker
1187
        mainline_revs.append(None)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1188
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
1189
    mainline_revs.reverse()
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1190
1191
    # override the mainline to look like the revision history.
3936.3.34 by Ian Clatworthy
return _mainline_revs() API as used in missing.py
1192
    return mainline_revs, rev_nos, start_rev_id, end_rev_id
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1193
1194
3940.1.3 by Ian Clatworthy
fix code
1195
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
1196
    include_merges=True):
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1197
    r"""Return the list of revision ids which touch a given file id.
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1198
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
1199
    The function filters view_revisions and returns a subset.
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1200
    This includes the revisions which directly change the file id,
1201
    and the revisions which merge these changes. So if the
1202
    revision graph is::
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1203
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1204
        A-.
1205
        |\ \
1206
        B C E
1207
        |/ /
1208
        D |
1209
        |\|
1210
        | F
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1211
        |/
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1212
        G
1213
1214
    And 'C' changes a file, then both C and D will be returned. F will not be
1215
    returned even though it brings the changes to C into the branch starting
1216
    with E. (Note that if we were using F as the tip instead of G, then we
1217
    would see C, D, F.)
1218
1219
    This will also be restricted based on a subset of the mainline.
1220
1221
    :param branch: The branch where we can get text revision information.
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
1222
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1223
    :param file_id: Filter out revisions that do not touch file_id.
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
1224
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1225
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
1226
        tuples. This is the list of revisions which will be filtered. It is
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
1227
        assumed that view_revisions is in merge_sort order (i.e. newest
1228
        revision first ).
1229
3940.1.3 by Ian Clatworthy
fix code
1230
    :param include_merges: include merge revisions in the result or not
1231
2359.1.8 by John Arbash Meinel
doc
1232
    :return: A list of (revision_id, dotted_revno, merge_depth) tuples.
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1233
    """
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1234
    # Lookup all possible text keys to determine which ones actually modified
1235
    # the file.
5815.5.12 by Jelmer Vernooij
Fix use of file graph.
1236
    graph = branch.repository.get_file_graph()
5815.5.10 by Jelmer Vernooij
Fix two issues pointed out by John.
1237
    get_parent_map = graph.get_parent_map
5815.5.8 by Jelmer Vernooij
Use traditional (fileid, revision) entries in file graph.
1238
    text_keys = [(file_id, rev_id) for rev_id, revno, depth in view_revisions]
4183.3.1 by Vincent Ladeuil
Fix bug #346431 by allowing log._filter_revisions_touching_file_id to be
1239
    next_keys = None
3711.3.16 by John Arbash Meinel
Doc update.
1240
    # Looking up keys in batches of 1000 can cut the time in half, as well as
1241
    # memory consumption. GraphIndex *does* like to look for a few keys in
1242
    # parallel, it just doesn't like looking for *lots* of keys in parallel.
3711.3.19 by John Arbash Meinel
Add a TODO discussing how our index requests should evolve.
1243
    # TODO: This code needs to be re-evaluated periodically as we tune the
1244
    #       indexing layer. We might consider passing in hints as to the known
1245
    #       access pattern (sparse/clustered, high success rate/low success
1246
    #       rate). This particular access is clustered with a low success rate.
3711.3.15 by John Arbash Meinel
Work around GraphIndex inefficiencies by requesting keys 1000 at a time.
1247
    modified_text_revisions = set()
1248
    chunk_size = 1000
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1249
    for start in range(0, len(text_keys), chunk_size):
3711.3.15 by John Arbash Meinel
Work around GraphIndex inefficiencies by requesting keys 1000 at a time.
1250
        next_keys = text_keys[start:start + chunk_size]
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1251
        # Only keep the revision_id portion of the key
3711.3.15 by John Arbash Meinel
Work around GraphIndex inefficiencies by requesting keys 1000 at a time.
1252
        modified_text_revisions.update(
5815.5.10 by Jelmer Vernooij
Fix two issues pointed out by John.
1253
            [k[1] for k in get_parent_map(next_keys)])
3711.3.15 by John Arbash Meinel
Work around GraphIndex inefficiencies by requesting keys 1000 at a time.
1254
    del text_keys, next_keys
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
1255
1256
    result = []
1257
    # Track what revisions will merge the current revision, replace entries
1258
    # with 'None' when they have been added to result
1259
    current_merge_stack = [None]
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
1260
    for info in view_revisions:
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
1261
        rev_id, revno, depth = info
1262
        if depth == len(current_merge_stack):
1263
            current_merge_stack.append(info)
1264
        else:
1265
            del current_merge_stack[depth + 1:]
1266
            current_merge_stack[-1] = info
1267
1268
        if rev_id in modified_text_revisions:
1269
            # This needs to be logged, along with the extra revisions
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1270
            for idx in range(len(current_merge_stack)):
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
1271
                node = current_merge_stack[idx]
1272
                if node is not None:
3940.1.3 by Ian Clatworthy
fix code
1273
                    if include_merges or node[2] == 0:
1274
                        result.append(node)
1275
                        current_merge_stack[idx] = None
3711.3.4 by John Arbash Meinel
Significantly faster, but consuming more memory.
1276
    return result
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
1277
1278
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1279
def reverse_by_depth(merge_sorted_revisions, _depth=0):
1280
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1281
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1282
    Revisions with a different depth are sorted as a group with the previous
1283
    revision of that depth.  There may be no topological justification for this,
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1284
    but it looks much nicer.
1285
    """
3842.2.6 by Vincent Ladeuil
Fix typo.
1286
    # Add a fake revision at start so that we can always attach sub revisions
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1287
    merge_sorted_revisions = [(None, None, _depth)] + merge_sorted_revisions
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1288
    zd_revisions = []
1289
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1290
        if val[2] == _depth:
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1291
            # Each revision at the current depth becomes a chunk grouping all
1292
            # higher depth revisions.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1293
            zd_revisions.append([val])
1294
        else:
1295
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1296
    for revisions in zd_revisions:
1297
        if len(revisions) > 1:
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1298
            # We have higher depth revisions, let reverse them locally
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
1299
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1300
    zd_revisions.reverse()
1301
    result = []
1302
    for chunk in zd_revisions:
1303
        result.extend(chunk)
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1304
    if _depth == 0:
1305
        # Top level call, get rid of the fake revisions that have been added
1306
        result = [r for r in result if r[0] is not None and r[1] is not None]
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
1307
    return result
1308
1309
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1310
class LogRevision(object):
1311
    """A revision to be logged (by LogFormatter.log_revision).
1312
1313
    A simple wrapper for the attributes of a revision to be logged.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1314
    The attributes may or may not be populated, as determined by the
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1315
    logging options and the log formatter capabilities.
1316
    """
1317
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
1318
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1319
                 tags=None, diff=None, signature=None):
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1320
        self.rev = rev
5728.5.7 by Matt Giuca
log: Avoid using a conditional expression for Python 2.4 compatibility.
1321
        if revno is None:
1322
            self.revno = None
1323
        else:
1324
            self.revno = str(revno)
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1325
        self.merge_depth = merge_depth
1326
        self.delta = delta
1327
        self.tags = tags
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1328
        self.diff = diff
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1329
        self.signature = signature
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1330
1331
794 by Martin Pool
- Merge John's nice short-log format.
1332
class LogFormatter(object):
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1333
    """Abstract class to display log messages.
1334
1335
    At a minimum, a derived class must implement the log_revision method.
1336
1337
    If the LogFormatter needs to be informed of the beginning or end of
1338
    a log it should implement the begin_log and/or end_log hook methods.
1339
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1340
    A LogFormatter should define the following supports_XXX flags
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1341
    to indicate which LogRevision attributes it supports:
1342
1343
    - supports_delta must be True if this log formatter supports delta.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1344
      Otherwise the delta attribute may not be populated.  The 'delta_format'
1345
      attribute describes whether the 'short_status' format (1) or the long
1346
      one (2) should be used.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1347
1348
    - supports_merge_revisions must be True if this log formatter supports
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1349
      merge revisions.  If not, then only mainline revisions will be passed
1350
      to the formatter.
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1351
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1352
    - preferred_levels is the number of levels this formatter defaults to.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1353
      The default value is zero meaning display all levels.
1354
      This value is only relevant if supports_merge_revisions is True.
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1355
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1356
    - supports_tags must be True if this log formatter supports tags.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1357
      Otherwise the tags attribute may not be populated.
3144.7.1 by Guillermo Gonzalez
* added show_properties to LonLogFormat and the hooks to register custom functions
1358
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1359
    - supports_diff must be True if this log formatter supports diffs.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1360
      Otherwise the diff attribute may not be populated.
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1361
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1362
    - supports_signatures must be True if this log formatter supports GPG
1363
      signatures.
1364
3144.7.1 by Guillermo Gonzalez
* added show_properties to LonLogFormat and the hooks to register custom functions
1365
    Plugins can register functions to show custom revision properties using
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
1366
    the properties_handler_registry. The registered function
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1367
    must respect the following interface description::
1368
3144.7.2 by Guillermo Gonzalez
* cleanup a bit the interface
1369
        def my_show_properties(properties_dict):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1370
            # code that returns a dict {'name':'value'} of the properties
3144.7.2 by Guillermo Gonzalez
* cleanup a bit the interface
1371
            # to be shown
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1372
    """
3947.1.10 by Ian Clatworthy
review feedback from vila
1373
    preferred_levels = 0
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1374
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
1375
    def __init__(self, to_file, show_ids=False, show_timezone='original',
4955.4.5 by Vincent Ladeuil
Start reproducing the problems reported in the bug.
1376
                 delta_format=None, levels=None, show_advice=False,
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1377
                 to_exact_file=None, author_list_handler=None):
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1378
        """Create a LogFormatter.
1379
1380
        :param to_file: the file to output to
6042.1.1 by Thomi Richards
Fix bug #747958 - 'levels' value is no longer overridden in Logger if the user explicitly asked for less details than the logger is capable of providing.
1381
        :param to_exact_file: if set, gives an output stream to which
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1382
             non-Unicode diffs are written.
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1383
        :param show_ids: if True, revision-ids are to be displayed
1384
        :param show_timezone: the timezone to use
1385
        :param delta_format: the level of delta information to display
4221.2.3 by Ian Clatworthy
jam feedback: don't show advice if --levels explicitly given
1386
          or None to leave it to the formatter to decide
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1387
        :param levels: the number of levels to display; None or -1 to
1388
          let the log formatter decide.
4221.2.3 by Ian Clatworthy
jam feedback: don't show advice if --levels explicitly given
1389
        :param show_advice: whether to show advice at the end of the
1390
          log or not
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1391
        :param author_list_handler: callable generating a list of
1392
          authors to display for a given revision
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1393
        """
794 by Martin Pool
- Merge John's nice short-log format.
1394
        self.to_file = to_file
4110.1.1 by Alexander Belchenko
Fixed problem with `log -p` and non-ascii content of files: show_diff should write the diff to exact [stdout] stream.
1395
        # 'exact' stream used to show diff, it should print content 'as is'
1396
        # and should not try to decode/encode it to unicode to avoid bug #328007
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1397
        if to_exact_file is not None:
1398
            self.to_exact_file = to_exact_file
1399
        else:
4792.8.12 by Martin Pool
comment
1400
            # XXX: somewhat hacky; this assumes it's a codec writer; it's better
1401
            # for code that expects to get diffs to pass in the exact file
1402
            # stream
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1403
            self.to_exact_file = getattr(to_file, 'stream', to_file)
794 by Martin Pool
- Merge John's nice short-log format.
1404
        self.show_ids = show_ids
1405
        self.show_timezone = show_timezone
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
1406
        if delta_format is None:
1407
            # Ensures backward compatibility
1408
            delta_format = 2 # long format
1409
        self.delta_format = delta_format
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1410
        self.levels = levels
4221.2.3 by Ian Clatworthy
jam feedback: don't show advice if --levels explicitly given
1411
        self._show_advice = show_advice
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1412
        self._merge_count = 0
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1413
        self._author_list_handler = author_list_handler
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1414
3947.1.10 by Ian Clatworthy
review feedback from vila
1415
    def get_levels(self):
1416
        """Get the number of levels to display or 0 for all."""
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1417
        if getattr(self, 'supports_merge_revisions', False):
1418
            if self.levels is None or self.levels == -1:
4217.2.1 by Ian Clatworthy
fix log advice when the # of levels is implicit
1419
                self.levels = self.preferred_levels
1420
        else:
1421
            self.levels = 1
1422
        return self.levels
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1423
3947.1.10 by Ian Clatworthy
review feedback from vila
1424
    def log_revision(self, revision):
1425
        """Log a revision.
1426
1427
        :param  revision:   The LogRevision to be logged.
1428
        """
1429
        raise NotImplementedError('not implemented in abstract base')
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1430
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1431
    def show_advice(self):
1432
        """Output user advice, if any, when the log is completed."""
4221.2.3 by Ian Clatworthy
jam feedback: don't show advice if --levels explicitly given
1433
        if self._show_advice and self.levels == 1 and self._merge_count > 0:
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1434
            advice_sep = self.get_advice_separator()
1435
            if advice_sep:
1436
                self.to_file.write(advice_sep)
4208.2.2 by Ian Clatworthy
show --levels 0 in advice, not just -n0
1437
            self.to_file.write(
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
1438
                "Use --include-merged or -n0 to see merged revisions.\n")
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1439
1440
    def get_advice_separator(self):
1441
        """Get the text separating the log from the closing advice."""
1442
        return ''
1443
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
1444
    def short_committer(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1445
        name, address = config.parse_username(rev.committer)
1446
        if name:
3063.3.1 by Lukáš Lalinský
Fall back to showing e-mail in ``log --short/--line`` if the committer/author has only e-mail.
1447
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
1448
        return address
2388.1.11 by Alexander Belchenko
changes after John's review
1449
2671.5.4 by Lukáš Lalinsky
Replace the committer with the author in log, the committer is displayed only in the long format and only if it's different from the author.
1450
    def short_author(self, rev):
4081.3.14 by Martin von Gagern
Pass keyword arguments of authors method by name.
1451
        return self.authors(rev, 'first', short=True, sep=', ')
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1452
1453
    def authors(self, rev, who, short=False, sep=None):
4081.3.13 by Martin von Gagern
Added extensive docstring and comments to authors method.
1454
        """Generate list of authors, taking --authors option into account.
1455
1456
        The caller has to specify the name of a author list handler,
1457
        as provided by the author list registry, using the ``who``
1458
        argument.  That name only sets a default, though: when the
1459
        user selected a different author list generation using the
1460
        ``--authors`` command line switch, as represented by the
1461
        ``author_list_handler`` constructor argument, that value takes
1462
        precedence.
1463
1464
        :param rev: The revision for which to generate the list of authors.
1465
        :param who: Name of the default handler.
1466
        :param short: Whether to shorten names to either name or address.
1467
        :param sep: What separator to use for automatic concatenation.
1468
        """
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1469
        if self._author_list_handler is not None:
4081.3.13 by Martin von Gagern
Added extensive docstring and comments to authors method.
1470
            # The user did specify --authors, which overrides the default
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
1471
            author_list_handler = self._author_list_handler
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1472
        else:
4081.3.13 by Martin von Gagern
Added extensive docstring and comments to authors method.
1473
            # The user didn't specify --authors, so we use the caller's default
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1474
            author_list_handler = author_list_registry.get(who)
1475
        names = author_list_handler(rev)
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1476
        if short:
1477
            for i in range(len(names)):
1478
                name, address = config.parse_username(names[i])
1479
                if name:
1480
                    names[i] = name
1481
                else:
1482
                    names[i] = address
1483
        if sep is not None:
1484
            names = sep.join(names)
1485
        return names
2671.5.4 by Lukáš Lalinsky
Replace the committer with the author in log, the committer is displayed only in the long format and only if it's different from the author.
1486
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1487
    def merge_marker(self, revision):
4213.1.1 by Ian Clatworthy
merge indicators in log --long (Ian Clatworthy)
1488
        """Get the merge marker to include in the output or '' if none."""
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1489
        if len(revision.rev.parent_ids) > 1:
1490
            self._merge_count += 1
1491
            return ' [merge]'
1492
        else:
1493
            return ''
1494
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
1495
    def show_properties(self, revision, indent):
3144.7.8 by Guillermo Gonzalez
* added error handling (and logging) to LogFormatter.show_properties when a handler raise an error
1496
        """Displays the custom properties returned by each registered handler.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1497
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
1498
        If a registered handler raises an error it is propagated.
3144.7.5 by Guillermo Gonzalez
* some improvements to the doctstring in show_properties method and in LogFormatter
1499
        """
4379.4.1 by Ian Clatworthy
make log --long faster
1500
        for line in self.custom_properties(revision):
1501
            self.to_file.write("%s%s\n" % (indent, line))
1502
1503
    def custom_properties(self, revision):
1504
        """Format the custom properties returned by each registered handler.
1505
1506
        If a registered handler raises an error it is propagated.
1507
1508
        :return: a list of formatted lines (excluding trailing newlines)
1509
        """
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1510
        lines = self._foreign_info_properties(revision)
1511
        for key, handler in properties_handler_registry.iteritems():
1512
            lines.extend(self._format_properties(handler(revision)))
1513
        return lines
1514
1515
    def _foreign_info_properties(self, rev):
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1516
        """Custom log displayer for foreign revision identifiers.
1517
1518
        :param rev: Revision object.
1519
        """
1520
        # Revision comes directly from a foreign repository
1521
        if isinstance(rev, foreign.ForeignRevision):
5092.1.2 by Vincent Ladeuil
Fix bug #519862.
1522
            return self._format_properties(
1523
                rev.mapping.vcs.show_foreign_revid(rev.foreign_revid))
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1524
1525
        # Imported foreign revision revision ids always contain :
6973.6.2 by Jelmer Vernooij
Fix more tests.
1526
        if not b":" in rev.revision_id:
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1527
            return []
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1528
1529
        # Revision was once imported from a foreign repository
1530
        try:
1531
            foreign_revid, mapping = \
1532
                foreign.foreign_vcs_registry.parse_revision_id(rev.revision_id)
1533
        except errors.InvalidRevisionId:
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1534
            return []
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1535
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1536
        return self._format_properties(
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1537
            mapping.vcs.show_foreign_revid(foreign_revid))
1538
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1539
    def _format_properties(self, properties):
4379.4.1 by Ian Clatworthy
make log --long faster
1540
        lines = []
4393.1.2 by Jelmer Vernooij
Move showing of foreign revision info onto log, for better performance.
1541
        for key, value in properties.items():
4379.4.3 by Ian Clatworthy
merge bzr.dev r4426
1542
            lines.append(key + ': ' + value)
4379.4.1 by Ian Clatworthy
make log --long faster
1543
        return lines
3144.7.8 by Guillermo Gonzalez
* added error handling (and logging) to LogFormatter.show_properties when a handler raise an error
1544
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1545
    def show_diff(self, to_file, diff, indent):
1546
        for l in diff.rstrip().split('\n'):
1547
            to_file.write(indent + '%s\n' % (l,))
1548
2388.1.11 by Alexander Belchenko
changes after John's review
1549
4379.4.1 by Ian Clatworthy
make log --long faster
1550
# Separator between revisions in long format
1551
_LONG_SEP = '-' * 60
1552
1553
794 by Martin Pool
- Merge John's nice short-log format.
1554
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
1555
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.
1556
    supports_merge_revisions = True
4206.1.1 by Ian Clatworthy
log mainline by default
1557
    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.
1558
    supports_delta = True
1559
    supports_tags = True
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1560
    supports_diff = True
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1561
    supports_signatures = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
1562
4379.4.1 by Ian Clatworthy
make log --long faster
1563
    def __init__(self, *args, **kwargs):
1564
        super(LongLogFormatter, self).__init__(*args, **kwargs)
1565
        if self.show_timezone == 'original':
1566
            self.date_string = self._date_string_original_timezone
1567
        else:
1568
            self.date_string = self._date_string_with_timezone
1569
1570
    def _date_string_with_timezone(self, rev):
1571
        return format_date(rev.timestamp, rev.timezone or 0,
1572
                           self.show_timezone)
1573
1574
    def _date_string_original_timezone(self, rev):
1575
        return format_date_with_offset_in_original_timezone(rev.timestamp,
1576
            rev.timezone or 0)
1577
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.
1578
    def log_revision(self, revision):
1579
        """Log a revision, either merged or not."""
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
1580
        indent = '    ' * revision.merge_depth
4379.4.1 by Ian Clatworthy
make log --long faster
1581
        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.
1582
        if revision.revno is not None:
4379.4.1 by Ian Clatworthy
make log --long faster
1583
            lines.append('revno: %s%s' % (revision.revno,
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1584
                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.
1585
        if revision.tags:
4379.4.1 by Ian Clatworthy
make log --long faster
1586
            lines.append('tags: %s' % (', '.join(revision.tags)))
5728.5.6 by Matt Giuca
log: 'long' and 'short' log formats now always show the revision-id for any
1587
        if self.show_ids or revision.revno is None:
4379.4.1 by Ian Clatworthy
make log --long faster
1588
            lines.append('revision-id: %s' % (revision.rev.revision_id,))
5728.5.6 by Matt Giuca
log: 'long' and 'short' log formats now always show the revision-id for any
1589
        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.
1590
            for parent_id in revision.rev.parent_ids:
4379.4.1 by Ian Clatworthy
make log --long faster
1591
                lines.append('parent: %s' % (parent_id,))
1592
        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.
1593
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
1594
        committer = revision.rev.committer
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1595
        authors = self.authors(revision.rev, 'all')
4056.2.3 by James Westby
Use a new "authors" revision property to allow multiple authors
1596
        if authors != [committer]:
4379.4.1 by Ian Clatworthy
make log --long faster
1597
            lines.append('author: %s' % (", ".join(authors),))
1598
        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.
1599
1600
        branch_nick = revision.rev.properties.get('branch-nick', None)
1601
        if branch_nick is not None:
4379.4.1 by Ian Clatworthy
make log --long faster
1602
            lines.append('branch nick: %s' % (branch_nick,))
1603
1604
        lines.append('timestamp: %s' % (self.date_string(revision.rev),))
1605
5971.1.39 by Jonathan Riddell
add signature verification to log option, alas breaks write lock
1606
        if revision.signature is not None:
1607
            lines.append('signature: ' + revision.signature)
1608
4379.4.1 by Ian Clatworthy
make log --long faster
1609
        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.
1610
        if not revision.rev.message:
4379.4.1 by Ian Clatworthy
make log --long faster
1611
            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.
1612
        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.
1613
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
1614
            for l in message.split('\n'):
4379.4.1 by Ian Clatworthy
make log --long faster
1615
                lines.append('  %s' % (l,))
1616
1617
        # Dump the output, appending the delta and diff if requested
1618
        to_file = self.to_file
1619
        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.
1620
        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.
1621
            # Use the standard status output to display changes
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1622
            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.
1623
            report_delta(to_file, revision.delta, short_status=False,
5076.4.4 by Arnaud Jeansen
Add a unified report_delta method
1624
                         show_ids=self.show_ids, indent=indent)
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1625
        if revision.diff is not None:
1626
            to_file.write(indent + 'diff:\n')
4792.8.11 by Martin Pool
Give LogFormatters a second byte output stream for their diffs
1627
            to_file.flush()
3943.5.6 by Ian Clatworthy
feedback from jam's review
1628
            # Note: we explicitly don't indent the diff (relative to the
1629
            # 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.
1630
            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
1631
            self.to_exact_file.flush()
794 by Martin Pool
- Merge John's nice short-log format.
1632
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1633
    def get_advice_separator(self):
1634
        """Get the text separating the log from the closing advice."""
1635
        return '-' * 60 + '\n'
1636
794 by Martin Pool
- Merge John's nice short-log format.
1637
1638
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.
1639
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1640
    supports_merge_revisions = True
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1641
    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.
1642
    supports_delta = True
3946.3.1 by Ian Clatworthy
extend ShortLogFormatter & LineLogFormatter to support tags
1643
    supports_tags = True
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1644
    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.
1645
3947.1.9 by Ian Clatworthy
get offset right when dotted-revno in column 1
1646
    def __init__(self, *args, **kwargs):
1647
        super(ShortLogFormatter, self).__init__(*args, **kwargs)
1648
        self.revno_width_by_depth = {}
1649
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
1650
    def log_revision(self, revision):
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1651
        # We need two indents: one per depth and one for the information
1652
        # relative to that indent. Most mainline revnos are 5 chars or
3970.1.1 by Ian Clatworthy
log -n/--levels (Ian Clatworthy)
1653
        # 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
1654
        # calculated, we need to remember the offset for a given depth
1655
        # as we might be starting from a dotted revno in the first column
1656
        # and we want subsequent mainline revisions to line up.
1657
        depth = revision.merge_depth
1658
        indent = '    ' * depth
1659
        revno_width = self.revno_width_by_depth.get(depth)
1660
        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
1661
            if revision.revno is None or revision.revno.find('.') == -1:
3947.1.10 by Ian Clatworthy
review feedback from vila
1662
                # mainline revno, e.g. 12345
3947.1.9 by Ian Clatworthy
get offset right when dotted-revno in column 1
1663
                revno_width = 5
1664
            else:
3947.1.10 by Ian Clatworthy
review feedback from vila
1665
                # dotted revno, e.g. 12345.10.55
1666
                revno_width = 11
3947.1.9 by Ian Clatworthy
get offset right when dotted-revno in column 1
1667
            self.revno_width_by_depth[depth] = revno_width
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1668
        offset = ' ' * (revno_width + 1)
1669
794 by Martin Pool
- Merge John's nice short-log format.
1670
        to_file = self.to_file
3946.3.1 by Ian Clatworthy
extend ShortLogFormatter & LineLogFormatter to support tags
1671
        tags = ''
1672
        if revision.tags:
3946.3.2 by Ian Clatworthy
add tests & NEWS item
1673
            tags = ' {%s}' % (', '.join(revision.tags))
3947.1.8 by Ian Clatworthy
merge bzr.dev r3954
1674
        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
1675
                revision.revno or "", self.short_author(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
1676
                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.
1677
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
1678
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
1679
                            show_offset=False),
4208.2.1 by Ian Clatworthy
merge indicators in log --long
1680
                tags, self.merge_marker(revision)))
3976.3.1 by Neil Martinsen-Burrell
Add custom properties handling to short log format
1681
        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
1682
        if self.show_ids or revision.revno is None:
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1683
            to_file.write(indent + offset + 'revision-id:%s\n'
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
1684
                          % (revision.rev.revision_id,))
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.
1685
        if not revision.rev.message:
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1686
            to_file.write(indent + offset + '(no message)\n')
794 by Martin Pool
- Merge John's nice short-log format.
1687
        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.
1688
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
1689
            for l in message.split('\n'):
3947.1.7 by Ian Clatworthy
tweak indenting/offsetting for --short given dotted revno lengths
1690
                to_file.write(indent + offset + '%s\n' % (l,))
794 by Martin Pool
- Merge John's nice short-log format.
1691
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.
1692
        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.
1693
            # Use the standard status output to display changes
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1694
            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.
1695
            report_delta(to_file, revision.delta,
1696
                         short_status=self.delta_format==1,
5076.4.4 by Arnaud Jeansen
Add a unified report_delta method
1697
                         show_ids=self.show_ids, indent=indent + offset)
3943.5.2 by Ian Clatworthy
hand control of diff formatting to the log formatter
1698
        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.
1699
            self.show_diff(self.to_exact_file, revision.diff, '      ')
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
1700
        to_file.write('\n')
794 by Martin Pool
- Merge John's nice short-log format.
1701
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1702
1185.12.25 by Aaron Bentley
Added one-line log format
1703
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.
1704
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1705
    supports_merge_revisions = True
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
1706
    preferred_levels = 1
3946.3.1 by Ian Clatworthy
extend ShortLogFormatter & LineLogFormatter to support tags
1707
    supports_tags = True
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
1708
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.
1709
    def __init__(self, *args, **kwargs):
1710
        super(LineLogFormatter, self).__init__(*args, **kwargs)
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1711
        width = terminal_width()
1712
        if width is not None:
1713
            # we need one extra space for terminals that wrap on last char
1714
            width = width - 1
1715
        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.
1716
1185.12.25 by Aaron Bentley
Added one-line log format
1717
    def truncate(self, str, max_len):
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1718
        if max_len is None or len(str) <= max_len:
1185.12.25 by Aaron Bentley
Added one-line log format
1719
            return str
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1720
        return str[:max_len-3] + '...'
1185.12.25 by Aaron Bentley
Added one-line log format
1721
1722
    def date_string(self, rev):
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1723
        return format_date(rev.timestamp, rev.timezone or 0,
1185.12.25 by Aaron Bentley
Added one-line log format
1724
                           self.show_timezone, date_fmt="%Y-%m-%d",
1725
                           show_offset=False)
1726
1727
    def message(self, rev):
1728
        if not rev.message:
1729
            return '(no message)'
1730
        else:
1731
            return rev.message
1732
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.
1733
    def log_revision(self, revision):
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1734
        indent = '  ' * revision.merge_depth
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
1735
        self.to_file.write(self.log_string(revision.revno, revision.rev,
3947.1.8 by Ian Clatworthy
merge bzr.dev r3954
1736
            self._max_chars, revision.tags, indent))
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
1737
        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.
1738
3947.1.8 by Ian Clatworthy
merge bzr.dev r3954
1739
    def log_string(self, revno, rev, max_chars, tags=None, prefix=''):
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1740
        """Format log info into one string. Truncate tail of string
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1741
1742
        :param revno:      revision number or None.
1743
                           Revision numbers counts from 1.
1744
        :param rev:        revision object
1745
        :param max_chars:  maximum length of resulting string
1746
        :param tags:       list of tags or None
1747
        :param prefix:     string to prefix each line
1748
        :return:           formatted truncated string
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1749
        """
1750
        out = []
1751
        if revno:
1752
            # show revno only when is not None
3946.3.4 by Ian Clatworthy
minor cleanup
1753
            out.append("%s:" % revno)
5725.1.1 by Neil Martinsen-Burrell
Scale author field with length of line in LineLogFormatter
1754
        if max_chars is not None:
5725.1.2 by Neil Martinsen-Burrell
keep current behavior the same by rounding up
1755
            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
1756
        else:
1757
            out.append(self.short_author(rev))
1185.12.25 by Aaron Bentley
Added one-line log format
1758
        out.append(self.date_string(rev))
3983.2.1 by Neil Martinsen-Burrell
add merge indication to the line format
1759
        if len(rev.parent_ids) > 1:
1760
            out.append('[merge]')
3946.3.3 by Ian Clatworthy
feedback from jelmer re position of tags in --line
1761
        if tags:
1762
            tag_str = '{%s}' % (', '.join(tags))
1763
            out.append(tag_str)
1740.2.5 by Aaron Bentley
Merge from bzr.dev
1764
        out.append(rev.get_summary())
3947.1.1 by Ian Clatworthy
add --merge-revisions to log
1765
        return self.truncate(prefix + " ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
1766
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1767
4129.1.1 by Andrea Bolognani
Renamed the ChangeLogLogFormatter class to GnuChangelogLogFormatter.
1768
class GnuChangelogLogFormatter(LogFormatter):
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1769
1770
    supports_merge_revisions = True
1771
    supports_delta = True
1772
1773
    def log_revision(self, revision):
1774
        """Log a revision, either merged or not."""
1775
        to_file = self.to_file
1776
1777
        date_str = format_date(revision.rev.timestamp,
1778
                               revision.rev.timezone or 0,
1779
                               self.show_timezone,
1780
                               date_fmt='%Y-%m-%d',
1781
                               show_offset=False)
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
1782
        committer_str = self.authors(revision.rev, 'first', sep=', ')
4081.3.6 by Martin von Gagern
Drop space to make John happy.
1783
        committer_str = committer_str.replace(' <', '  <')
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1784
        to_file.write('%s  %s\n\n' % (date_str, committer_str))
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1785
4137.1.1 by James Westby
Small improvements to the GNU ChangeLog formatter.
1786
        if revision.delta is not None and revision.delta.has_changed():
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1787
            for c in revision.delta.added + revision.delta.removed + revision.delta.modified:
1788
                path, = c[:1]
1789
                to_file.write('\t* %s:\n' % (path,))
1790
            for c in revision.delta.renamed:
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1791
                oldpath, newpath = c[:2]
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1792
                # For renamed files, show both the old and the new path
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1793
                to_file.write('\t* %s:\n\t* %s:\n' % (oldpath, newpath))
4070.4.1 by Andrea Bolognani
New GNU Changelog log format
1794
            to_file.write('\n')
1795
1796
        if not revision.rev.message:
1797
            to_file.write('\tNo commit message\n')
1798
        else:
1799
            message = revision.rev.message.rstrip('\r\n')
1800
            for l in message.split('\n'):
1801
                to_file.write('\t%s\n' % (l.lstrip(),))
1802
            to_file.write('\n')
1803
1804
1185.12.27 by Aaron Bentley
Use line log for pending merges
1805
def line_log(rev, max_chars):
1806
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1807
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
1808
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1809
1810
class LogFormatterRegistry(registry.Registry):
1811
    """Registry for log formatters"""
1812
1813
    def make_formatter(self, name, *args, **kwargs):
1814
        """Construct a formatter from arguments.
1815
1816
        :param name: Name of the formatter to construct.  'short', 'long' and
1817
            'line' are built-in.
1818
        """
1819
        return self.get(name)(*args, **kwargs)
1820
1821
    def get_default(self, branch):
6175.2.1 by Vincent Ladeuil
Migrate log_format to the config stacks.
1822
        c = branch.get_config_stack()
1823
        return self.get(c.get('log_format'))
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1824
1825
1826
log_formatter_registry = LogFormatterRegistry()
1827
1828
1829
log_formatter_registry.register('short', ShortLogFormatter,
6259.2.8 by Martin Packman
Add full stops to various registry help strings
1830
                                'Moderately short log format.')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1831
log_formatter_registry.register('long', LongLogFormatter,
6259.2.8 by Martin Packman
Add full stops to various registry help strings
1832
                                'Detailed log format.')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1833
log_formatter_registry.register('line', LineLogFormatter,
6259.2.8 by Martin Packman
Add full stops to various registry help strings
1834
                                'Log format with one line per revision.')
4129.1.1 by Andrea Bolognani
Renamed the ChangeLogLogFormatter class to GnuChangelogLogFormatter.
1835
log_formatter_registry.register('gnu-changelog', GnuChangelogLogFormatter,
6259.2.8 by Martin Packman
Add full stops to various registry help strings
1836
                                'Format used by GNU ChangeLog files.')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1837
794 by Martin Pool
- Merge John's nice short-log format.
1838
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1839
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1840
    log_formatter_registry.register(name, formatter)
1841
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1842
794 by Martin Pool
- Merge John's nice short-log format.
1843
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
1844
    """Construct a formatter from arguments.
1845
1185.12.27 by Aaron Bentley
Use line log for pending merges
1846
    name -- Name of the formatter to construct; currently 'long', 'short' and
1847
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
1848
    """
794 by Martin Pool
- Merge John's nice short-log format.
1849
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1850
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
1851
    except KeyError:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
1852
        raise errors.BzrCommandError(gettext("unknown log formatter: %r") % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1853
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1854
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1855
def author_list_all(rev):
1856
    return rev.get_apparent_authors()[:]
1857
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1858
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1859
def author_list_first(rev):
1860
    lst = rev.get_apparent_authors()
1861
    try:
1862
        return [lst[0]]
1863
    except IndexError:
1864
        return []
1865
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1866
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1867
def author_list_committer(rev):
1868
    return [rev.committer]
1869
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1870
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
1871
author_list_registry = registry.Registry()
1872
1873
author_list_registry.register('all', author_list_all,
1874
                              'All authors')
1875
1876
author_list_registry.register('first', author_list_first,
1877
                              'The first author')
1878
1879
author_list_registry.register('committer', author_list_committer,
1880
                              'The committer')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1881
4081.3.12 by Martin von Gagern
Separate top level functions with two blank lines.
1882
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
1883
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
1884
                           log_format='long'):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1885
    """Show the change in revision history comparing the old revision history to the new one.
1886
1887
    :param branch: The branch where the revisions exist
1888
    :param old_rh: The old revision history
1889
    :param new_rh: The new revision history
1890
    :param to_file: A file to write the results to. If None, stdout will be used
1891
    """
1892
    if to_file is None:
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
1893
        to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
1894
            errors='replace')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1895
    lf = log_formatter(log_format,
1896
                       show_ids=False,
1897
                       to_file=to_file,
1898
                       show_timezone='original')
1899
1900
    # This is the first index which is different between
1901
    # old and new
1902
    base_idx = None
6651.2.2 by Martin
Apply 2to3 xrange fix and fix up with sixish range
1903
    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.
1904
        if (len(new_rh) <= i
1905
            or len(old_rh) <= i
1906
            or new_rh[i] != old_rh[i]):
1907
            base_idx = i
1908
            break
1909
1910
    if base_idx is None:
1911
        to_file.write('Nothing seems to have changed\n')
1912
        return
1913
    ## TODO: It might be nice to do something like show_log
1914
    ##       and show the merged entries. But since this is the
1915
    ##       removed revisions, it shouldn't be as important
1916
    if base_idx < len(old_rh):
1917
        to_file.write('*'*60)
1918
        to_file.write('\nRemoved Revisions:\n')
1919
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1920
            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
1921
            lr = LogRevision(rev, i+1, 0, None)
1922
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1923
        to_file.write('*'*60)
1924
        to_file.write('\n\n')
1925
    if base_idx < len(new_rh):
1926
        to_file.write('Added Revisions:\n')
1927
        show_log(branch,
1928
                 lf,
1929
                 None,
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
1930
                 verbose=False,
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1931
                 direction='forward',
1932
                 start_revision=base_idx+1,
1933
                 end_revision=len(new_rh),
1934
                 search=None)
1935
3144.7.4 by Guillermo Gonzalez
* move the function regisstry into a real Registry instead of a list
1936
3848.1.7 by Aaron Bentley
Use repository in get_history_change
1937
def get_history_change(old_revision_id, new_revision_id, repository):
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1938
    """Calculate the uncommon lefthand history between two revisions.
1939
1940
    :param old_revision_id: The original revision id.
1941
    :param new_revision_id: The new revision id.
3848.1.22 by Aaron Bentley
Fix spelling
1942
    :param repository: The repository to use for the calculation.
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1943
1944
    return old_history, new_history
1945
    """
3848.1.6 by Aaron Bentley
Implement get_history_change
1946
    old_history = []
1947
    old_revisions = set()
1948
    new_history = []
1949
    new_revisions = set()
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
1950
    graph = repository.get_graph()
1951
    new_iter = graph.iter_lefthand_ancestry(new_revision_id)
1952
    old_iter = graph.iter_lefthand_ancestry(old_revision_id)
3848.1.6 by Aaron Bentley
Implement get_history_change
1953
    stop_revision = None
1954
    do_old = True
1955
    do_new = True
1956
    while do_new or do_old:
1957
        if do_new:
1958
            try:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1959
                new_revision = next(new_iter)
3848.1.6 by Aaron Bentley
Implement get_history_change
1960
            except StopIteration:
1961
                do_new = False
1962
            else:
1963
                new_history.append(new_revision)
1964
                new_revisions.add(new_revision)
1965
                if new_revision in old_revisions:
1966
                    stop_revision = new_revision
1967
                    break
1968
        if do_old:
1969
            try:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
1970
                old_revision = next(old_iter)
3848.1.6 by Aaron Bentley
Implement get_history_change
1971
            except StopIteration:
1972
                do_old = False
1973
            else:
1974
                old_history.append(old_revision)
1975
                old_revisions.add(old_revision)
1976
                if old_revision in new_revisions:
1977
                    stop_revision = old_revision
1978
                    break
1979
    new_history.reverse()
1980
    old_history.reverse()
1981
    if stop_revision is not None:
1982
        new_history = new_history[new_history.index(stop_revision) + 1:]
1983
        old_history = old_history[old_history.index(stop_revision) + 1:]
1984
    return old_history, new_history
1985
1986
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1987
def show_branch_change(branch, output, old_revno, old_revision_id):
1988
    """Show the changes made to a branch.
1989
1990
    :param branch: The branch to show changes about.
1991
    :param output: A file-like object to write changes to.
1992
    :param old_revno: The revno of the old tip.
1993
    :param old_revision_id: The revision_id of the old tip.
1994
    """
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1995
    new_revno, new_revision_id = branch.last_revision_info()
1996
    old_history, new_history = get_history_change(old_revision_id,
1997
                                                  new_revision_id,
1998
                                                  branch.repository)
1999
    if old_history == [] and new_history == []:
2000
        output.write('Nothing seems to have changed\n')
2001
        return
2002
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
2003
    log_format = log_formatter_registry.get_default(branch)
2004
    lf = log_format(show_ids=False, to_file=output, show_timezone='original')
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2005
    if old_history != []:
2006
        output.write('*'*60)
2007
        output.write('\nRemoved Revisions:\n')
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
2008
        show_flat_log(branch.repository, old_history, old_revno, lf)
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2009
        output.write('*'*60)
2010
        output.write('\n\n')
2011
    if new_history != []:
3848.1.9 by Aaron Bentley
new/old sections are omitted as appropriate.
2012
        output.write('Added Revisions:\n')
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2013
        start_revno = new_revno - len(new_history) + 1
2014
        show_log(branch, lf, None, verbose=False, direction='forward',
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
2015
                 start_revision=start_revno)
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
2016
2017
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
2018
def show_flat_log(repository, history, last_revno, lf):
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
2019
    """Show a simple log of the specified history.
2020
2021
    :param repository: The repository to retrieve revisions from.
2022
    :param history: A list of revision_ids indicating the lefthand history.
2023
    :param last_revno: The revno of the last revision_id in the history.
2024
    :param lf: The log formatter to use.
2025
    """
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
2026
    start_revno = last_revno - len(history) + 1
2027
    revisions = repository.get_revisions(history)
2028
    for i, rev in enumerate(revisions):
2029
        lr = LogRevision(rev, i + last_revno, 0, None)
2030
        lf.log_revision(lr)
2031
2032
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2033
def _get_info_for_log_files(revisionspec_list, file_list, add_cleanup):
4202.2.1 by Ian Clatworthy
get directory logging working again
2034
    """Find file-ids and kinds given a list of files and a revision range.
2035
2036
    We search for files at the end of the range. If not found there,
2037
    we try the start of the range.
2038
2039
    :param revisionspec_list: revision range as parsed on the command line
2040
    :param file_list: the list of paths given on the command line;
2041
      the first of these can be a branch location or a file path,
2042
      the remainder must be file paths
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2043
    :param add_cleanup: When the branch returned is read locked,
2044
      an unlock call will be queued to the cleanup.
4202.2.1 by Ian Clatworthy
get directory logging working again
2045
    :return: (branch, info_list, start_rev_info, end_rev_info) where
2046
      info_list is a list of (relative_path, file_id, kind) tuples where
2047
      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.
2048
      branch will be read-locked.
3943.6.4 by Ian Clatworthy
review feedback from vila
2049
    """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
2050
    from breezy.builtins import _get_revision_range
6207.3.3 by jelmer at samba
Fix tests and the like.
2051
    tree, b, path = controldir.ControlDir.open_containing_tree_or_branch(
2052
        file_list[0])
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2053
    add_cleanup(b.lock_read().unlock)
4202.2.1 by Ian Clatworthy
get directory logging working again
2054
    # XXX: It's damn messy converting a list of paths to relative paths when
2055
    # those paths might be deleted ones, they might be on a case-insensitive
2056
    # filesystem and/or they might be in silly locations (like another branch).
2057
    # For example, what should "log bzr://branch/dir/file1 file2" do? (Is
2058
    # file2 implicitly in the same dir as file1 or should its directory be
2059
    # taken from the current tree somehow?) For now, this solves the common
2060
    # case of running log in a nested directory, assuming paths beyond the
2061
    # first one haven't been deleted ...
2062
    if tree:
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
2063
        relpaths = [path] + tree.safe_relpath_files(file_list[1:])
4202.2.1 by Ian Clatworthy
get directory logging working again
2064
    else:
2065
        relpaths = [path] + file_list[1:]
2066
    info_list = []
2067
    start_rev_info, end_rev_info = _get_revision_range(revisionspec_list, b,
2068
        "log")
4296.2.1 by Jelmer Vernooij
Don't retrieve the tree if log is called on the root.
2069
    if relpaths in ([], [u'']):
2070
        return b, [], start_rev_info, end_rev_info
4202.2.1 by Ian Clatworthy
get directory logging working again
2071
    if start_rev_info is None and end_rev_info is None:
3943.6.4 by Ian Clatworthy
review feedback from vila
2072
        if tree is None:
2073
            tree = b.basis_tree()
4202.2.1 by Ian Clatworthy
get directory logging working again
2074
        tree1 = None
2075
        for fp in relpaths:
2076
            file_id = tree.path2id(fp)
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
2077
            kind = _get_kind_for_file_id(tree, fp, file_id)
4202.2.1 by Ian Clatworthy
get directory logging working again
2078
            if file_id is None:
2079
                # go back to when time began
2080
                if tree1 is None:
2081
                    try:
2082
                        rev1 = b.get_rev_id(1)
2083
                    except errors.NoSuchRevision:
2084
                        # No history at all
2085
                        file_id = None
2086
                        kind = None
2087
                    else:
2088
                        tree1 = b.repository.revision_tree(rev1)
2089
                if tree1:
2090
                    file_id = tree1.path2id(fp)
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
2091
                    kind = _get_kind_for_file_id(tree1, fp, file_id)
4202.2.1 by Ian Clatworthy
get directory logging working again
2092
            info_list.append((fp, file_id, kind))
3943.6.4 by Ian Clatworthy
review feedback from vila
2093
4202.2.1 by Ian Clatworthy
get directory logging working again
2094
    elif start_rev_info == end_rev_info:
3943.6.4 by Ian Clatworthy
review feedback from vila
2095
        # One revision given - file must exist in it
4202.2.1 by Ian Clatworthy
get directory logging working again
2096
        tree = b.repository.revision_tree(end_rev_info.rev_id)
2097
        for fp in relpaths:
2098
            file_id = tree.path2id(fp)
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
2099
            kind = _get_kind_for_file_id(tree, fp, file_id)
4202.2.1 by Ian Clatworthy
get directory logging working again
2100
            info_list.append((fp, file_id, kind))
3943.6.4 by Ian Clatworthy
review feedback from vila
2101
4202.2.1 by Ian Clatworthy
get directory logging working again
2102
    else:
3943.6.4 by Ian Clatworthy
review feedback from vila
2103
        # Revision range given. Get the file-id from the end tree.
2104
        # If that fails, try the start tree.
4202.2.1 by Ian Clatworthy
get directory logging working again
2105
        rev_id = end_rev_info.rev_id
3943.6.4 by Ian Clatworthy
review feedback from vila
2106
        if rev_id is None:
2107
            tree = b.basis_tree()
2108
        else:
4202.2.1 by Ian Clatworthy
get directory logging working again
2109
            tree = b.repository.revision_tree(rev_id)
2110
        tree1 = None
2111
        for fp in relpaths:
3943.6.4 by Ian Clatworthy
review feedback from vila
2112
            file_id = tree.path2id(fp)
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
2113
            kind = _get_kind_for_file_id(tree, fp, file_id)
4202.2.1 by Ian Clatworthy
get directory logging working again
2114
            if file_id is None:
2115
                if tree1 is None:
2116
                    rev_id = start_rev_info.rev_id
2117
                    if rev_id is None:
2118
                        rev1 = b.get_rev_id(1)
2119
                        tree1 = b.repository.revision_tree(rev1)
2120
                    else:
2121
                        tree1 = b.repository.revision_tree(rev_id)
2122
                file_id = tree1.path2id(fp)
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
2123
                kind = _get_kind_for_file_id(tree1, fp, file_id)
4202.2.1 by Ian Clatworthy
get directory logging working again
2124
            info_list.append((fp, file_id, kind))
2125
    return b, info_list, start_rev_info, end_rev_info
2126
2127
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
2128
def _get_kind_for_file_id(tree, path, file_id):
4202.2.1 by Ian Clatworthy
get directory logging working again
2129
    """Return the kind of a file-id or None if it doesn't exist."""
2130
    if file_id is not None:
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
2131
        return tree.kind(path, file_id)
3943.6.4 by Ian Clatworthy
review feedback from vila
2132
    else:
4202.2.1 by Ian Clatworthy
get directory logging working again
2133
        return None
3943.6.4 by Ian Clatworthy
review feedback from vila
2134
2135
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
2136
properties_handler_registry = registry.Registry()
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
2137
4921.2.1 by Neil Martinsen-Burrell
include bug fixes in log output
2138
# Use the properties handlers to print out bug information if available
2139
def _bugs_properties_handler(revision):
6619.3.1 by Jelmer Vernooij
Apply 2to3 has_key fix.
2140
    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
2141
        bug_lines = revision.properties['bugs'].split('\n')
2142
        bug_rows = [line.split(' ', 1) for line in bug_lines]
2143
        fixed_bug_urls = [row[0] for row in bug_rows if
2144
                          len(row) > 1 and row[1] == 'fixed']
5092.1.2 by Vincent Ladeuil
Fix bug #519862.
2145
4921.2.2 by Neil Martinsen-Burrell
from review comments: improve splitting, add test that handler is present, use build_tree in tests
2146
        if fixed_bug_urls:
6143.1.8 by Jonathan Riddell
fix log formatting of bug line
2147
            return {ngettext('fixes bug', 'fixes bugs', len(fixed_bug_urls)):\
2148
                    ' '.join(fixed_bug_urls)}
4921.2.1 by Neil Martinsen-Burrell
include bug fixes in log output
2149
    return {}
2150
2151
properties_handler_registry.register('bugs_properties_handler',
2152
                                     _bugs_properties_handler)
2153
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2154
2155
# adapters which revision ids to log are filtered. When log is called, the
2156
# log_rev_iterator is adapted through each of these factory methods.
2157
# Plugins are welcome to mutate this list in any way they like - as long
2158
# as the overall behaviour is preserved. At this point there is no extensible
2159
# mechanism for getting parameters to each factory method, and until there is
2160
# this won't be considered a stable api.
2161
log_adapters = [
2162
    # core log logic
3642.1.7 by Robert Collins
Review feedback.
2163
    _make_batch_filter,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2164
    # read revision objects
3642.1.7 by Robert Collins
Review feedback.
2165
    _make_revision_objects,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2166
    # filter on log messages
3642.1.7 by Robert Collins
Review feedback.
2167
    _make_search_filter,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2168
    # generate deltas for things we will show
3642.1.7 by Robert Collins
Review feedback.
2169
    _make_delta_filter
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
2170
    ]