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