/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.
462
    rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1])
463
    sorted_rev_list = topo_sort(rev_graph)
464
    ancestry = {}
465
    for rev in sorted_rev_list:
2359.1.9 by John Arbash Meinel
Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s
466
        parents = rev_graph[rev]
467
        if rev not in weave_modifed_revisions and len(parents) == 1:
468
            # We will not be adding anything new, so just use a reference to
469
            # the parent ancestry.
470
            rev_ancestry = ancestry[parents[0]]
471
        else:
472
            rev_ancestry = set()
473
            if rev in weave_modifed_revisions:
474
                rev_ancestry.add(rev)
475
            for parent in parents:
476
                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.
477
        ancestry[rev] = rev_ancestry
478
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
479
    def is_merging_rev(r):
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
480
        parents = rev_graph[r]
481
        if len(parents) > 1:
482
            leftparent = parents[0]
483
            for rightparent in parents[1:]:
484
                if not ancestry[leftparent].issuperset(
485
                        ancestry[rightparent]):
486
                    return True
487
        return False
488
489
    # filter from the view the revisions that did not change or merge 
490
    # the specific file
491
    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.
492
            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.
493
494
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
495
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
496
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
497
    """Produce an iterator of revisions to show
498
    :return: an iterator of (revision_id, revno, merge_depth)
499
    (if there is no revno for a revision, None is supplied)
500
    """
1756.2.22 by Aaron Bentley
Apply review comments
501
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
502
        revision_ids = mainline_revs[1:]
503
        if direction == 'reverse':
504
            revision_ids.reverse()
