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