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