/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
1
# Copyright (C) 2005, 2006, 2007 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
53
from itertools import (
54
    izip,
55
    )
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
56
import re
2997.1.2 by Kent Gibson
Move all imports to top of log.py
57
import sys
58
from warnings import (
59
    warn,
60
    )
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
61
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.
62
from bzrlib.lazy_import import lazy_import
63
lazy_import(globals(), """
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
64
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.
65
from bzrlib import (
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
66
    config,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
67
    errors,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
68
    repository as _mod_repository,
69
    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.
70
    revisionspec,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
71
    trace,
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.
72
    tsort,
73
    )
74
""")
75
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
76
from bzrlib import (
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
77
    registry,
2997.1.2 by Kent Gibson
Move all imports to top of log.py
78
    )
79
from bzrlib.osutils import (
80
    format_date,
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
81
    get_terminal_encoding,
2997.1.2 by Kent Gibson
Move all imports to top of log.py
82
    terminal_width,
83
    )
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
84
375 by Martin Pool
- New command touching-revisions and function to trace
85
86
def find_touching_revisions(branch, file_id):
87
    """Yield a description of revisions which affect the file_id.
88
89
    Each returned element is (revno, revision_id, description)
90
91
    This is the list of revisions where the file is either added,
92
    modified, renamed or deleted.
93
94
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
95
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
96
    """
97
    last_ie = None
98
    last_path = None
99
    revno = 1
100
    for revision_id in branch.revision_history():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
101
        this_inv = branch.repository.get_revision_inventory(revision_id)
375 by Martin Pool
- New command touching-revisions and function to trace
102
        if file_id in this_inv:
103
            this_ie = this_inv[file_id]
104
            this_path = this_inv.id2path(file_id)
105
        else:
106
            this_ie = this_path = None
107
108
        # now we know how it was last time, and how it is in this revision.
109
        # are those two states effectively the same or not?
110
111
        if not this_ie and not last_ie:
112
            # not present in either
113
            pass
114
        elif this_ie and not last_ie:
115
            yield revno, revision_id, "added " + this_path
116
        elif not this_ie and last_ie:
117
            # deleted here
118
            yield revno, revision_id, "deleted " + last_path
119
        elif this_path != last_path:
120
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
121
        elif (this_ie.text_size != last_ie.text_size
122
              or this_ie.text_sha1 != last_ie.text_sha1):
123
            yield revno, revision_id, "modified " + this_path
124
125
        last_ie = this_ie
126
        last_path = this_path
127
        revno += 1
128
129
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
130
def _enumerate_history(branch):
131
    rh = []
132
    revno = 1
133
    for rev_id in branch.revision_history():
134
        rh.append((revno, rev_id))
135
        revno += 1
136
    return rh
137
138
378 by Martin Pool
- New usage bzr log FILENAME
139
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
140
             lf,
527 by Martin Pool
- refactor log command
141
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
142
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
143
             direction='reverse',
144
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
145
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
146
             search=None,
3936.3.8 by Ian Clatworthy
back-out --strict
147
             limit=None):
369 by Martin Pool
- Split out log printing into new show_log function
148
    """Write out human-readable log of commits to this branch.
149
3874.2.2 by Vincent Ladeuil
Cleanup show_log doc string.
150
    :param lf: The LogFormatter object showing the output.
151
152
    :param specific_fileid: If not None, list only the commits affecting the
153
        specified file, rather than all commits.
154
155
    :param verbose: If True show added/changed/deleted/renamed files.
156
157
    :param direction: 'reverse' (default) is latest to earliest; 'forward' is
158
        earliest to latest.
159
160
    :param start_revision: If not None, only show revisions >= start_revision
161
162
    :param end_revision: If not None, only show revisions <= end_revision
163
164
    :param search: If not None, only show revisions with matching commit
165
        messages
166
167
    :param limit: If set, shows only 'limit' revisions, all revisions are shown
168
        if None or 0.
369 by Martin Pool
- Split out log printing into new show_log function
169
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
170
    branch.lock_read()
171
    try:
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
172
        if getattr(lf, 'begin_log', None):
173
            lf.begin_log()
174
1756.1.6 by Aaron Bentley
Revert locking fix
175
        _show_log(branch, lf, specific_fileid, verbose, direction,
3936.3.8 by Ian Clatworthy
back-out --strict
176
                  start_revision, end_revision, search, limit)
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
177
178
        if getattr(lf, 'end_log', None):
179
            lf.end_log()
1417.1.7 by Robert Collins
teach log it needs a read lock
180
    finally:
181
        branch.unlock()
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
182
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
183
1417.1.7 by Robert Collins
teach log it needs a read lock
184
def _show_log(branch,
185
             lf,
186
             specific_fileid=None,
187
             verbose=False,
188
             direction='reverse',
189
             start_revision=None,
190
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
191
             search=None,
3936.3.8 by Ian Clatworthy
back-out --strict
192
             limit=None):
1417.1.7 by Robert Collins
teach log it needs a read lock
193
    """Worker function for show_log - see show_log."""
794 by Martin Pool
- Merge John's nice short-log format.
194
    if not isinstance(lf, LogFormatter):
195
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
196
    if specific_fileid:
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
197
        trace.mutter('get log for file_id %r', specific_fileid)
3936.3.1 by Ian Clatworthy
refactor _show_log
198
199
    # Consult the LogFormatter about what it needs and can handle
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
200
    generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)
201
    allow_single_merge_revision = getattr(lf,
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
202
        'supports_single_merge_revision', generate_merge_revisions)
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
203
    generate_tags = getattr(lf, 'supports_tags', False)
3936.3.1 by Ian Clatworthy
refactor _show_log
204
    if generate_tags and branch.supports_tags():
205
        rev_tag_dict = branch.tags.get_reverse_tag_dict()
206
    else:
207
        rev_tag_dict = {}
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
208
    generate_delta = verbose and getattr(lf, 'supports_delta', False)
209
3936.3.1 by Ian Clatworthy
refactor _show_log
210
    # Find and print the interesting revisions
3936.3.13 by Ian Clatworthy
feedback from jameinel
211
    log_count = 0
212
    revision_iterator = _create_log_revision_iterator(branch,
213
        start_revision, end_revision, direction, specific_fileid, search,
214
        generate_merge_revisions, allow_single_merge_revision,
215
        generate_delta)
216
    for revs in revision_iterator:
217
        for (rev_id, revno, merge_depth), rev, delta in revs:
218
            lr = LogRevision(rev, revno, merge_depth, delta,
219
                             rev_tag_dict.get(rev_id))
220
            lf.log_revision(lr)
221
            if limit:
222
                log_count += 1
223
                if log_count >= limit:
224
                    return
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
225
226
3936.3.1 by Ian Clatworthy
refactor _show_log
227
def _create_log_revision_iterator(branch, start_revision, end_revision,
228
    direction, specific_fileid, search, generate_merge_revisions,
3936.3.8 by Ian Clatworthy
back-out --strict
229
    allow_single_merge_revision, generate_delta):
3936.3.1 by Ian Clatworthy
refactor _show_log
230
    """Create a revision iterator for log.
