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