/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):
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
248
    mainline_revs, rev_nos, start_rev_id, end_rev_id = \
249
        _get_mainline_revs(branch, start_revision, end_revision)
250
    if not mainline_revs:
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
251
        return []
1756.2.18 by Aaron Bentley
Factor out the revision list generation
252
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
253
    if direction == 'reverse':
254
        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
255
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
256
    generate_single_revision = False
2985.1.1 by Aaron Bentley
Better behavior when user requests a log that cannot be viewed (Kent Gibson)
257
    if ((not generate_merge_revisions)
2978.3.2 by Kent Gibson
Use in rather than has_key
258
        and ((start_rev_id and (start_rev_id not in rev_nos))
259
            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.
260
        generate_single_revision = ((start_rev_id == end_rev_id)
3302.1.2 by Aaron Bentley
Split out the major view_revision calculation logic
261
            and allow_single_merge_revision)
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
262
        if not generate_single_revision:
263
            raise BzrCommandError('Selected log formatter only supports '
264
                'mainline revisions.')
265
        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.
266
    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.
267
                          direction, include_merges=generate_merge_revisions)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
268
    view_revisions = _filter_revision_range(list(view_revs_iter),
269
                                            start_rev_id,
270
                                            end_rev_id)
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
271
    if view_revisions and generate_single_revision:
272
        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.
273
    if specific_fileid:
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
274
        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.
275
                                                         specific_fileid,
276
                                                         mainline_revs,
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
277
                                                         view_revisions)
2388.1.11 by Alexander Belchenko
changes after John's review
278
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
279
    # rebase merge_depth - unless there are no revisions or 
280
    # either the first or last revision have merge_depth = 0.
281
    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
282
        min_depth = min([d for r,n,d in view_revisions])
283
        if min_depth != 0:
2466.12.2 by Kent Gibson
shift log output with only merge revisions to the left margin
284
            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
285
    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.
286
530 by Martin Pool
- put back verbose log support for reversed logs
287
3302.1.1 by Aaron Bentley
Split out _iter_revision, allow view_revisions to be an iterator
288
def _iter_revisions(repository, view_revisions, generate_delta):
289
    num = 9
290
    view_revisions = iter(view_revisions)
291
    while True:
292
        cur_view_revisions = [d for x, d in zip(range(num), view_revisions)]
293
        if len(cur_view_revisions) == 0:
294
            break
295
        cur_deltas = {}
296
        # r = revision, n = revno, d = merge depth
297
        revision_ids = [r for (r, n, d) in cur_view_revisions]
298
        revisions = repository.get_revisions(revision_ids)
299
        if generate_delta:
300
            deltas = repository.get_deltas_for_revisions(revisions)
301
            cur_deltas = dict(izip((r.revision_id for r in revisions),
302
                                   deltas))
303
        for view_data, revision in izip(cur_view_revisions, revisions):
304
            yield view_data, revision, cur_deltas.get(revision.revision_id)
305
        num = min(int(num * 1.5), 200)
306
307
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
308
def _get_mainline_revs(branch, start_revision, end_revision):
309
    """Get the mainline revisions from the branch.
310
    
311
    Generates the list of mainline revisions for the branch.
312
    
313
    :param  branch: The branch containing the revisions. 
314
315
    :param  start_revision: The first revision to be logged.
316
            For backwards compatibility this may be a mainline integer revno,
317
            but for merge revision support a RevisionInfo is expected.
318
319
    :param  end_revision: The last revision to be logged.
320
            For backwards compatibility this may be a mainline integer revno,
321
            but for merge revision support a RevisionInfo is expected.
322
323
    :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
324
    """
325
    which_revs = _enumerate_history(branch)
326
    if not which_revs:
327
        return None, None, None, None
328
329
    # For mainline generation, map start_revision and end_revision to 
330
    # mainline revnos. If the revision is not on the mainline choose the 
331
    # appropriate extreme of the mainline instead - the extra will be 
332
    # filtered later.
333
    # Also map the revisions to rev_ids, to be used in the later filtering
334
    # stage.
335
    start_rev_id = None 
336
    if start_revision is None:
337
        start_revno = 1
338
    else:
339
        if isinstance(start_revision,RevisionInfo):
340
            start_rev_id = start_revision.rev_id
341
            start_revno = start_revision.revno or 1