231
232
    :param branch: The branch being logged.
233
    :param start_revision: If not None, only show revisions >= start_revision
234
    :param end_revision: If not None, only show revisions <= end_revision
235
    :param direction: 'reverse' (default) is latest to earliest; 'forward' is
236
        earliest to latest.
237
    :param specific_fileid: If not None, list only the commits affecting the
238
        specified file.
239
    :param search: If not None, only show revisions with matching commit
240
        messages.
241
    :param generate_merge_revisions: If False, show only mainline revisions.
3936.3.2 by Ian Clatworthy
minor cleanups
242
    :param allow_single_merge_revision: If True, logging of a single
243
        revision off the mainline is to be allowed
3936.3.1 by Ian Clatworthy
refactor _show_log
244
    :param generate_delta: Whether to generate a delta for each revision.
245
246
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
247
        delta).
248
    """
249
    view_revisions = calculate_view_revisions(branch, start_revision,
3936.3.2 by Ian Clatworthy
minor cleanups
250
        end_revision, direction, specific_fileid, generate_merge_revisions,
3936.3.8 by Ian Clatworthy
back-out --strict
251
        allow_single_merge_revision)
3936.3.1 by Ian Clatworthy
refactor _show_log
252
    return make_log_rev_iterator(branch, view_revisions, generate_delta, search)
253
254
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
255
class _NonMainlineRevisionLimit(Exception):
256
    """Raised when a revision limit is not on the mainline."""
257
258
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
259
class _StartNotLinearAncestor(Exception):
260
    """Raised when a start revision is not found walking left-hand history."""
261
262
3936.3.7 by Ian Clatworthy
move fileid filtering up a layer
263
def _calc_view_revisions(branch, start_revision, end_revision, direction,
3936.3.8 by Ian Clatworthy
back-out --strict
264
        generate_merge_revisions, allow_single_merge_revision):
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
265
    """Calculate the revisions to view.
266
267
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
268
             a list of the same tuples.
269
    """
270
    rev_limits = _get_revision_limits(branch, start_revision, end_revision)
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
271
    br_revno, br_rev_id, start_revno, start_rev_id, end_revno, end_rev_id = \
272
        rev_limits
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
273
    if br_revno == 0:
274
        return []
275
3936.3.10 by Ian Clatworthy
more single revision clean-up
276
    # If a single revision is requested, check we can handle it
277
    generate_single_revision = (start_rev_id and start_rev_id == end_rev_id)
278
    if generate_single_revision:
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
279
        if start_rev_id == br_rev_id:
280
            # It's the tip
281
            if (not generate_merge_revisions or
282
                not _has_merges(branch, br_rev_id)):
283
                return [(br_rev_id, br_revno, 0)]
284
            else:
285
                # We need the merge revisions as well
286
                generate_single_revision = False
287
        elif (not generate_merge_revisions or
288
            not _has_merges(branch, start_rev_id)):
3936.3.13 by Ian Clatworthy
feedback from jameinel
289
            try:
290
                revno = branch.revision_id_to_revno(start_rev_id)
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
291
                # We found it on the mainline
3936.3.10 by Ian Clatworthy
more single revision clean-up
292
                return [(start_rev_id, revno, 0)]
3936.3.13 by Ian Clatworthy
feedback from jameinel
293
            except errors.NoSuchRevision:
294
                if allow_single_merge_revision:
295
                    # It's a merge revision and the log formatter isn't
296
                    # completely brain dead.
297
                    revnos = branch.get_revision_id_to_revno_map()
298
                    revno = revnos.get(start_rev_id)
299
                    revno_str = '.'.join(str(n) for n in revno)
300
                    return [(start_rev_id, revno_str, 0)]
301
                else:
302
                    raise errors.BzrCommandError('Selected log formatter only'
303
                        ' supports mainline revisions.')
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
304
        else:
305
            generate_single_revision = False
3936.3.10 by Ian Clatworthy
more single revision clean-up
306
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
307
    # If we only want to see linear revisions, we can iterate ...
3936.3.10 by Ian Clatworthy
more single revision clean-up
308
    if not generate_merge_revisions:
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
309
        # Note: _linear_view_revisions() returns an iterator so we can't
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
310
        # trap the _NonMainlineRevisionLimits exception here
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
311
        result = _linear_view_revisions(branch, rev_limits)
3936.3.13 by Ian Clatworthy
feedback from jameinel
312
        # If a start limit was given, check it before outputting anything
313
        if start_rev_id:
314
            try:
315
                result = list(result)
316
            except _StartNotLinearAncestor:
317
                raise errors.BzrCommandError('Start revision not found in'
318
                    ' left-hand history of end revision.')
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
319
        if direction == 'forward':
320
            result = reversed(list(result))
321
        return result
322
323
    # Otherwise, the algorithm is O(history) for now ...
324
3936.3.10 by Ian Clatworthy
more single revision clean-up
325
    # Do the filtering
3936.3.4 by Ian Clatworthy
fix empty_branch log
326
    mainline_revs, rev_nos = _get_mainline_revs(branch, rev_limits)
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
327
    view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch,
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.
328
                          direction, include_merges=generate_merge_revisions)
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
329
    if direction == 'reverse':
330
        start_rev_id, end_rev_id = end_rev_id, start_rev_id
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
331
    view_revisions = _filter_revision_range(list(view_revs_iter),
332
                                            start_rev_id,
333
                                            end_rev_id)
2388.1.11 by Alexander Belchenko
changes after John's review
334
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
335
    # Rebase merge_depth - unless there are no revisions or 
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
336
    # either the first or last revision have merge_depth = 0.
337
    if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
2466.12.3 by Kent Gibson
Fix JAM's review comments for left align patch
338
        min_depth = min([d for r,n,d in view_revisions])
339
        if min_depth != 0:
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
340
            view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
341
    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.
342
530 by Martin Pool
- put back verbose log support for reversed logs
343
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
344
def _has_merges(branch, rev_id):
345
    """Does a revision have multiple parents or not?"""
346
    return len(branch.repository.get_revision(rev_id).parent_ids) > 1
347
348
349
def _linear_view_revisions(branch, revision_limits):
350
    """Calculate a sequence of revisions to view, newest to oldest.
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
351
352
    :param revision_limits: a tuple as returned by _get_revision_limits()
