/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(), """
64
from bzrlib import (
65
    errors,
66
    revision,
67
    revisionspec,
68
    tsort,
69
    )
70
""")
71
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
72
from bzrlib import (
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
73
    config,
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
74
    registry,
2997.1.2 by Kent Gibson
Move all imports to top of log.py
75
    )
76
from bzrlib.osutils import (
77
    format_date,
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
78
    get_terminal_encoding,
2997.1.2 by Kent Gibson
Move all imports to top of log.py
79
    terminal_width,
80
    )
3287.6.8 by Robert Collins
Reduce code duplication as per review.
81
from bzrlib.repository import _strip_NULL_ghosts
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
82
from bzrlib.trace import mutter
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
83
375 by Martin Pool
- New command touching-revisions and function to trace
84
85
def find_touching_revisions(branch, file_id):
86
    """Yield a description of revisions which affect the file_id.
87
88
    Each returned element is (revno, revision_id, description)
89
90
    This is the list of revisions where the file is either added,
91
    modified, renamed or deleted.
92
93
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
94
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
95
    """
96
    last_ie = None
97
    last_path = None
98
    revno = 1
99
    for revision_id in branch.revision_history():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
100
        this_inv = branch.repository.get_revision_inventory(revision_id)
375 by Martin Pool
- New command touching-revisions and function to trace
101
        if file_id in this_inv:
102
            this_ie = this_inv[file_id]
103
            this_path = this_inv.id2path(file_id)
104
        else:
105
            this_ie = this_path = None
106
107
        # now we know how it was last time, and how it is in this revision.
108
        # are those two states effectively the same or not?
109
110
        if not this_ie and not last_ie:
111
            # not present in either
112
            pass
113
        elif this_ie and not last_ie:
114
            yield revno, revision_id, "added " + this_path
115
        elif not this_ie and last_ie:
116
            # deleted here
117
            yield revno, revision_id, "deleted " + last_path
118
        elif this_path != last_path:
119
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
120
        elif (this_ie.text_size != last_ie.text_size
121
              or this_ie.text_sha1 != last_ie.text_sha1):
122
            yield revno, revision_id, "modified " + this_path
123
124
        last_ie = this_ie
125
        last_path = this_path
126
        revno += 1
127
128
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
129
def _enumerate_history(branch):
130
    rh = []
131
    revno = 1
132
    for rev_id in branch.revision_history():
133
        rh.append((revno, rev_id))
134
        revno += 1
135
    return rh
136
137
378 by Martin Pool
- New usage bzr log FILENAME
138
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
139
             lf,
527 by Martin Pool
- refactor log command
140
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
141
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
142
             direction='reverse',
143
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
144
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
145
             search=None,
146
             limit=None):