342
        else:
343
            branch.check_real_revno(start_revision)
344
            start_revno = start_revision
345
    
346
    end_rev_id = None
347
    if end_revision is None:
348
        end_revno = len(which_revs)
349
    else:
350
        if isinstance(end_revision,RevisionInfo):
351
            end_rev_id = end_revision.rev_id
352
            end_revno = end_revision.revno or len(which_revs)
353
        else:
354
            branch.check_real_revno(end_revision)
355
            end_revno = end_revision
356
2989.1.1 by Aaron Bentley
Merge Kent's revision 0 fix
357
    if ((start_rev_id == NULL_REVISION)
2978.4.1 by Kent Gibson
Logging revision 0 returns error.
358
        or (end_rev_id == NULL_REVISION)):
359
        raise BzrCommandError('Logging revision 0 is invalid.')
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
360
    if start_revno > end_revno:
361
        raise BzrCommandError("Start revision must be older than "
362
                              "the end revision.")
363
364
    # list indexes are 0-based; revisions are 1-based
365
    cut_revs = which_revs[(start_revno-1):(end_revno)]
366
    if not cut_revs:
367
        return None, None, None, None
368
369
    # convert the revision history to a dictionary:
370
    rev_nos = dict((k, v) for v, k in cut_revs)
371
372
    # override the mainline to look like the revision history.
373
    mainline_revs = [revision_id for index, revision_id in cut_revs]
374
    if cut_revs[0][0] == 1:
375
        mainline_revs.insert(0, None)
376
    else:
377
        mainline_revs.insert(0, which_revs[start_revno-2][1])
378
    return mainline_revs, rev_nos, start_rev_id, end_rev_id
379
380
381
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):
382
    """Filter view_revisions based on revision ranges.
383
384
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth) 
385
            tuples to be filtered.
386
387
    :param start_rev_id: If not NONE specifies the first revision to be logged.
388
            If NONE then all revisions up to the end_rev_id are logged.
389
390
    :param end_rev_id: If not NONE specifies the last revision to be logged.
391
            If NONE then all revisions up to the end of the log are logged.
392
393
    :return: The filtered view_revisions.
394
    """
395
    if start_rev_id or end_rev_id: 
396
        revision_ids = [r for r, n, d in view_revisions]
397
        if start_rev_id:
398
            start_index = revision_ids.index(start_rev_id)
399
        else:
400
            start_index = 0
401
        if start_rev_id == end_rev_id:
402
            end_index = start_index
403
        else:
404
            if end_rev_id:
405
                end_index = revision_ids.index(end_rev_id)
406
            else:
407
                end_index = len(view_revisions) - 1
408
        # To include the revisions merged into the last revision, 
409
        # extend end_rev_id down to, but not including, the next rev
410
        # with the same or lesser merge_depth
411
        end_merge_depth = view_revisions[end_index][2]
412
        try:
413
            for index in xrange(end_index+1, len(view_revisions)+1):
414
                if view_revisions[index][2] <= end_merge_depth:
415
                    end_index = index - 1
416
                    break
417
        except IndexError:
418
            # if the search falls off the end then log to the end as well
419
            end_index = len(view_revisions) - 1
420
        view_revisions = view_revisions[start_index:end_index+1]
421
    return view_revisions
422
423
424
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,
425
                                       view_revs_iter):
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
426
    """Return the list of revision ids which touch a given file id.
427
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
428
    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.
429
    This includes the revisions which directly change the file id,
430
    and the revisions which merge these changes. So if the
431
    revision graph is::
432
        A
433
        |\
434
        B C
435
        |/
436
        D
437
438
    And 'C' changes a file, then both C and D will be returned.
439
440
    This will also can be restricted based on a subset of the mainline.
2359.1.8 by John Arbash Meinel
doc
441
442
    :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.
443
    """
444
    # 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.
445
    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.
446
                branch.repository.get_transaction())
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
447
    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.
448
    # build the ancestry of each revision in the graph
449
    # - only listing the ancestors that change the specific file.
450
    rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1])
451
    sorted_rev_list = topo_sort(rev_graph)
452
    ancestry = {}
453
    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
454
        parents = rev_graph[rev]
455
        if rev not in weave_modifed_revisions and len(parents) == 1:
456
            # We will not be adding anything new, so just use a reference to
457
            # the parent ancestry.