353
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
354
    :raises _StartNotLinearAncestor: if a start_rev_id is specified but
355
      is not found walking the left-hand history
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
356
    """
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
357
    br_revno, br_rev_id, start_revno, start_rev_id, end_revno, end_rev_id = \
358
        revision_limits
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
359
    repo = branch.repository
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
360
    if start_rev_id is None and end_rev_id is None:
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
361
        cur_revno = br_revno
362
        for revision_id in repo.iter_reverse_revision_history(br_rev_id):
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
363
            yield revision_id, str(cur_revno), 0
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
364
            cur_revno -= 1
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
365
    elif end_rev_id:
366
        # If we're starting on the mainline, we can calculate revnos.
367
        # Otherwise, we need to look them up.
3936.3.13 by Ian Clatworthy
feedback from jameinel
368
        try:
369
            cur_revno = branch.revision_id_to_revno(end_rev_id)
370
            lookup_revnos = False
371
        except errors.NoSuchRevision:
372
            lookup_revnos = True
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
373
        if lookup_revnos:
374
            revno_map = branch.get_revision_id_to_revno_map()
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
375
        found_start = start_rev_id is None
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
376
        for revision_id in repo.iter_reverse_revision_history(end_rev_id):
377
            if lookup_revnos:
378
                revno_str = revno_map.get(revision_id)
379
            else:
380
                revno_str = str(cur_revno)
381
            if not found_start and revision_id == start_rev_id:
382
                yield revision_id, revno_str, 0
383
                found_start = True
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
384
                break
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
385
            else:
386
                yield revision_id, revno_str, 0
387
                cur_revno -= 1
3936.3.6 by Ian Clatworthy
add & use _NonMainlineRevisionLimit exception
388
        else:
3936.3.12 by Ian Clatworthy
more single revision & sequence tuning
389
            if not found_start:
390
                raise _StartNotLinearAncestor()
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
391
392
3936.3.13 by Ian Clatworthy
feedback from jameinel
393
def calculate_view_revisions(branch, start_revision, end_revision, direction,
394
        specific_fileid, generate_merge_revisions, allow_single_merge_revision):
395
    """Calculate the revisions to view.
396
397
    :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples OR
398
             a list of the same tuples.
399
    """
400
    # This method is likely to be deprecated soon - IGC 20090116
401
    view_revisions = _calc_view_revisions(branch, start_revision, end_revision,
402
        direction, generate_merge_revisions or specific_fileid,
403
        allow_single_merge_revision)
404
    if specific_fileid:
405
        view_revisions = _filter_revisions_touching_file_id(branch,
406
            specific_fileid, view_revisions,
407
            include_merges=generate_merge_revisions)
408
    return view_revisions
409
410
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
411
def make_log_rev_iterator(branch, view_revisions, generate_delta, search):
412
    """Create a revision iterator for log.
413
414
    :param branch: The branch being logged.
415
    :param view_revisions: The revisions being viewed.
416
    :param generate_delta: Whether to generate a delta for each revision.
417
    :param search: A user text search string.
3642.1.7 by Robert Collins
Review feedback.
418
    :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.
419
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
420
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
421
    # Convert view_revisions into (view, None, None) groups to fit with
422
    # the standard interface here.
423
    if type(view_revisions) == list:
3642.1.7 by Robert Collins
Review feedback.
424
        # A single batch conversion is faster than many incremental ones.
425
        # As we have all the data, do a batch conversion.
3642.1.5 by Robert Collins
Separate out batching of revisions.
426
        nones = [None] * len(view_revisions)
427
        log_rev_iterator = iter([zip(view_revisions, nones, nones)])
428
    else:
429
        def _convert():
430
            for view in view_revisions:
431
                yield (view, None, None)
432
        log_rev_iterator = iter([_convert()])
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
433
    for adapter in log_adapters:
434
        log_rev_iterator = adapter(branch, generate_delta, search,
435
            log_rev_iterator)
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
436
    return log_rev_iterator
437
438
3642.1.7 by Robert Collins
Review feedback.
439
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
440
    """Create a filtered iterator of log_rev_iterator matching on a regex.
441
442
    :param branch: The branch being logged.
443
    :param generate_delta: Whether to generate a delta for each revision.
444
    :param search: A user text search string.
445
    :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.
446
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
447
    :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.
448
        delta).
3642.1.1 by Robert Collins
Refactoring in log towards more pluggable revision selection.
449
    """
450
    if search is None:
451
        return log_rev_iterator
452
    # Compile the search now to get early errors.
453
    searchRE = re.compile(search, re.IGNORECASE)
454
    return _filter_message_re(searchRE, log_rev_iterator)
455
456
457
def _filter_message_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.
458
    for revs in log_rev_iterator:
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.
459
        new_revs = []
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
460
        for (rev_id, revno, merge_depth), rev, delta in revs:
461
            if searchRE.search(rev.message):
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.
462
                new_revs.append(((rev_id, revno, merge_depth), rev, delta))
463
        yield new_revs
464
465
3642.1.7 by Robert Collins
Review feedback.
466
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator):
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.
467
    """Add revision deltas to a log iterator if needed.
468
469
    :param branch: The branch being logged.
470
    :param generate_delta: Whether to generate a delta for each revision.
471
    :param search: A user text search string.
472
    :param log_rev_iterator: An input iterator containing all revisions that
473
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
474
    :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.
475
        delta).
476
    """
477
    if not generate_delta:
478
        return log_rev_iterator
479
    return _generate_deltas(branch.repository, log_rev_iterator)
480
481
482
def _generate_deltas(repository, log_rev_iterator):
3642.1.7 by Robert Collins
Review feedback.
483
    """Create deltas for each batch of revisions in log_rev_iterator."""
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.
484
    for revs in log_rev_iterator:
485
        revisions = [rev[1] for rev in revs]
486
        deltas = repository.get_deltas_for_revisions(revisions)
487
        revs = [(rev[0], rev[1], delta) for rev, delta in izip(revs, deltas)]