369 by Martin Pool
- Split out log printing into new show_log function
147
    """Write out human-readable log of commits to this branch.
148
794 by Martin Pool
- Merge John's nice short-log format.
149
    lf
150
        LogFormatter object to show the output.
151
527 by Martin Pool
- refactor log command
152
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
153
        If true, list only the commits affecting the specified
154
        file, rather than all commits.
155
369 by Martin Pool
- Split out log printing into new show_log function
156
    verbose
157
        If true show added/changed/deleted/renamed files.
158
527 by Martin Pool
- refactor log command
159
    direction
160
        'reverse' (default) is latest to earliest;
161
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
162
163
    start_revision
164
        If not None, only show revisions >= start_revision
165
166
    end_revision
167
        If not None, only show revisions <= end_revision
2466.9.1 by Kent Gibson
add bzr log --limit
168
169
    search
170
        If not None, only show revisions with matching commit messages
171
172
    limit
173
        If not None or 0, only show limit revisions
369 by Martin Pool
- Split out log printing into new show_log function
174
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
175
    branch.lock_read()
176
    try:
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
177
        if getattr(lf, 'begin_log', None):
178
            lf.begin_log()
179
1756.1.6 by Aaron Bentley
Revert locking fix
180
        _show_log(branch, lf, specific_fileid, verbose, direction,
2466.9.1 by Kent Gibson
add bzr log --limit
181
                  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.
182
183
        if getattr(lf, 'end_log', None):
184
            lf.end_log()
1417.1.7 by Robert Collins
teach log it needs a read lock
185
    finally:
186
        branch.unlock()
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
187
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
188
1417.1.7 by Robert Collins
teach log it needs a read lock
189
def _show_log(branch,
190
             lf,
191
             specific_fileid=None,
192
             verbose=False,
193
             direction='reverse',
194
             start_revision=None,
195
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
196
             search=None,
197
             limit=None):
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
202
    if specific_fileid:
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
203
        mutter('get log for file_id %r', specific_fileid)
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
204
    generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)
205
    allow_single_merge_revision = getattr(lf,
206
        'supports_single_merge_revision', False)
207
    view_revisions = calculate_view_revisions(branch, start_revision,
208
                                              end_revision, direction,
209
                                              specific_fileid,
210
                                              generate_merge_revisions,
211
                                              allow_single_merge_revision)
900 by Martin Pool
- patch from john to search for matching commits
212
    if search is not None:
213
        searchRE = re.compile(search, re.IGNORECASE)
214
    else:
215
        searchRE = None
216
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
217
    rev_tag_dict = {}
218
    generate_tags = getattr(lf, 'supports_tags', False)
219
    if generate_tags:
220
        if branch.supports_tags():
221
            rev_tag_dict = branch.tags.get_reverse_tag_dict()
222
223
    generate_delta = verbose and getattr(lf, 'supports_delta', False)
224
225
    # now we just print all the revisions
226
    log_count = 0
227
    for (rev_id, revno, merge_depth), rev, delta in _iter_revisions(
228
        branch.repository, view_revisions, generate_delta):
229
        if searchRE:
230
            if not searchRE.search(rev.message):
231
                continue
232
233
        lr = LogRevision(rev, revno, merge_depth, delta,
234
                         rev_tag_dict.get(rev_id))
235
        lf.log_revision(lr)
236
        if limit:
237
            log_count += 1
238
            if log_count >= limit:
239
                break
240
241
242
def calculate_view_revisions(branch, start_revision, end_revision, direction,
243
                             specific_fileid, generate_merge_revisions,
244
                             allow_single_merge_revision):
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
245
    if (not generate_merge_revisions and start_revision is end_revision is
246
        None and direction == 'reverse' and specific_fileid is None):
247
        return _linear_view_revisions(branch)
248
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
249
    mainline_revs, rev_nos, start_rev_id, end_rev_id = \
250
        _get_mainline_revs(branch, start_revision, end_revision)
251
    if not mainline_revs:
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
252
        return []
1756.2.18 by Aaron Bentley
Factor out the revision list generation
253
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
254
    if direction == 'reverse':
255
        start_rev_id, end_rev_id = end_rev_id, start_rev_id
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
256
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
257
    generate_single_revision = False
2985.1.1 by Aaron Bentley
Better behavior when user requests a log that cannot be viewed (Kent Gibson)
258
    if ((not generate_merge_revisions)
2978.3.2 by Kent Gibson
Use in rather than has_key
259
        and ((start_rev_id and (start_rev_id not in rev_nos))
260
            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.
261
        generate_single_revision = ((start_rev_id == end_rev_id)
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
262
            and allow_single_merge_revision)
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
263
        if not generate_single_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.
264
            raise errors.BzrCommandError('Selected log formatter only supports '
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
265
                'mainline revisions.')
266
        generate_merge_revisions = generate_single_revision
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
267
    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.
268
                          direction, include_merges=generate_merge_revisions)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
269
    view_revisions = _filter_revision_range(list(view_revs_iter),
270
                                            start_rev_id,
271
                                            end_rev_id)
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
272
    if view_revisions and generate_single_revision:
273
        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.
274
    if specific_fileid:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
275
        view_revisions = _filter_revisions_touching_file_id(branch,
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
276
                                                         specific_fileid,
277
                                                         mainline_revs,
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
278
                                                         view_revisions)
2388.1.11 by Alexander Belchenko
changes after John's review
279
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
280
    # rebase merge_depth - unless there are no revisions or 
281
    # either the first or last revision have merge_depth = 0.
282
    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
283
        min_depth = min([d for r,n,d in view_revisions])
284
        if min_depth != 0:
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
285
            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
286
    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.
287
530 by Martin Pool
- put back verbose log support for reversed logs
288
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
289
def _linear_view_revisions(branch):
290
    start_revno, start_revision_id = branch.last_revision_info()
291
    repo = branch.repository
292
    revision_ids = repo.iter_reverse_revision_history(start_revision_id)
293
    for num, revision_id in enumerate(revision_ids):
3302.1.4 by Aaron Bentley
Return revno as a string
294
        yield revision_id, str(start_revno - num), 0
3302.1.3 by Aaron Bentley
Add optimization of the simple case of generating view revisions
295
296
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
297
def _iter_revisions(repository, view_revisions, generate_delta):
298
    num = 9
299
    view_revisions = iter(view_revisions)
300
    while True:
301
        cur_view_revisions = [d for x, d in zip(range(num), view_revisions)]
302
        if len(cur_view_revisions) == 0:
303
            break
304
        cur_deltas = {}
305
        # r = revision, n = revno, d = merge depth
306
        revision_ids = [r for (r, n, d) in cur_view_revisions]
307
        revisions = repository.get_revisions(revision_ids)
308
        if generate_delta:
309
            deltas = repository.get_deltas_for_revisions(revisions)
310
            cur_deltas = dict(izip((r.revision_id for r in revisions),
311
                                   deltas))
312
        for view_data, revision in izip(cur_view_revisions, revisions):
313
            yield view_data, revision, cur_deltas.get(revision.revision_id)
314
        num = min(int(num * 1.5), 200)
315
316
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
317
def _get_mainline_revs(branch, start_revision, end_revision):
318
    """Get the mainline revisions from the branch.
