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