488
        yield revs
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
489
490
3642.1.7 by Robert Collins
Review feedback.
491
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.
492
    """Extract revision objects from the repository
493
494
    :param branch: The branch being logged.
495
    :param generate_delta: Whether to generate a delta for each revision.
496
    :param search: A user text search string.
497
    :param log_rev_iterator: An input iterator containing all revisions that
498
        could be displayed, in lists.
3642.1.7 by Robert Collins
Review feedback.
499
    :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.
500
        delta).
501
    """
3642.1.5 by Robert Collins
Separate out batching of revisions.
502
    repository = branch.repository
3642.1.4 by Robert Collins
Factor out revision object extraction from revision batching.
503
    for revs in log_rev_iterator:
504
        # r = revision_id, n = revno, d = merge depth
505
        revision_ids = [view[0] for view, _, _ in revs]
506
        revisions = repository.get_revisions(revision_ids)
507
        revs = [(rev[0], revision, rev[2]) for rev, revision in
508
            izip(revs, revisions)]
509
        yield revs
510
511
3642.1.7 by Robert Collins
Review feedback.
512
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):
3642.1.5 by Robert Collins
Separate out batching of revisions.
513
    """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.
514
515
    :param branch: The branch being logged.
516
    :param generate_delta: Whether to generate a delta for each revision.
517
    :param search: A user text search string.
3642.1.5 by Robert Collins
Separate out batching of revisions.
518
    :param log_rev_iterator: An input iterator containing all revisions that
519
        could be displayed, in lists.
3874.2.4 by Vincent Ladeuil
Fix too long lines.
520
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
521
        delta).
3642.1.2 by Robert Collins
Setup a log iterator that more closely matches what the code tries to do with repository operations.
522
    """
523
    repository = branch.repository
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
524
    num = 9
3642.1.5 by Robert Collins
Separate out batching of revisions.
525
    for batch in log_rev_iterator:
526
        batch = iter(batch)
527
        while True:
528
            step = [detail for _, detail in zip(range(num), batch)]
529
            if len(step) == 0:
530
                break
531
            yield step
532
            num = min(int(num * 1.5), 200)
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
533
534
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
535
def _get_revision_limits(branch, start_revision, end_revision):
536
    """Get and check revision limits.
537
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
538
    :param  branch: The branch containing the revisions. 
539
540
    :param  start_revision: The first revision to be logged.
541
            For backwards compatibility this may be a mainline integer revno,
542
            but for merge revision support a RevisionInfo is expected.
543
544
    :param  end_revision: The last revision to be logged.
545
            For backwards compatibility this may be a mainline integer revno,
546
            but for merge revision support a RevisionInfo is expected.
547
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
548
    :return: (br_revno, br_rev_id, start_revno, start_rev_id, end_revno,
549
        end_rev_id) tuple.
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
550
    """
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
551
    branch_revno, branch_rev_id = branch.last_revision_info()
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
552
    start_rev_id = None
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
553
    if start_revision is None:
554
        start_revno = 1
555
    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.
556
        if isinstance(start_revision, revisionspec.RevisionInfo):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
557
            start_rev_id = start_revision.rev_id
558
            start_revno = start_revision.revno or 1
559
        else:
560
            branch.check_real_revno(start_revision)
561
            start_revno = start_revision
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
562
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
563
    end_rev_id = None
564
    if end_revision is None:
3449.2.5 by John Arbash Meinel
Stop referencing the variable I removed.
565
        end_revno = branch_revno
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
566
    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.
567
        if isinstance(end_revision, revisionspec.RevisionInfo):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
568
            end_rev_id = end_revision.rev_id
3449.2.5 by John Arbash Meinel
Stop referencing the variable I removed.
569
            end_revno = end_revision.revno or branch_revno
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
570
        else:
571
            branch.check_real_revno(end_revision)
572
            end_revno = end_revision
573
3936.3.4 by Ian Clatworthy
fix empty_branch log
574
    if branch_revno != 0:
575
        if (start_rev_id == _mod_revision.NULL_REVISION
576
            or end_rev_id == _mod_revision.NULL_REVISION):
577
            raise errors.BzrCommandError('Logging revision 0 is invalid.')
578
        if start_revno > end_revno:
579
            raise errors.BzrCommandError("Start revision must be older than "
580
                                         "the end revision.")
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
581
    return (branch_revno, branch_rev_id, start_revno, start_rev_id, end_revno,
582
        end_rev_id)
583
584
3936.3.4 by Ian Clatworthy
fix empty_branch log
585
def _get_mainline_revs(branch, revision_limits):
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
586
    """Get the mainline revisions from the branch.
587
    
588
    Generates the list of mainline revisions for the branch. Also map the
589
    revisions to rev_ids, to be used in the later filtering stage.
590
    
591
    :param  branch: The branch containing the revisions. 
3936.3.4 by Ian Clatworthy
fix empty_branch log
592
    :param revision_limits: a tuple as returned by _get_revision_limits()
593
594
    :return: A (mainline_revs, rev_nos) tuple.
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
595
    """
596
    (br_revno, br_rev_id, start_revno, start_rev_id, end_revno, end_rev_id) = \
3936.3.4 by Ian Clatworthy
fix empty_branch log
597
        revision_limits
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
598
    cur_revno = br_revno
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
599
    rev_nos = {}
600
    mainline_revs = []
601
    for revision_id in branch.repository.iter_reverse_revision_history(
3936.3.3 by Ian Clatworthy
add --strict and more refactoring
602
                        br_rev_id):
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
603
        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.
604
            # 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()'
605
            rev_nos[revision_id] = cur_revno
606
            mainline_revs.append(revision_id)
607
            break
608
        if cur_revno <= end_revno:
609
            rev_nos[revision_id] = cur_revno
610
            mainline_revs.append(revision_id)
611
        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.
612
    else:
613
        # We walked off the edge of all revisions, so we add a 'None' marker
614
        mainline_revs.append(None)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
615
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
616
    mainline_revs.reverse()
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
617
618
    # override the mainline to look like the revision history.
3936.3.4 by Ian Clatworthy
fix empty_branch log
619
    return mainline_revs, rev_nos
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
620
621
622
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
623
    """Filter view_revisions based on revision ranges.
624
625
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth) 
626
            tuples to be filtered.
627
628
    :param start_rev_id: If not NONE specifies the first revision to be logged.
629
            If NONE then all revisions up to the end_rev_id are logged.
630
631
    :param end_rev_id: If not NONE specifies the last revision to be logged.
632
            If NONE then all revisions up to the end of the log are logged.
633
634
    :return: The filtered view_revisions.
635
    """
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
636
    if start_rev_id or end_rev_id:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
637
        revision_ids = [r for r, n, d in view_revisions]