319
    
320
    Generates the list of mainline revisions for the branch.
321
    
322
    :param  branch: The branch containing the revisions. 
323
324
    :param  start_revision: The first revision to be logged.
325
            For backwards compatibility this may be a mainline integer revno,
326
            but for merge revision support a RevisionInfo is expected.
327
328
    :param  end_revision: The last revision to be logged.
329
            For backwards compatibility this may be a mainline integer revno,
330
            but for merge revision support a RevisionInfo is expected.
331
332
    :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
333
    """
334
    which_revs = _enumerate_history(branch)
335
    if not which_revs:
336
        return None, None, None, None
337
338
    # For mainline generation, map start_revision and end_revision to 
339
    # mainline revnos. If the revision is not on the mainline choose the 
340
    # appropriate extreme of the mainline instead - the extra will be 
341
    # filtered later.
342
    # Also map the revisions to rev_ids, to be used in the later filtering
343
    # stage.
344
    start_rev_id = None 
345
    if start_revision is None:
346
        start_revno = 1
347
    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.
348
        if isinstance(start_revision, revisionspec.RevisionInfo):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
349
            start_rev_id = start_revision.rev_id
350
            start_revno = start_revision.revno or 1
351
        else:
352
            branch.check_real_revno(start_revision)
353
            start_revno = start_revision
354
    
355
    end_rev_id = None
356
    if end_revision is None:
357
        end_revno = len(which_revs)
358
    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.
359
        if isinstance(end_revision, revisionspec.RevisionInfo):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
360
            end_rev_id = end_revision.rev_id
361
            end_revno = end_revision.revno or len(which_revs)
362
        else:
363
            branch.check_real_revno(end_revision)
364
            end_revno = end_revision
365
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.
366
    if ((start_rev_id == revision.NULL_REVISION)
367
        or (end_rev_id == revision.NULL_REVISION)):
368
        raise errors.BzrCommandError('Logging revision 0 is invalid.')
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
369
    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.
370
        raise errors.BzrCommandError("Start revision must be older than "
371
                                     "the end revision.")
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
372
373
    # list indexes are 0-based; revisions are 1-based
374
    cut_revs = which_revs[(start_revno-1):(end_revno)]
375
    if not cut_revs:
376
        return None, None, None, None
377
378
    # convert the revision history to a dictionary:
379
    rev_nos = dict((k, v) for v, k in cut_revs)
380
381
    # override the mainline to look like the revision history.
382
    mainline_revs = [revision_id for index, revision_id in cut_revs]
383
    if cut_revs[0][0] == 1:
384
        mainline_revs.insert(0, None)
385
    else:
386
        mainline_revs.insert(0, which_revs[start_revno-2][1])
387
    return mainline_revs, rev_nos, start_rev_id, end_rev_id
388
389
390
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
391
    """Filter view_revisions based on revision ranges.