505
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
506
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
507
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
508
    merge_sorted_revisions = merge_sort(
509
        branch.repository.get_revision_graph(mainline_revs[-1]),
510
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
511
        mainline_revs,
512
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
513
514
    if direction == 'forward':
515
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
516
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
517
    elif direction != 'reverse':
518
        raise ValueError('invalid direction %r' % direction)
519
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
520
    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
521
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
522
523
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
524
def reverse_by_depth(merge_sorted_revisions, _depth=0):
525
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
526
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
527
    Revisions with a different depth are sorted as a group with the previous
528
    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
529
    but it looks much nicer.
530
    """
531
    zd_revisions = []
532
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
533
        if val[2] == _depth:
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
534
            zd_revisions.append([val])
535
        else:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
536
            assert val[2] > _depth
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
537
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
538
    for revisions in zd_revisions:
539
        if len(revisions) > 1:
540
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
541
    zd_revisions.reverse()
542
    result = []
543
    for chunk in zd_revisions:
544
        result.extend(chunk)
545
    return result
546
547
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.
548
class LogRevision(object):
549
    """A revision to be logged (by LogFormatter.log_revision).
550
551
    A simple wrapper for the attributes of a revision to be logged.
552
    The attributes may or may not be populated, as determined by the 
553
    logging options and the log formatter capabilities.
554
    """
555
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
556
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
557
                 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.
558
        self.rev = rev
559
        self.revno = revno
560
        self.merge_depth = merge_depth
561
        self.delta = delta
562
        self.tags = tags
563
564
794 by Martin Pool
- Merge John's nice short-log format.
565
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.
566
    """Abstract class to display log messages.
567
568
    At a minimum, a derived class must implement the log_revision method.
569
570
    If the LogFormatter needs to be informed of the beginning or end of
571
    a log it should implement the begin_log and/or end_log hook methods.
572
573
    A LogFormatter should define the following supports_XXX flags 
574
    to indicate which LogRevision attributes it supports:
575
576
    - supports_delta must be True if this log formatter supports delta.
577
        Otherwise the delta attribute may not be populated.
578
    - 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.
579
        merge revisions.  If not, and if supports_single_merge_revisions is
580
        also not True, then only mainline revisions will be passed to the 
581
        formatter.
582
    - supports_single_merge_revision must be True if this log formatter
583
        supports logging only a single merge revision.  This flag is
584
        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.
585
    - supports_tags must be True if this log formatter supports tags.
586
        Otherwise the tags attribute may not be populated.
587
    """
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
588
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
589
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
590
        self.to_file = to_file
591
        self.show_ids = show_ids
592
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
593
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.
594
# TODO: uncomment this block after show() has been removed.
595
# Until then defining log_revision would prevent _show_log calling show() 
596
# in legacy formatters.
597
#    def log_revision(self, revision):
598
#        """Log a revision.
599
#
600
#        :param  revision:   The LogRevision to be logged.
601
#        """
602
#        raise NotImplementedError('not implemented in abstract base')
603
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
604
    def short_committer(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
605
        name, address = config.parse_username(rev.committer)
606
        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.
607
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
608
        return address
2388.1.11 by Alexander Belchenko
changes after John's review
609
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.
610
    def short_author(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
611
        name, address = config.parse_username(rev.get_apparent_author())
612
        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.
613
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
614
        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.
615
2388.1.11 by Alexander Belchenko
changes after John's review
616
794 by Martin Pool
- Merge John's nice short-log format.
617
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
618
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.
619
    supports_merge_revisions = True
620
    supports_delta = True
621
    supports_tags = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
622
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.
623
    def log_revision(self, revision):
624
        """Log a revision, either merged or not."""
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
625
        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.
626
        to_file = self.to_file
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
627
        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.
628
        if revision.revno is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
629
            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.
630
        if revision.tags:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
631
            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.
632
        if self.show_ids:
3257.2.1 by Adeodato Simó
Add a space after "revision-id:" in log output.
633
            to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
634
            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.
635
            for parent_id in revision.rev.parent_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
636
                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.
637
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
638
        author = revision.rev.properties.get('author', None)
639
        if author is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
640
            to_file.write(indent + 'author: %s\n' % (author,))
641
        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.
642
643
        branch_nick = revision.rev.properties.get('branch-nick', None)
644
        if branch_nick is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
645
            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.
646
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.
647
        date_str = format_date(revision.rev.timestamp,
648
                               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.
649
                               self.show_timezone)
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
650
        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.
651
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
652
        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.
653
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
654
            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.
655
        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.
656
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
657
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
658
                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.
659
        if revision.delta is not None:
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
660
            revision.delta.show(to_file, self.show_ids, indent=indent)
794 by Martin Pool
- Merge John's nice short-log format.
661
662
663
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.
664
665
    supports_delta = True
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
666
    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.
667
668
    def log_revision(self, revision):
794 by Martin Pool
- Merge John's nice short-log format.
669
        to_file = self.to_file
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
670
        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.
671
                               revision.rev.timezone or 0,
672
                               self.show_timezone)
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
673
        is_merge = ''
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
674
        if len(revision.rev.parent_ids) > 1:
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
675
            is_merge = ' [merge]'
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
676
        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.
677
                self.short_author(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
678
                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.
679
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
680
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
681
                            show_offset=False),
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
682
                is_merge))
794 by Martin Pool
- Merge John's nice short-log format.
683
        if self.show_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
684
            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.
685
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
686
            to_file.write('      (no message)\n')
794 by Martin Pool
- Merge John's nice short-log format.
687
        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.
688
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
689
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
690
                to_file.write('      %s\n' % (l,))
794 by Martin Pool
- Merge John's nice short-log format.
691
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
692
        # TODO: Why not show the modified files in a shorter form as
693
        # 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.
694
        if revision.delta is not None:
695
            revision.delta.show(to_file, self.show_ids)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
696
        to_file.write('\n')
794 by Martin Pool
- Merge John's nice short-log format.
697
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
698
1185.12.25 by Aaron Bentley
Added one-line log format
699
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.
700
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
701
    supports_single_merge_revision = True
702
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.
703
    def __init__(self, *args, **kwargs):
704
        super(LineLogFormatter, self).__init__(*args, **kwargs)
705
        self._max_chars = terminal_width() - 1
706
1185.12.25 by Aaron Bentley
Added one-line log format
707
    def truncate(self, str, max_len):
708
        if len(str) <= max_len:
709
            return str
710
        return str[:max_len-3]+'...'
711
712
    def date_string(self, rev):
713
        return format_date(rev.timestamp, rev.timezone or 0, 
714
                           self.show_timezone, date_fmt="%Y-%m-%d",
715
                           show_offset=False)
716
717
    def message(self, rev):
718
        if not rev.message:
719
            return '(no message)'