638
        if start_rev_id:
639
            start_index = revision_ids.index(start_rev_id)
640
        else:
641
            start_index = 0
642
        if start_rev_id == end_rev_id:
643
            end_index = start_index
644
        else:
645
            if end_rev_id:
646
                end_index = revision_ids.index(end_rev_id)
647
            else:
648
                end_index = len(view_revisions) - 1
649
        # To include the revisions merged into the last revision, 
650
        # extend end_rev_id down to, but not including, the next rev
651
        # with the same or lesser merge_depth
652
        end_merge_depth = view_revisions[end_index][2]
653
        try:
654
            for index in xrange(end_index+1, len(view_revisions)+1):
655
                if view_revisions[index][2] <= end_merge_depth:
656
                    end_index = index - 1
657
                    break
658
        except IndexError:
659
            # if the search falls off the end then log to the end as well
660
            end_index = len(view_revisions) - 1
661
        view_revisions = view_revisions[start_index:end_index+1]
662
    return view_revisions
663
664
3940.1.3 by Ian Clatworthy
fix code
665
def _filter_revisions_touching_file_id(branch, file_id, view_revisions,
666
    include_merges=True):
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
667
    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.
668
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
669
    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.
670
    This includes the revisions which directly change the file id,
671
    and the revisions which merge these changes. So if the
672
    revision graph is::
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
673
        A-.
674
        |\ \
675
        B C E
676
        |/ /
677
        D |
678
        |\|
679
        | F
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
680
        |/
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
681
        G
682
683
    And 'C' changes a file, then both C and D will be returned. F will not be
684
    returned even though it brings the changes to C into the branch starting
685
    with E. (Note that if we were using F as the tip instead of G, then we
686
    would see C, D, F.)
687
688
    This will also be restricted based on a subset of the mainline.
689
690
    :param branch: The branch where we can get text revision information.
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
691
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
692
    :param file_id: Filter out revisions that do not touch file_id.
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
693
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
694
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth)
695
        tuples. This is the list of revisions which will be filtered. It is
3842.2.5 by Vincent Ladeuil
Better fix for bug #300055.
696
        assumed that view_revisions is in merge_sort order (i.e. newest
697
        revision first ).
698
3940.1.3 by Ian Clatworthy
fix code
699
    :param include_merges: include merge revisions in the result or not
700
2359.1.8 by John Arbash Meinel
doc
701
    :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.
702
    """
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
703
    # Lookup all possible text keys to determine which ones actually modified
704
    # the file.
705
    text_keys = [(file_id, rev_id) for rev_id, revno, depth in view_revisions]
3711.3.16 by John Arbash Meinel
Doc update.
706
    # Looking up keys in batches of 1000 can cut the time in half, as well as
707
    # memory consumption. GraphIndex *does* like to look for a few keys in
708
    # 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.
709
    # TODO: This code needs to be re-evaluated periodically as we tune the
710
    #       indexing layer. We might consider passing in hints as to the known
711
    #       access pattern (sparse/clustered, high success rate/low success
712
    #       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.
713
    get_parent_map = branch.repository.texts.get_parent_map
714
    modified_text_revisions = set()
715
    chunk_size = 1000
716
    for start in xrange(0, len(text_keys), chunk_size):
717
        next_keys = text_keys[start:start + chunk_size]
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
718
        # 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.
719
        modified_text_revisions.update(
720
            [k[1] for k in get_parent_map(next_keys)])
721
    del text_keys, next_keys
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
722
723
    result = []
724
    # Track what revisions will merge the current revision, replace entries
725
    # with 'None' when they have been added to result
726
    current_merge_stack = [None]
3711.3.23 by John Arbash Meinel
Documentation and cleanup.
727
    for info in view_revisions:
3711.3.14 by John Arbash Meinel
Change the per-file log algorithm dramatically.
728
        rev_id, revno, depth = info
729
        if depth == len(current_merge_stack):
730
            current_merge_stack.append(info)
731
        else:
732
            del current_merge_stack[depth + 1:]
733
            current_merge_stack[-1] = info
734
735
        if rev_id in modified_text_revisions:
736
            # This needs to be logged, along with the extra revisions
737
            for idx in xrange(len(current_merge_stack)):
738
                node = current_merge_stack[idx]
739
                if node is not None:
3940.1.3 by Ian Clatworthy
fix code
740
                    if include_merges or node[2] == 0:
741
                        result.append(node)
742
                        current_merge_stack[idx] = None
3711.3.4 by John Arbash Meinel
Significantly faster, but consuming more memory.
743
    return result
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
744
745
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
746
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
747
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
748
    """Produce an iterator of revisions to show
749
    :return: an iterator of (revision_id, revno, merge_depth)
750
    (if there is no revno for a revision, None is supplied)
751
    """
1756.2.22 by Aaron Bentley
Apply review comments
752
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
753
        revision_ids = mainline_revs[1:]
754
        if direction == 'reverse':
755
            revision_ids.reverse()
756
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
757
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
758
        return
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
759
    graph = branch.repository.get_graph()
760
    # This asks for all mainline revisions, which means we only have to spider
761
    # sideways, rather than depth history. That said, its still size-of-history
762
    # and should be addressed.
3373.5.4 by John Arbash Meinel
Track down another bogus location. Only triggered with --long
763
    # mainline_revisions always includes an extra revision at the beginning, so
764
    # don't request it.
3287.6.8 by Robert Collins
Reduce code duplication as per review.
765
    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
766
        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.
767
    # filter out ghosts; merge_sort errors on ghosts.
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
768
    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.
769
    merge_sorted_revisions = tsort.merge_sort(
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
770
        rev_graph,
1756.2.18 by Aaron Bentley
Factor out the revision list generation
771
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
772
        mainline_revs,
773
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
774
775
    if direction == 'forward':
776
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
777
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
778
    elif direction != 'reverse':
779
        raise ValueError('invalid direction %r' % direction)
780
3874.2.4 by Vincent Ladeuil
Fix too long lines.
781
    for (sequence, rev_id, merge_depth, revno, end_of_merge
782
         ) in merge_sorted_revisions:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
783
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
784
785
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
786
def reverse_by_depth(merge_sorted_revisions, _depth=0):
787
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
788
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
789
    Revisions with a different depth are sorted as a group with the previous
790
    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
791
    but it looks much nicer.
792
    """
3842.2.6 by Vincent Ladeuil
Fix typo.
793
    # 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.
794
    merge_sorted_revisions = [(None, None, _depth)] + merge_sorted_revisions
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
795
    zd_revisions = []