458
            rev_ancestry = ancestry[parents[0]]
459
        else:
460
            rev_ancestry = set()
461
            if rev in weave_modifed_revisions:
462
                rev_ancestry.add(rev)
463
            for parent in parents:
464
                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.
465
        ancestry[rev] = rev_ancestry
466
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
467
    def is_merging_rev(r):
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
468
        parents = rev_graph[r]
469
        if len(parents) > 1:
470
            leftparent = parents[0]
471
            for rightparent in parents[1:]:
472
                if not ancestry[leftparent].issuperset(
473
                        ancestry[rightparent]):
474
                    return True
475
        return False
476
477
    # filter from the view the revisions that did not change or merge 
478
    # the specific file
479
    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.
480
            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.
481
482
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
483
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
484
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
485
    """Produce an iterator of revisions to show
486
    :return: an iterator of (revision_id, revno, merge_depth)
487
    (if there is no revno for a revision, None is supplied)
488
    """
1756.2.22 by Aaron Bentley
Apply review comments
489
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
490
        revision_ids = mainline_revs[1:]
491
        if direction == 'reverse':
492
            revision_ids.reverse()
493
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
494
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
495
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
496
    merge_sorted_revisions = merge_sort(
497
        branch.repository.get_revision_graph(mainline_revs[-1]),
498
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
499
        mainline_revs,
500
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
501
502
    if direction == 'forward':
503
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
504
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
505
    elif direction != 'reverse':
506
        raise ValueError('invalid direction %r' % direction)
507
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
508
    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
509
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
510
511
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
512
def reverse_by_depth(merge_sorted_revisions, _depth=0):
513
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
514
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
515
    Revisions with a different depth are sorted as a group with the previous
516
    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
517
    but it looks much nicer.
518
    """
519
    zd_revisions = []
520
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
521
        if val[2] == _depth:
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
522
            zd_revisions.append([val])
523
        else:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
524
            assert val[2] > _depth
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
525
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
526
    for revisions in zd_revisions:
527
        if len(revisions) > 1:
528
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
529
    zd_revisions.reverse()
530
    result = []
531
    for chunk in zd_revisions:
532
        result.extend(chunk)
533
    return result
534
535
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.
536
class LogRevision(object):
537
    """A revision to be logged (by LogFormatter.log_revision).
538
539
    A simple wrapper for the attributes of a revision to be logged.
540
    The attributes may or may not be populated, as determined by the 
541
    logging options and the log formatter capabilities.
542
    """
543
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
544
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
545
                 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.
546
        self.rev = rev
547
        self.revno = revno
548
        self.merge_depth = merge_depth
549
        self.delta = delta
550
        self.tags = tags
551
552
794 by Martin Pool
- Merge John's nice short-log format.
553
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.
554
    """Abstract class to display log messages.
555
556
    At a minimum, a derived class must implement the log_revision method.
557
558
    If the LogFormatter needs to be informed of the beginning or end of
559
    a log it should implement the begin_log and/or end_log hook methods.
560
561
    A LogFormatter should define the following supports_XXX flags 
562
    to indicate which LogRevision attributes it supports:
563
564
    - supports_delta must be True if this log formatter supports delta.
565
        Otherwise the delta attribute may not be populated.
566
    - 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.
567
        merge revisions.  If not, and if supports_single_merge_revisions is
568
        also not True, then only mainline revisions will be passed to the 
569
        formatter.
570
    - supports_single_merge_revision must be True if this log formatter
571
        supports logging only a single merge revision.  This flag is
572
        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.
573
    - supports_tags must be True if this log formatter supports tags.
574
        Otherwise the tags attribute may not be populated.
575
    """
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
576
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
577
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
578
        self.to_file = to_file
579
        self.show_ids = show_ids
580
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
581
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.
582
# TODO: uncomment this block after show() has been removed.
583
# Until then defining log_revision would prevent _show_log calling show() 
584
# in legacy formatters.
585
#    def log_revision(self, revision):
586
#        """Log a revision.
587
#
588
#        :param  revision:   The LogRevision to be logged.
589
#        """
590
#        raise NotImplementedError('not implemented in abstract base')
591
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
592
    def short_committer(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
593
        name, address = config.parse_username(rev.committer)
594
        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.
595
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
596
        return address
2388.1.11 by Alexander Belchenko
changes after John's review
597
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.
598
    def short_author(self, rev):
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
599
        name, address = config.parse_username(rev.get_apparent_author())
600
        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.
601
            return name
3063.3.2 by Lukáš Lalinský
Move the name and e-mail address extraction logic to config.parse_username.
602
        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.
603
2388.1.11 by Alexander Belchenko
changes after John's review
604
794 by Martin Pool
- Merge John's nice short-log format.
605
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
606
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.
607
    supports_merge_revisions = True
608
    supports_delta = True
609
    supports_tags = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
610
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.
611
    def log_revision(self, revision):
612
        """Log a revision, either merged or not."""
2671.2.5 by Lukáš Lalinský
Fixes for comments from the mailing list.
613
        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.
614
        to_file = self.to_file
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
615
        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.
616
        if revision.revno is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
617
            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.
618
        if revision.tags:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
619
            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.
620
        if self.show_ids:
3257.2.1 by Adeodato Simó
Add a space after "revision-id:" in log output.
621
            to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
622
            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.
623
            for parent_id in revision.rev.parent_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
624
                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.
625
2671.5.7 by Lukáš Lalinsky
Rename get_author to get_apparent_author, revert the long log back to displaying the committer.
626
        author = revision.rev.properties.get('author', None)
627
        if author is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
628
            to_file.write(indent + 'author: %s\n' % (author,))
629
        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.
630
631
        branch_nick = revision.rev.properties.get('branch-nick', None)
632
        if branch_nick is not None:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
633
            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.
634
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
        date_str = format_date(revision.rev.timestamp,
636
                               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.
637
                               self.show_timezone)
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
638
        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.
639
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
640
        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.
641
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
642
            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.
643
        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.
644
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
645
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
646
                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.
647
        if revision.delta is not None:
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
648
            revision.delta.show(to_file, self.show_ids, indent=indent)
794 by Martin Pool
- Merge John's nice short-log format.
649
650
651
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.
652
653
    supports_delta = True
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
654
    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.
655
656
    def log_revision(self, revision):
794 by Martin Pool
- Merge John's nice short-log format.
657
        to_file = self.to_file
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
658
        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.
659
                               revision.rev.timezone or 0,
660
                               self.show_timezone)
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
661
        is_merge = ''
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
662
        if len(revision.rev.parent_ids) > 1:
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
663
            is_merge = ' [merge]'
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
664
        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.
665
                self.short_author(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
666
                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.
667
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
668
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
669
                            show_offset=False),
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
670
                is_merge))