720
        else:
721
            return rev.message
722
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
    def log_revision(self, revision):
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
724
        self.to_file.write(self.log_string(revision.revno, revision.rev,
725
                                              self._max_chars))
726
        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.
727
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
728
    def log_string(self, revno, rev, max_chars):
729
        """Format log info into one string. Truncate tail of string
730
        :param  revno:      revision number (int) or None.
731
                            Revision numbers counts from 1.
732
        :param  rev:        revision info object
733
        :param  max_chars:  maximum length of resulting string
734
        :return:            formatted truncated string
735
        """
736
        out = []
737
        if revno:
738
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
739
            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.
740
        out.append(self.truncate(self.short_author(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
741
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
742
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
743
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
744
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
745
1185.12.27 by Aaron Bentley
Use line log for pending merges
746
def line_log(rev, max_chars):
747
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
748
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
749
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
750
751
class LogFormatterRegistry(registry.Registry):
752
    """Registry for log formatters"""
753
754
    def make_formatter(self, name, *args, **kwargs):
755
        """Construct a formatter from arguments.
756
757
        :param name: Name of the formatter to construct.  'short', 'long' and
758
            'line' are built-in.
759
        """
760
        return self.get(name)(*args, **kwargs)
761
762
    def get_default(self, branch):
763
        return self.get(branch.get_config().log_format())
764
765
766
log_formatter_registry = LogFormatterRegistry()
767
768
769
log_formatter_registry.register('short', ShortLogFormatter,
770
                                'Moderately short log format')
771
log_formatter_registry.register('long', LongLogFormatter,
772
                                'Detailed log format')
773
log_formatter_registry.register('line', LineLogFormatter,
774
                                'Log format with one line per revision')
775
794 by Martin Pool
- Merge John's nice short-log format.
776
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
777
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
778
    log_formatter_registry.register(name, formatter)
779
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
780
794 by Martin Pool
- Merge John's nice short-log format.
781
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
782
    """Construct a formatter from arguments.
783
1185.12.27 by Aaron Bentley
Use line log for pending merges
784
    name -- Name of the formatter to construct; currently 'long', 'short' and
785
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
786
    """
794 by Martin Pool
- Merge John's nice short-log format.
787
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
788
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
789
    except KeyError:
794 by Martin Pool
- Merge John's nice short-log format.
790
        raise BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
791
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
792
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
793
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
794
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
795
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
796
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
797
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
798
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
799
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
800
                           log_format='long'):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
801
    """Show the change in revision history comparing the old revision history to the new one.
802
803
    :param branch: The branch where the revisions exist
804
    :param old_rh: The old revision history
805
    :param new_rh: The new revision history
806
    :param to_file: A file to write the results to. If None, stdout will be used
807
    """
808
    if to_file is None:
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
809
        to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
810
            errors='replace')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
811
    lf = log_formatter(log_format,
812
                       show_ids=False,
813
                       to_file=to_file,
814
                       show_timezone='original')
815
816
    # This is the first index which is different between
817
    # old and new
818
    base_idx = None
819
    for i in xrange(max(len(new_rh),
820
                        len(old_rh))):
821
        if (len(new_rh) <= i
822
            or len(old_rh) <= i
823
            or new_rh[i] != old_rh[i]):
824
            base_idx = i
825
            break
826
827
    if base_idx is None:
828
        to_file.write('Nothing seems to have changed\n')
829
        return
830
    ## TODO: It might be nice to do something like show_log
831
    ##       and show the merged entries. But since this is the
832
    ##       removed revisions, it shouldn't be as important
833
    if base_idx < len(old_rh):
834
        to_file.write('*'*60)
835
        to_file.write('\nRemoved Revisions:\n')
836
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
837
            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
838
            lr = LogRevision(rev, i+1, 0, None)
839
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
840
        to_file.write('*'*60)
841
        to_file.write('\n\n')
842
    if base_idx < len(new_rh):
843
        to_file.write('Added Revisions:\n')
844
        show_log(branch,
845
                 lf,
846
                 None,
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
847
                 verbose=False,
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
848
                 direction='forward',
849
                 start_revision=base_idx+1,
850
                 end_revision=len(new_rh),
851
                 search=None)
852