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