794 by Martin Pool
- Merge John's nice short-log format.
671
        if self.show_ids:
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
672
            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.
673
        if not revision.rev.message:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
674
            to_file.write('      (no message)\n')
794 by Martin Pool
- Merge John's nice short-log format.
675
        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.
676
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
677
            for l in message.split('\n'):
2911.6.3 by Blake Winton
Implemented suggestions from John Arbash Meinel.
678
                to_file.write('      %s\n' % (l,))
794 by Martin Pool
- Merge John's nice short-log format.
679
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
680
        # TODO: Why not show the modified files in a shorter form as
681
        # 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.
682
        if revision.delta is not None:
683
            revision.delta.show(to_file, self.show_ids)
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
684
        to_file.write('\n')
794 by Martin Pool
- Merge John's nice short-log format.
685
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
686
1185.12.25 by Aaron Bentley
Added one-line log format
687
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.
688
2997.1.1 by Kent Gibson
Support logging single merge revisions with short and line log formatters.
689
    supports_single_merge_revision = True
690
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.
691
    def __init__(self, *args, **kwargs):
692
        super(LineLogFormatter, self).__init__(*args, **kwargs)
693
        self._max_chars = terminal_width() - 1
694
1185.12.25 by Aaron Bentley
Added one-line log format
695
    def truncate(self, str, max_len):
696
        if len(str) <= max_len:
697
            return str
698
        return str[:max_len-3]+'...'
699
700
    def date_string(self, rev):
701
        return format_date(rev.timestamp, rev.timezone or 0, 
702
                           self.show_timezone, date_fmt="%Y-%m-%d",
703
                           show_offset=False)
704
705
    def message(self, rev):
706
        if not rev.message:
707
            return '(no message)'
708
        else:
709
            return rev.message
