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