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