710
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
    def log_revision(self, revision):
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
712
        self.to_file.write(self.log_string(revision.revno, revision.rev,
713
                                              self._max_chars))
714
        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.
715
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
716
    def log_string(self, revno, rev, max_chars):
717
        """Format log info into one string. Truncate tail of string
718
        :param  revno:      revision number (int) or None.
719
                            Revision numbers counts from 1.
720
        :param  rev:        revision info object
721
        :param  max_chars:  maximum length of resulting string
722
        :return:            formatted truncated string
723
        """
724
        out = []
725
        if revno:
726
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
727
            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.
728
        out.append(self.truncate(self.short_author(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
729
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
730
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
731
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
732
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
733
1185.12.27 by Aaron Bentley
Use line log for pending merges
734
def line_log(rev, max_chars):
735
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
736
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
737
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
738
739
class LogFormatterRegistry(registry.Registry):
740
    """Registry for log formatters"""
741
742
    def make_formatter(self, name, *args, **kwargs):
743
        """Construct a formatter from arguments.
744
745
        :param name: Name of the formatter to construct.  'short', 'long' and
746
            'line' are built-in.
747
        """
748
        return self.get(name)(*args, **kwargs)
749
750
    def get_default(self, branch):
751
        return self.get(branch.get_config().log_format())
752
753
754
log_formatter_registry = LogFormatterRegistry()
755
756
757
log_formatter_registry.register('short', ShortLogFormatter,
758
                                'Moderately short log format')
759
log_formatter_registry.register('long', LongLogFormatter,
760
                                'Detailed log format')
761
log_formatter_registry.register('line', LineLogFormatter,
762
                                'Log format with one line per revision')
763
794 by Martin Pool
- Merge John's nice short-log format.
764
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
765
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
766
    log_formatter_registry.register(name, formatter)
767
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
768
794 by Martin Pool
- Merge John's nice short-log format.
769
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
770
    """Construct a formatter from arguments.
771
1185.12.27 by Aaron Bentley
Use line log for pending merges
772
    name -- Name of the formatter to construct; currently 'long', 'short' and
773
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
774
    """
794 by Martin Pool
- Merge John's nice short-log format.
775
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
776
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
777
    except KeyError:
794 by Martin Pool
- Merge John's nice short-log format.
778
        raise BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
779
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
780
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
781
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
782
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
783
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
784
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
785
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
786
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
787
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
788
                           log_format='long'):
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
789
    """Show the change in revision history comparing the old revision history to the new one.
790
791
    :param branch: The branch where the revisions exist
792
    :param old_rh: The old revision history
793
    :param new_rh: The new revision history
794
    :param to_file: A file to write the results to. If None, stdout will be used
795
    """
796
    if to_file is None:
2997.1.3 by Alexander Belchenko
file wrapper around stdout should use terminal encoding, not user_encoding.
797
        to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,
798
            errors='replace')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
799
    lf = log_formatter(log_format,
800
                       show_ids=False,
801
                       to_file=to_file,
802
                       show_timezone='original')
803
804
    # This is the first index which is different between
805
    # old and new
806
    base_idx = None
807
    for i in xrange(max(len(new_rh),
808
                        len(old_rh))):
809
        if (len(new_rh) <= i
810
            or len(old_rh) <= i
811
            or new_rh[i] != old_rh[i]):
812
            base_idx = i
813
            break
814
815
    if base_idx is None:
816
        to_file.write('Nothing seems to have changed\n')
817
        return
818
    ## TODO: It might be nice to do something like show_log
819
    ##       and show the merged entries. But since this is the
820
    ##       removed revisions, it shouldn't be as important
821
    if base_idx < len(old_rh):
822
        to_file.write('*'*60)
823
        to_file.write('\nRemoved Revisions:\n')
824
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
825
            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
826
            lr = LogRevision(rev, i+1, 0, None)
827
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
828
        to_file.write('*'*60)
829
        to_file.write('\n\n')
830
    if base_idx < len(new_rh):
831
        to_file.write('Added Revisions:\n')
832
        show_log(branch,
833
                 lf,
834
                 None,
1551.17.2 by Aaron Bentley
Stop showing deltas in pull -v output
835
                 verbose=False,
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
836
                 direction='forward',
837
                 start_revision=base_idx+1,
838
                 end_revision=len(new_rh),
839
                 search=None)
840