796
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
797
        if val[2] == _depth:
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
798
            # Each revision at the current depth becomes a chunk grouping all
799
            # higher depth revisions.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
800
            zd_revisions.append([val])
801
        else:
802
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
803
    for revisions in zd_revisions:
804
        if len(revisions) > 1:
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
805
            # 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.
806
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
807
    zd_revisions.reverse()
808
    result = []
809
    for chunk in zd_revisions:
810
        result.extend(chunk)
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
811
    if _depth == 0:
812
        # Top level call, get rid of the fake revisions that have been added
813
        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
814
    return result
815
816
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.
817
class LogRevision(object):
818
    """A revision to be logged (by LogFormatter.log_revision).
819
820
    A simple wrapper for the attributes of a revision to be logged.
821
    The attributes may or may not be populated, as determined by the 
822
    logging options and the log formatter capabilities.
823
    """
824
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
825
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
826
                 tags=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.
827
        self.rev = rev
828
        self.revno = revno
829
        self.merge_depth = merge_depth
830
        self.delta = delta
831
        self.tags = tags
832
833
794 by Martin Pool
- Merge John's nice short-log format.
834
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.
835
    """Abstract class to display log messages.
836
837
    At a minimum, a derived class must implement the log_revision method.
838
839
    If the LogFormatter needs to be informed of the beginning or end of
840
    a log it should implement the begin_log and/or end_log hook methods.
841
842
    A LogFormatter should define the following supports_XXX flags 
843
    to indicate which LogRevision attributes it supports:
844
845
    - supports_delta must be True if this log formatter supports delta.
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
846
        Otherwise the delta attribute may not be populated.  The 'delta_format'
847
        attribute describes whether the 'short_status' format (1) or the long
3936.3.2 by Ian Clatworthy
minor cleanups
848
        one (2) should be used.
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
849
 
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.
850
    - supports_merge_revisions must be True if this log formatter supports 
3936.3.2 by Ian Clatworthy
minor cleanups
851
        merge revisions.  If not, and if supports_single_merge_revision is
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
852
        also not True, then only mainline revisions will be passed to the 
853
        formatter.
854
    - supports_single_merge_revision must be True if this log formatter
855
        supports logging only a single merge revision.  This flag is
856
        only relevant if supports_merge_revisions is not 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.
857
    - supports_tags must be True if this log formatter supports tags.
858
        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
859
860
    Plugins can register functions to show custom revision properties using
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
861
    the properties_handler_registry. The registered function
3144.7.1 by Guillermo Gonzalez
* added show_properties to LonLogFormat and the hooks to register custom functions
862
    must respect the following interface description:
3144.7.2 by Guillermo Gonzalez
* cleanup a bit the interface
863
        def my_show_properties(properties_dict):
864
            # code that returns a dict {'name':'value'} of the properties 
865
            # 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.
866
    """
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
867
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
868
    def __init__(self, to_file, show_ids=False, show_timezone='original',
869
                 delta_format=None):
794 by Martin Pool
- Merge John's nice short-log format.
870
        self.to_file = to_file
871
        self.show_ids = show_ids
872
        self.show_timezone = show_timezone
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
873
        if delta_format is None:
874
            # Ensures backward compatibility
875
            delta_format = 2 # long format
