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