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