876
        self.delta_format = delta_format
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
877
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.
878
# TODO: uncomment this block after show() has been removed.
879
# Until then defining log_revision would prevent _show_log calling show() 
880
# in legacy formatters.
881
#    def log_revision(self, revision):
882
#        """Log a revision.
883
#
884
#        :param  revision:   The LogRevision to be logged.
885
#        """
886
#        raise NotImplementedError('not implemented in abstract base')
887
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
888
    def short_committer(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
889
        name, address = config.parse_username(rev.committer)
890
        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.
891
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
892
        return address
2388.1.11 by Alexander Belchenko
changes after John's review
893
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.
894
    def short_author(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
895
        name, address = config.parse_username(rev.get_apparent_author())
896
        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.
897
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
898
        return address
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.
899
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
900
    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
901
        """Displays the custom properties returned by each registered handler.
902
        
3144.7.13 by Guillermo Gonzalez
* fixed typo LogFormatter.show_properties in docstring
903
        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
904
        """
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
905
        for key, handler in properties_handler_registry.iteritems():
906
            for key, value in handler(revision).items():
907
                self.to_file.write(indent + key + ': ' + value + '\n')
3144.7.8 by Guillermo Gonzalez
* added error handling (and logging) to LogFormatter.show_properties when a handler raise an error
908
2388.1.11 by Alexander Belchenko
changes after John's review
909
794 by Martin Pool
- Merge John's nice short-log format.
910
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
911
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.
912
    supports_merge_revisions = True
913
    supports_delta = True
914
    supports_tags = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
915
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.
916
    def log_revision(self, revision):
917
        """Log a revision, either merged or not."""
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
918
        indent = '    ' * revision.merge_depth
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
919
        to_file = self.to_file
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
920
        to_file.write(indent + '-' * 60 + '\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.
921
        if revision.revno is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
922
            to_file.write(indent + 'revno: %s\n' % (revision.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.
923
        if revision.tags:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
924
            to_file.write(indent + 'tags: %s\n' % (', '.join(revision.tags)))
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
925
        if self.show_ids:
3257.2.1 by Adeodato Simó
Add a space after "revision-id:" in log output.
926
            to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
927
            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.
928
            for parent_id in revision.rev.parent_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
929
                to_file.write(indent + 'parent: %s\n' % (parent_id,))
3144.7.11 by Guillermo Gonzalez
* updates LongLogFormatter to pass revision instead of the properties dict to show_properties method
930
        self.show_properties(revision.rev, indent)
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.
931
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
932
        author = revision.rev.properties.get('author', None)
933
        if author is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
934
            to_file.write(indent + 'author: %s\n' % (author,))
935
        to_file.write(indent + 'committer: %s\n' % (revision.rev.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.
936
937
        branch_nick = revision.rev.properties.get('branch-nick', None)
938
        if branch_nick is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
939
            to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))
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.
940
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.
941
        date_str = format_date(revision.rev.timestamp,
942
                               revision.rev.timezone or 0,
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
943
                               self.show_timezone)
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
944
        to_file.write(indent + 'timestamp: %s\n' % (date_str,))
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
945
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
946
        to_file.write(indent + 'message:\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.
947
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
948
            to_file.write(indent + '  (no message)\n')
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
949
        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.
950
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
951
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
952
                to_file.write(indent + '  %s\n' % (l,))
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.
953
        if revision.delta is not None:
3874.1.7 by Vincent Ladeuil
Restrict '-v' change to log --short only.
954
            # We don't respect delta_format for compatibility
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
955
            revision.delta.show(to_file, self.show_ids, indent=indent,
3874.1.7 by Vincent Ladeuil
Restrict '-v' change to log --short only.
956
                                short_status=False)
794 by Martin Pool
- Merge John's nice short-log format.
957
958
959
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.
960
961
    supports_delta = True
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
962
    supports_single_merge_revision = 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.
963
964
    def log_revision(self, revision):
794 by Martin Pool
- Merge John's nice short-log format.
965
        to_file = self.to_file
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
966
        is_merge = ''
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
967
        if len(revision.rev.parent_ids) > 1:
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
968
            is_merge = ' [merge]'
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
969
        to_file.write("%5s %s\t%s%s\n" % (revision.revno,
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.
970
                self.short_author(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
971
                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.
972
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
973
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
974
                            show_offset=False),
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
975
                is_merge))
794 by Martin Pool
- Merge John's nice short-log format.
976
        if self.show_ids:
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
977
            to_file.write('      revision-id:%s\n'
978
                          % (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.
979
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
980
            to_file.write('      (no message)\n')
794 by Martin Pool
- Merge John's nice short-log format.
981
        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.
982
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
983
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
984
                to_file.write('      %s\n' % (l,))
794 by Martin Pool
- Merge John's nice short-log format.
985
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.
986
        if revision.delta is not None:
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
987
            revision.delta.show(to_file, self.show_ids,
988
                                short_status=self.delta_format==1)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
989
        to_file.write('\n')
794 by Martin Pool
- Merge John's nice short-log format.
990
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
991
1185.12.25 by Aaron Bentley
Added one-line log format
992
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.
993
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
994
    supports_single_merge_revision = True
995
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.
996
    def __init__(self, *args, **kwargs):
997
        super(LineLogFormatter, self).__init__(*args, **kwargs)
998
        self._max_chars = terminal_width() - 1
999
1185.12.25 by Aaron Bentley
Added one-line log format
1000
    def truncate(self, str, max_len):
1001
        if len(str) <= max_len:
1002
            return str
1003
        return str[:max_len-3]+'...'
1004
1005
    def date_string(self, rev):
3842.2.4 by Vincent Ladeuil
Superficial fix for bug #300055.
1006
        return format_date(rev.timestamp, rev.timezone or 0,
1185.12.25 by Aaron Bentley
Added one-line log format
1007
                           self.show_timezone, date_fmt="%Y-%m-%d",
1008
                           show_offset=False)
1009
1010
    def message(self, rev):
1011
        if not rev.message:
1012
            return '(no message)'
1013
        else:
1014
            return rev.message
1015
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.
1016
    def log_revision(self, revision):
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
1017
        self.to_file.write(self.log_string(revision.revno, revision.rev,
1018
                                              self._max_chars))
1019
        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.
1020
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1021
    def log_string(self, revno, rev, max_chars):
1022
        """Format log info into one string. Truncate tail of string
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
1023
        :param  revno:      revision number or None.
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1024
                            Revision numbers counts from 1.
1025
        :param  rev:        revision info object
1026
        :param  max_chars:  maximum length of resulting string
1027
        :return:            formatted truncated string
1028
        """
1029
        out = []
1030
        if revno:
1031
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
1032
            out.append("%s:" % revno)
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.
1033
        out.append(self.truncate(self.short_author(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
1034
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
1035
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
1036
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
1037
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1038
1185.12.27 by Aaron Bentley
Use line log for pending merges
1039
def line_log(rev, max_chars):
1040
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
1041
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
1042
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1043
1044
class LogFormatterRegistry(registry.Registry):
1045
    """Registry for log formatters"""
1046
1047
    def make_formatter(self, name, *args, **kwargs):
1048
        """Construct a formatter from arguments.
1049
1050
        :param name: Name of the formatter to construct.  'short', 'long' and
1051
            'line' are built-in.
1052
        """
1053
        return self.get(name)(*args, **kwargs)
1054
1055
    def get_default(self, branch):
1056
        return self.get(branch.get_config().log_format())
1057
1058
1059
log_formatter_registry = LogFormatterRegistry()
1060
1061
1062
log_formatter_registry.register('short', ShortLogFormatter,
1063
                                'Moderately short log format')
1064
log_formatter_registry.register('long', LongLogFormatter,
1065
                                'Detailed log format')
1066
log_formatter_registry.register('line', LineLogFormatter,
1067
                                'Log format with one line per revision')
1068
794 by Martin Pool
- Merge John's nice short-log format.
1069
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1070
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1071
    log_formatter_registry.register(name, formatter)
1072
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1073
794 by Martin Pool
- Merge John's nice short-log format.
1074
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
1075
    """Construct a formatter from arguments.
1076
1185.12.27 by Aaron Bentley
Use line log for pending merges
1077
    name -- Name of the formatter to construct; currently 'long', 'short' and
1078
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
1079
    """
794 by Martin Pool
- Merge John's nice short-log format.
1080
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1081
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
1082
    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.
1083
        raise errors.BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1084
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1085
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1086
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1087
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1088
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
1089
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1090
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
1091
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
1092
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
1093
                           log_format='long'):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1094
    """Show the change in revision history comparing the old revision history to the new one.
1095
1096
    :param branch: The branch where the revisions exist
1097
    :param old_rh: The old revision history
1098
    :param new_rh: The new revision history
1099
    :param to_file: A file to write the results to. If None, stdout will be used
1100
    """
1101
    if to_file is None:
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
1102
        to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
1103
            errors='replace')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1104
    lf = log_formatter(log_format,
1105
                       show_ids=False,
1106
                       to_file=to_file,
1107
                       show_timezone='original')
1108
1109
    # This is the first index which is different between
1110
    # old and new
1111
    base_idx = None
1112
    for i in xrange(max(len(new_rh),
1113
                        len(old_rh))):
1114
        if (len(new_rh) <= i
1115
            or len(old_rh) <= i
1116
            or new_rh[i] != old_rh[i]):
1117
            base_idx = i
1118
            break
1119
1120
    if base_idx is None:
1121
        to_file.write('Nothing seems to have changed\n')
1122
        return
1123
    ## TODO: It might be nice to do something like show_log
1124
    ##       and show the merged entries. But since this is the
1125
    ##       removed revisions, it shouldn't be as important
1126
    if base_idx < len(old_rh):
1127
        to_file.write('*'*60)
1128
        to_file.write('\nRemoved Revisions:\n')
1129
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1130
            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
1131
            lr = LogRevision(rev, i+1, 0, None)
1132
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1133
        to_file.write('*'*60)
1134
        to_file.write('\n\n')
1135
    if base_idx < len(new_rh):
1136
        to_file.write('Added Revisions:\n')
1137
        show_log(branch,
1138
                 lf,
1139
                 None,
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
1140
                 verbose=False,
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
1141
                 direction='forward',
1142
                 start_revision=base_idx+1,
1143
                 end_revision=len(new_rh),
1144
                 search=None)
1145
3144.7.4 by Guillermo Gonzalez
* move the function regisstry into a real Registry instead of a list
1146
3848.1.7 by Aaron Bentley
Use repository in get_history_change
1147
def get_history_change(old_revision_id, new_revision_id, repository):
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1148
    """Calculate the uncommon lefthand history between two revisions.
1149
1150
    :param old_revision_id: The original revision id.
1151
    :param new_revision_id: The new revision id.
3848.1.22 by Aaron Bentley
Fix spelling
1152
    :param repository: The repository to use for the calculation.
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1153
1154
    return old_history, new_history
1155
    """
3848.1.6 by Aaron Bentley
Implement get_history_change
1156
    old_history = []
1157
    old_revisions = set()
1158
    new_history = []
1159
    new_revisions = set()
3848.1.7 by Aaron Bentley
Use repository in get_history_change
1160
    new_iter = repository.iter_reverse_revision_history(new_revision_id)
1161
    old_iter = repository.iter_reverse_revision_history(old_revision_id)
3848.1.6 by Aaron Bentley
Implement get_history_change
1162
    stop_revision = None
1163
    do_old = True
1164
    do_new = True
1165
    while do_new or do_old:
1166
        if do_new:
1167
            try:
1168
                new_revision = new_iter.next()
1169
            except StopIteration:
1170
                do_new = False
1171
            else:
1172
                new_history.append(new_revision)
1173
                new_revisions.add(new_revision)
1174
                if new_revision in old_revisions:
1175
                    stop_revision = new_revision
1176
                    break
1177
        if do_old:
1178
            try:
1179
                old_revision = old_iter.next()
1180
            except StopIteration:
1181
                do_old = False
1182
            else:
1183
                old_history.append(old_revision)
1184
                old_revisions.add(old_revision)
1185
                if old_revision in new_revisions:
1186
                    stop_revision = old_revision
1187
                    break
1188
    new_history.reverse()
1189
    old_history.reverse()
1190
    if stop_revision is not None:
1191
        new_history = new_history[new_history.index(stop_revision) + 1:]
1192
        old_history = old_history[old_history.index(stop_revision) + 1:]
1193
    return old_history, new_history
1194
1195
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1196
def show_branch_change(branch, output, old_revno, old_revision_id):
1197
    """Show the changes made to a branch.
1198
1199
    :param branch: The branch to show changes about.
1200
    :param output: A file-like object to write changes to.
1201
    :param old_revno: The revno of the old tip.
1202
    :param old_revision_id: The revision_id of the old tip.
1203
    """
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1204
    new_revno, new_revision_id = branch.last_revision_info()
1205
    old_history, new_history = get_history_change(old_revision_id,
1206
                                                  new_revision_id,
1207
                                                  branch.repository)
1208
    if old_history == [] and new_history == []:
1209
        output.write('Nothing seems to have changed\n')
1210
        return
1211
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
1212
    log_format = log_formatter_registry.get_default(branch)
1213
    lf = log_format(show_ids=False, to_file=output, show_timezone='original')
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1214
    if old_history != []:
1215
        output.write('*'*60)
1216
        output.write('\nRemoved Revisions:\n')
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
1217
        show_flat_log(branch.repository, old_history, old_revno, lf)
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1218
        output.write('*'*60)
1219
        output.write('\n\n')
1220
    if new_history != []:
3848.1.9 by Aaron Bentley
new/old sections are omitted as appropriate.
1221
        output.write('Added Revisions:\n')
3848.1.8 by Aaron Bentley
Implement basic show_branch_change
1222
        start_revno = new_revno - len(new_history) + 1
1223
        show_log(branch, lf, None, verbose=False, direction='forward',
1224
                 start_revision=start_revno,)
1225
1226
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
1227
def show_flat_log(repository, history, last_revno, lf):
3848.1.11 by Aaron Bentley
Cleanup and use of show_branch_change
1228
    """Show a simple log of the specified history.
1229
1230
    :param repository: The repository to retrieve revisions from.
1231
    :param history: A list of revision_ids indicating the lefthand history.
1232
    :param last_revno: The revno of the last revision_id in the history.
1233
    :param lf: The log formatter to use.
1234
    """
3848.1.10 by Aaron Bentley
Move log display into show_flat_log
1235
    start_revno = last_revno - len(history) + 1
1236
    revisions = repository.get_revisions(history)
1237
    for i, rev in enumerate(revisions):
1238
        lr = LogRevision(rev, i + last_revno, 0, None)
1239
        lf.log_revision(lr)
1240
1241
3144.7.9 by Guillermo Gonzalez
* bzrlib.log.show_roperties don't hide handler errors
1242
properties_handler_registry = registry.Registry()
3830.4.1 by Jelmer Vernooij
Add base classes for foreign branches.
1243
properties_handler_registry.register_lazy("foreign",
1244
                                          "bzrlib.foreign",
1245
                                          "show_foreign_properties")
1246
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1247
1248
# adapters which revision ids to log are filtered. When log is called, the
1249
# log_rev_iterator is adapted through each of these factory methods.
1250
# Plugins are welcome to mutate this list in any way they like - as long
1251
# as the overall behaviour is preserved. At this point there is no extensible
1252
# mechanism for getting parameters to each factory method, and until there is
1253
# this won't be considered a stable api.
1254
log_adapters = [
1255
    # core log logic
3642.1.7 by Robert Collins
Review feedback.
1256
    _make_batch_filter,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1257
    # read revision objects
3642.1.7 by Robert Collins
Review feedback.
1258
    _make_revision_objects,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1259
    # filter on log messages
3642.1.7 by Robert Collins
Review feedback.
1260
    _make_search_filter,
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1261
    # generate deltas for things we will show
3642.1.7 by Robert Collins
Review feedback.
1262
    _make_delta_filter
3642.1.6 by Robert Collins
Make log revision filtering pluggable.
1263
    ]