392
393
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth) 
394
            tuples to be filtered.
395
396
    :param start_rev_id: If not NONE specifies the first revision to be logged.
397
            If NONE then all revisions up to the end_rev_id are logged.
398
399
    :param end_rev_id: If not NONE specifies the last revision to be logged.
400
            If NONE then all revisions up to the end of the log are logged.
401
402
    :return: The filtered view_revisions.
403
    """
404
    if start_rev_id or end_rev_id: 
405
        revision_ids = [r for r, n, d in view_revisions]
406
        if start_rev_id:
407
            start_index = revision_ids.index(start_rev_id)
408
        else:
409
            start_index = 0
410
        if start_rev_id == end_rev_id:
411
            end_index = start_index
412
        else:
413
            if end_rev_id:
414
                end_index = revision_ids.index(end_rev_id)
415
            else:
416
                end_index = len(view_revisions) - 1
417
        # To include the revisions merged into the last revision, 
418
        # extend end_rev_id down to, but not including, the next rev
419
        # with the same or lesser merge_depth
420
        end_merge_depth = view_revisions[end_index][2]
421
        try:
422
            for index in xrange(end_index+1, len(view_revisions)+1):
423
                if view_revisions[index][2] <= end_merge_depth:
424
                    end_index = index - 1
425
                    break
426
        except IndexError:
427
            # if the search falls off the end then log to the end as well
428
            end_index = len(view_revisions) - 1
429
        view_revisions = view_revisions[start_index:end_index+1]
430
    return view_revisions
431
432
433
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
434
                                       view_revs_iter):
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
435
    """Return the list of revision ids which touch a given file id.
436
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
437
    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.
438
    This includes the revisions which directly change the file id,
439
    and the revisions which merge these changes. So if the
440
    revision graph is::
441
        A
442
        |\
443
        B C
444
        |/
445
        D
446
447
    And 'C' changes a file, then both C and D will be returned.
448
449
    This will also can be restricted based on a subset of the mainline.
2359.1.8 by John Arbash Meinel
doc
450
451
    :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.
452
    """
453
    # find all the revisions that change the specific file
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
454
    file_weave = branch.repository.weave_store.get_weave(file_id,
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
455
                branch.repository.get_transaction())
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
456
    weave_modifed_revisions = set(file_weave.versions())
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
457
    # build the ancestry of each revision in the graph
458
    # - only listing the ancestors that change the specific file.
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
459
    graph = branch.repository.get_graph()
460
    # This asks for all mainline revisions, which means we only have to spider
461
    # sideways, rather than depth history. That said, its still size-of-history
462
    # and should be addressed.
3287.6.8 by Robert Collins
Reduce code duplication as per review.
463
    parent_map = dict(((key, value) for key, value in
464
        graph.iter_ancestry(mainline_revisions) if value is not None))
3224.5.13 by Andrew Bennetts
Merge from bzr.dev.
465
    sorted_rev_list = tsort.topo_sort(parent_map.items())
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
466
    ancestry = {}
467
    for rev in sorted_rev_list:
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
468
        parents = parent_map[rev]
2359.1.9 by John Arbash Meinel
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
469
        if rev not in weave_modifed_revisions and len(parents) == 1:
470
            # We will not be adding anything new, so just use a reference to
471
            # the parent ancestry.
472
            rev_ancestry = ancestry[parents[0]]
473
        else:
474
            rev_ancestry = set()
475
            if rev in weave_modifed_revisions:
476
                rev_ancestry.add(rev)
477
            for parent in parents:
478
                rev_ancestry = rev_ancestry.union(ancestry[parent])
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
479
        ancestry[rev] = rev_ancestry
480
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
481
    def is_merging_rev(r):
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
482
        parents = parent_map[r]
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
483
        if len(parents) > 1:
484
            leftparent = parents[0]
485
            for rightparent in parents[1:]:
486
                if not ancestry[leftparent].issuperset(
487
                        ancestry[rightparent]):
488
                    return True
489
        return False
490
491
    # filter from the view the revisions that did not change or merge 
492
    # the specific file
493
    return [(r, n, d) for r, n, d in view_revs_iter
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
494
            if r in weave_modifed_revisions or is_merging_rev(r)]
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
495
496
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
497
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
498
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
499
    """Produce an iterator of revisions to show
