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