500
    :return: an iterator of (revision_id, revno, merge_depth)
501
    (if there is no revno for a revision, None is supplied)
502
    """
1756.2.22 by Aaron Bentley
Apply review comments
503
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
504
        revision_ids = mainline_revs[1:]
505
        if direction == 'reverse':
506
            revision_ids.reverse()
507
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
508
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
509
        return
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
510
    graph = branch.repository.get_graph()
511
    # This asks for all mainline revisions, which means we only have to spider
512
    # sideways, rather than depth history. That said, its still size-of-history
513
    # and should be addressed.
3287.6.8 by Robert Collins
Reduce code duplication as per review.
514
    parent_map = dict(((key, value) for key, value in
515
        graph.iter_ancestry(mainline_revs) if value is not None))
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
516
    # filter out ghosts; merge_sort errors on ghosts.
3287.6.8 by Robert Collins
Reduce code duplication as per review.
517
    rev_graph = _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.
518
    merge_sorted_revisions = tsort.merge_sort(
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
519
        rev_graph,
1756.2.18 by Aaron Bentley
Factor out the revision list generation
520
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
521
        mainline_revs,
522
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
523
524
    if direction == 'forward':
525
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
526
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
527
    elif direction != 'reverse':
528
        raise ValueError('invalid direction %r' % direction)
529
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
530
    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
531
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
532
533
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
534
def reverse_by_depth(merge_sorted_revisions, _depth=0):
535
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
536
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
537
    Revisions with a different depth are sorted as a group with the previous
538
    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
539
    but it looks much nicer.
540
    """
541
    zd_revisions = []
542
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
543
        if val[2] == _depth:
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
544
            zd_revisions.append([val])
545
        else:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
546
            assert val[2] > _depth
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
547
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
548
    for revisions in zd_revisions:
549
        if len(revisions) > 1:
550
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
551
    zd_revisions.reverse()
552
    result = []
553
    for chunk in zd_revisions:
554
        result.extend(chunk)
555
    return result
556
557
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.
558
class LogRevision(object):
559
    """A revision to be logged (by LogFormatter.log_revision).
560
561
    A simple wrapper for the attributes of a revision to be logged.
562
    The attributes may or may not be populated, as determined by the 
563
    logging options and the log formatter capabilities.
564
    """
565
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
566
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
567
                 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.
568
        self.rev = rev
569
        self.revno = revno
570
        self.merge_depth = merge_depth
571
        self.delta = delta
572
        self.tags = tags
573
574
794 by Martin Pool
- Merge John's nice short-log format.
575
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.
576
    """Abstract class to display log messages.
577
578
    At a minimum, a derived class must implement the log_revision method.
579
580
    If the LogFormatter needs to be informed of the beginning or end of
581
    a log it should implement the begin_log and/or end_log hook methods.
582
583
    A LogFormatter should define the following supports_XXX flags 
584
    to indicate which LogRevision attributes it supports:
585
586
    - supports_delta must be True if this log formatter supports delta.
587
        Otherwise the delta attribute may not be populated.
588
    - 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.
589
        merge revisions.  If not, and if supports_single_merge_revisions is
590
        also not True, then only mainline revisions will be passed to the 
591
        formatter.
592
    - supports_single_merge_revision must be True if this log formatter
593
        supports logging only a single merge revision.  This flag is
594
        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.
595
    - supports_tags must be True if this log formatter supports tags.
596
        Otherwise the tags attribute may not be populated.
597
    """
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
598
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
599
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
600
        self.to_file = to_file
601
        self.show_ids = show_ids
602
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
603
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.
604
# TODO: uncomment this block after show() has been removed.
605
# Until then defining log_revision would prevent _show_log calling show() 
606
# in legacy formatters.
607
#    def log_revision(self, revision):
608
#        """Log a revision.
609
#
610
#        :param  revision:   The LogRevision to be logged.
611
#        """
612
#        raise NotImplementedError('not implemented in abstract base')
613
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
614
    def short_committer(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
615
        name, address = config.parse_username(rev.committer)
616
        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.
617
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
618
        return address
2388.1.11 by Alexander Belchenko
changes after John's review
619
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.
620
    def short_author(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
621
        name, address = config.parse_username(rev.get_apparent_author())
622
        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.
623
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
624
        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.
625
2388.1.11 by Alexander Belchenko
changes after John's review
626
794 by Martin Pool
- Merge John's nice short-log format.
627
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
628
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.
629
    supports_merge_revisions = True
630
    supports_delta = True
631
    supports_tags = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
632
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.
633
    def log_revision(self, revision):
634
        """Log a revision, either merged or not."""
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
635
        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.
636
        to_file = self.to_file
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
637
        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.
638
        if revision.revno is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
639
            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.
640
        if revision.tags:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
641
            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.
642
        if self.show_ids:
3257.2.1 by Adeodato Simó
Add a space after "revision-id:" in log output.
643
            to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
644
            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.
645
            for parent_id in revision.rev.parent_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
646
                to_file.write(indent + 'parent: %s\n' % (parent_id,))
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.
647
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
648
        author = revision.rev.properties.get('author', None)
649
        if author is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
650
            to_file.write(indent + 'author: %s\n' % (author,))
651
        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.
652
653
        branch_nick = revision.rev.properties.get('branch-nick', None)
654
        if branch_nick is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
655
            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.
656
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.
657
        date_str = format_date(revision.rev.timestamp,
658
                               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.
659
                               self.show_timezone)
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
660
        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.
661
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
662
        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.
663
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
664
            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.
665
        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.
666
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
667
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
668
                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.
669
        if revision.delta is not None:
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
670
            revision.delta.show(to_file, self.show_ids, indent=indent)
794 by Martin Pool
- Merge John's nice short-log format.
671
672
673
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.
674
675
    supports_delta = True
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
676
    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.
677
678
    def log_revision(self, revision):
794 by Martin Pool
- Merge John's nice short-log format.
679
        to_file = self.to_file
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
680
        date_str = 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.
681
                               revision.rev.timezone or 0,
682
                               self.show_timezone)
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
683
        is_merge = ''
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
684
        if len(revision.rev.parent_ids) > 1:
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
685
            is_merge = ' [merge]'
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
686
        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.
687
                self.short_author(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
688
                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.
689
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
690
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
691
                            show_offset=False),
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
692
                is_merge))
794 by Martin Pool
- Merge John's nice short-log format.
693
        if self.show_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
694
            to_file.write('      revision-id:%s\n' % (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.
695
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
696
            to_file.write('      (no message)\n')
794 by Martin Pool
- Merge John's nice short-log format.
697
        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.
698
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
699
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
700
                to_file.write('      %s\n' % (l,))
794 by Martin Pool
- Merge John's nice short-log format.
701
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
702
        # TODO: Why not show the modified files in a shorter form as
703
        # well? rewrap them single lines of appropriate length
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.
704
        if revision.delta is not None:
705
            revision.delta.show(to_file, self.show_ids)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
706
        to_file.write('\n')
794 by Martin Pool
- Merge John's nice short-log format.
707
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
708
1185.12.25 by Aaron Bentley
Added one-line log format
709
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.
710
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
711
    supports_single_merge_revision = True
712
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.
713
    def __init__(self, *args, **kwargs):
714
        super(LineLogFormatter, self).__init__(*args, **kwargs)
715
        self._max_chars = terminal_width() - 1
716
1185.12.25 by Aaron Bentley
Added one-line log format
717
    def truncate(self, str, max_len):
718
        if len(str) <= max_len:
719
            return str
720
        return str[:max_len-3]+'...'
721
722
    def date_string(self, rev):
723
        return format_date(rev.timestamp, rev.timezone or 0, 
724
                           self.show_timezone, date_fmt="%Y-%m-%d",
725
                           show_offset=False)
726
727
    def message(self, rev):
728
        if not rev.message:
729
            return '(no message)'
730
        else:
731
            return rev.message
732
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.
733
    def log_revision(self, revision):
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
734
        self.to_file.write(self.log_string(revision.revno, revision.rev,
735
                                              self._max_chars))
736
        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.
737
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
738
    def log_string(self, revno, rev, max_chars):
739
        """Format log info into one string. Truncate tail of string
740
        :param  revno:      revision number (int) or None.
741
                            Revision numbers counts from 1.
742
        :param  rev:        revision info object
743
        :param  max_chars:  maximum length of resulting string
744
        :return:            formatted truncated string
745
        """
746
        out = []
747
        if revno:
748
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
749
            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.
750
        out.append(self.truncate(self.short_author(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
751
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
752
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
753
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
754
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
755
1185.12.27 by Aaron Bentley
Use line log for pending merges
756
def line_log(rev, max_chars):
757
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
758
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
759
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
760
761
class LogFormatterRegistry(registry.Registry):
762
    """Registry for log formatters"""
763
764
    def make_formatter(self, name, *args, **kwargs):
765
        """Construct a formatter from arguments.
766
767
        :param name: Name of the formatter to construct.  'short', 'long' and
768
            'line' are built-in.
769
        """
770
        return self.get(name)(*args, **kwargs)
771
772
    def get_default(self, branch):
773
        return self.get(branch.get_config().log_format())
774
775
776
log_formatter_registry = LogFormatterRegistry()
777
778
779
log_formatter_registry.register('short', ShortLogFormatter,
780
                                'Moderately short log format')
781
log_formatter_registry.register('long', LongLogFormatter,
782
                                'Detailed log format')
783
log_formatter_registry.register('line', LineLogFormatter,
784
                                'Log format with one line per revision')
785
794 by Martin Pool
- Merge John's nice short-log format.
786
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
787
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
788
    log_formatter_registry.register(name, formatter)
789
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
790
794 by Martin Pool
- Merge John's nice short-log format.
791
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
792
    """Construct a formatter from arguments.
793
1185.12.27 by Aaron Bentley
Use line log for pending merges
794
    name -- Name of the formatter to construct; currently 'long', 'short' and
795
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
796
    """
794 by Martin Pool
- Merge John's nice short-log format.
797
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
798
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
799
    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.
800
        raise errors.BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
801
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
802
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
803
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
804
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
805
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
806
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
807
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
808
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
809
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
810
                           log_format='long'):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
811
    """Show the change in revision history comparing the old revision history to the new one.
812
813
    :param branch: The branch where the revisions exist
814
    :param old_rh: The old revision history
815
    :param new_rh: The new revision history
816
    :param to_file: A file to write the results to. If None, stdout will be used
817
    """
818
    if to_file is None:
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
819
        to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
820
            errors='replace')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
821
    lf = log_formatter(log_format,
822
                       show_ids=False,
823
                       to_file=to_file,
824
                       show_timezone='original')
825
826
    # This is the first index which is different between
827
    # old and new
828
    base_idx = None
829
    for i in xrange(max(len(new_rh),
830
                        len(old_rh))):
831
        if (len(new_rh) <= i
832
            or len(old_rh) <= i
833
            or new_rh[i] != old_rh[i]):
834
            base_idx = i
835
            break
836
837
    if base_idx is None:
838
        to_file.write('Nothing seems to have changed\n')
839
        return
840
    ## TODO: It might be nice to do something like show_log
841
    ##       and show the merged entries. But since this is the
842
    ##       removed revisions, it shouldn't be as important
843
    if base_idx < len(old_rh):
844
        to_file.write('*'*60)
845
        to_file.write('\nRemoved Revisions:\n')
846
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
847
            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
848
            lr = LogRevision(rev, i+1, 0, None)
849
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
850
        to_file.write('*'*60)
851
        to_file.write('\n\n')
852
    if base_idx < len(new_rh):
853
        to_file.write('Added Revisions:\n')
854
        show_log(branch,
855
                 lf,
856
                 None,
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
857
                 verbose=False,
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
858
                 direction='forward',
859
                 start_revision=base_idx+1,
860
                 end_revision=len(new_rh),
861
                 search=None)
862