/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
45
relative to its mainline parent, not the delta relative to the last
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
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
52
# TODO: option to show delta summaries for merged-in revisions
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
53
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
54
from itertools import izip
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
55
import re
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
56
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
57
from bzrlib import (
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
58
    registry,
59
    symbol_versioning,
60
    )
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
61
import bzrlib.errors as errors
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
62
from bzrlib.symbol_versioning import (
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.
63
    deprecated_method,
64
    zero_eleven,
65
    zero_seventeen,
66
    )
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
67
from bzrlib.trace import mutter
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
68
from bzrlib.tsort import (
2359.1.2 by Kent Gibson
add logging of merge revisions
69
    merge_sort,
70
    topo_sort,
71
    )
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
72
375 by Martin Pool
- New command touching-revisions and function to trace
73
74
def find_touching_revisions(branch, file_id):
75
    """Yield a description of revisions which affect the file_id.
76
77
    Each returned element is (revno, revision_id, description)
78
79
    This is the list of revisions where the file is either added,
80
    modified, renamed or deleted.
81
82
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
83
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
84
    """
85
    last_ie = None
86
    last_path = None
87
    revno = 1
88
    for revision_id in branch.revision_history():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
89
        this_inv = branch.repository.get_revision_inventory(revision_id)
375 by Martin Pool
- New command touching-revisions and function to trace
90
        if file_id in this_inv:
91
            this_ie = this_inv[file_id]
92
            this_path = this_inv.id2path(file_id)
93
        else:
94
            this_ie = this_path = None
95
96
        # now we know how it was last time, and how it is in this revision.
97
        # are those two states effectively the same or not?
98
99
        if not this_ie and not last_ie:
100
            # not present in either
101
            pass
102
        elif this_ie and not last_ie:
103
            yield revno, revision_id, "added " + this_path
104
        elif not this_ie and last_ie:
105
            # deleted here
106
            yield revno, revision_id, "deleted " + last_path
107
        elif this_path != last_path:
108
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
109
        elif (this_ie.text_size != last_ie.text_size
110
              or this_ie.text_sha1 != last_ie.text_sha1):
111
            yield revno, revision_id, "modified " + this_path
112
113
        last_ie = this_ie
114
        last_path = this_path
115
        revno += 1
116
117
527 by Martin Pool
- refactor log command
118
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
119
def _enumerate_history(branch):
120
    rh = []
121
    revno = 1
122
    for rev_id in branch.revision_history():
123
        rh.append((revno, rev_id))
124
        revno += 1
125
    return rh
126
127
378 by Martin Pool
- New usage bzr log FILENAME
128
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
129
             lf,
527 by Martin Pool
- refactor log command
130
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
131
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
132
             direction='reverse',
133
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
134
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
135
             search=None,
136
             limit=None):
369 by Martin Pool
- Split out log printing into new show_log function
137
    """Write out human-readable log of commits to this branch.
138
794 by Martin Pool
- Merge John's nice short-log format.
139
    lf
140
        LogFormatter object to show the output.
141
527 by Martin Pool
- refactor log command
142
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
143
        If true, list only the commits affecting the specified
144
        file, rather than all commits.
145
369 by Martin Pool
- Split out log printing into new show_log function
146
    verbose
147
        If true show added/changed/deleted/renamed files.
148
527 by Martin Pool
- refactor log command
149
    direction
150
        'reverse' (default) is latest to earliest;
151
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
152
153
    start_revision
154
        If not None, only show revisions >= start_revision
155
156
    end_revision
157
        If not None, only show revisions <= end_revision
2466.9.1 by Kent Gibson
add bzr log --limit
158
159
    search
160
        If not None, only show revisions with matching commit messages
161
162
    limit
163
        If not None or 0, only show limit revisions
369 by Martin Pool
- Split out log printing into new show_log function
164
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
165
    branch.lock_read()
166
    try:
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
167
        if getattr(lf, 'begin_log', None):
168
            lf.begin_log()
169
1756.1.6 by Aaron Bentley
Revert locking fix
170
        _show_log(branch, lf, specific_fileid, verbose, direction,
2466.9.1 by Kent Gibson
add bzr log --limit
171
                  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.
172
173
        if getattr(lf, 'end_log', None):
174
            lf.end_log()
1417.1.7 by Robert Collins
teach log it needs a read lock
175
    finally:
176
        branch.unlock()
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
177
1417.1.7 by Robert Collins
teach log it needs a read lock
178
def _show_log(branch,
179
             lf,
180
             specific_fileid=None,
181
             verbose=False,
182
             direction='reverse',
183
             start_revision=None,
184
             end_revision=None,
2466.9.1 by Kent Gibson
add bzr log --limit
185
             search=None,
186
             limit=None):
1417.1.7 by Robert Collins
teach log it needs a read lock
187
    """Worker function for show_log - see show_log."""
794 by Martin Pool
- Merge John's nice short-log format.
188
    from bzrlib.osutils import format_date
189
    from bzrlib.errors import BzrCheckError
190
    
191
    from warnings import warn
369 by Martin Pool
- Split out log printing into new show_log function
192
794 by Martin Pool
- Merge John's nice short-log format.
193
    if not isinstance(lf, LogFormatter):
194
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
195
196
    if specific_fileid:
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
197
        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
198
900 by Martin Pool
- patch from john to search for matching commits
199
    if search is not None:
200
        import re
201
        searchRE = re.compile(search, re.IGNORECASE)
202
    else:
203
        searchRE = None
204
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
205
    which_revs = _enumerate_history(branch)
206
    
207
    if start_revision is None:
208
        start_revision = 1
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
209
    else:
210
        branch.check_real_revno(start_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
211
    
212
    if end_revision is None:
213
        end_revision = len(which_revs)
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
214
    else:
215
        branch.check_real_revno(end_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
216
217
    # list indexes are 0-based; revisions are 1-based
218
    cut_revs = which_revs[(start_revision-1):(end_revision)]
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
219
    if not cut_revs:
220
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
221
222
    # convert the revision history to a dictionary:
1756.2.27 by Aaron Bentley
Tweak rev_nos style
223
    rev_nos = dict((k, v) for v, k in cut_revs)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
224
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
225
    # override the mainline to look like the revision history.
226
    mainline_revs = [revision_id for index, revision_id in cut_revs]
227
    if cut_revs[0][0] == 1:
228
        mainline_revs.insert(0, None)
229
    else:
230
        mainline_revs.insert(0, which_revs[start_revision-2][1])
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
231
    legacy_lf = getattr(lf, 'log_revision', None) is 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.
232
    if legacy_lf:
233
        # pre-0.17 formatters use show for mainline revisions.
234
        # how should we show merged revisions ?
235
        #   pre-0.11 api: show_merge
236
        #   0.11-0.16 api: show_merge_revno
237
        show_merge_revno = getattr(lf, 'show_merge_revno', None)
238
        show_merge = getattr(lf, 'show_merge', None)
239
        if show_merge is None and show_merge_revno is None:
240
            # no merged-revno support
241
            generate_merge_revisions = False
242
        else:
243
            generate_merge_revisions = True
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
244
        # tell developers to update their code
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.
245
        symbol_versioning.warn('LogFormatters should provide log_revision '
246
            'instead of show and show_merge_revno since bzr 0.17.',
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
247
            DeprecationWarning, stacklevel=3)
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.
248
    else:
249
        generate_merge_revisions = getattr(lf, 'supports_merge_revisions', 
250
                                           False)
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
251
    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.
252
                          direction, include_merges=generate_merge_revisions)
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
253
    if specific_fileid:
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
254
        view_revisions = _get_revisions_touching_file_id(branch,
255
                                                         specific_fileid,
256
                                                         mainline_revs,
257
                                                         view_revs_iter)
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
258
    else:
259
        view_revisions = list(view_revs_iter)
2388.1.11 by Alexander Belchenko
changes after John's review
260
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.
261
    rev_tag_dict = {}
262
    generate_tags = getattr(lf, 'supports_tags', False)
263
    if generate_tags:
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
264
        if branch.supports_tags():
265
            rev_tag_dict = branch.tags.get_reverse_tag_dict()
2388.1.11 by Alexander Belchenko
changes after John's review
266
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
    generate_delta = verbose and getattr(lf, 'supports_delta', False)
268
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
269
    def iter_revisions():
1756.3.22 by Aaron Bentley
Tweaks from review
270
        # r = revision, n = revno, d = merge depth
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
271
        revision_ids = [r for r, n, d in view_revisions]
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
272
        num = 9
1756.3.22 by Aaron Bentley
Tweaks from review
273
        repository = branch.repository
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
274
        while revision_ids:
1756.3.22 by Aaron Bentley
Tweaks from review
275
            cur_deltas = {}
276
            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.
277
            if generate_delta:
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
278
                deltas = repository.get_deltas_for_revisions(revisions)
279
                cur_deltas = dict(izip((r.revision_id for r in revisions),
280
                                       deltas))
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
281
            for revision in revisions:
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
282
                yield revision, cur_deltas.get(revision.revision_id)
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
283
            revision_ids  = revision_ids[num:]
2359.1.2 by Kent Gibson
add logging of merge revisions
284
            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.
285
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
286
    # now we just print all the revisions
2466.9.1 by Kent Gibson
add bzr log --limit
287
    log_count = 0
1756.3.2 by Aaron Bentley
Refactor revision_delta call
288
    for ((rev_id, revno, merge_depth), (rev, delta)) in \
1756.2.18 by Aaron Bentley
Factor out the revision list generation
289
         izip(view_revisions, iter_revisions()):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
290
291
        if searchRE:
292
            if not searchRE.search(rev.message):
293
                continue
294
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.
295
        if not legacy_lf:
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
296
            lr = LogRevision(rev, revno, merge_depth, delta,
2466.8.2 by Kent Gibson
Move begin/end calls from _show_log to show_log. Fix long line.
297
                             rev_tag_dict.get(rev_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.
298
            lf.log_revision(lr)
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
299
        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.
300
            # support for legacy (pre-0.17) LogFormatters
301
            if merge_depth == 0:
302
                if generate_tags:
303
                    lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
304
                else:
305
                    lf.show(revno, rev, delta)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
306
            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.
307
                if show_merge_revno is None:
308
                    lf.show_merge(rev, merge_depth)
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
309
                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.
310
                    if generate_tags:
311
                        lf.show_merge_revno(rev, merge_depth, revno,
312
                                            rev_tag_dict.get(rev_id))
313
                    else:
314
                        lf.show_merge_revno(rev, merge_depth, revno)
2466.9.1 by Kent Gibson
add bzr log --limit
315
        if limit:
316
            log_count += 1
317
            if log_count >= limit:
318
                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.
319
530 by Martin Pool
- put back verbose log support for reversed logs
320
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
321
def _get_revisions_touching_file_id(branch, file_id, mainline_revisions,
322
                                    view_revs_iter):
323
    """Return the list of revision ids which touch a given file id.
324
325
    This includes the revisions which directly change the file id,
326
    and the revisions which merge these changes. So if the
327
    revision graph is::
328
        A
329
        |\
330
        B C
331
        |/
332
        D
333
334
    And 'C' changes a file, then both C and D will be returned.
335
336
    This will also can be restricted based on a subset of the mainline.
2359.1.8 by John Arbash Meinel
doc
337
338
    :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.
339
    """
340
    # 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.
341
    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.
342
                branch.repository.get_transaction())
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
343
    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.
344
    # build the ancestry of each revision in the graph
345
    # - only listing the ancestors that change the specific file.
346
    rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1])
347
    sorted_rev_list = topo_sort(rev_graph)
348
    ancestry = {}
349
    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
350
        parents = rev_graph[rev]
351
        if rev not in weave_modifed_revisions and len(parents) == 1:
352
            # We will not be adding anything new, so just use a reference to
353
            # the parent ancestry.
354
            rev_ancestry = ancestry[parents[0]]
355
        else:
356
            rev_ancestry = set()
357
            if rev in weave_modifed_revisions:
358
                rev_ancestry.add(rev)
359
            for parent in parents:
360
                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.
361
        ancestry[rev] = rev_ancestry
362
2359.1.5 by John Arbash Meinel
change some variable names to make the function a bit clearer.
363
    def is_merging_rev(r):
2359.1.4 by John Arbash Meinel
Refactor the specific revisions for file id into a helper function.
364
        parents = rev_graph[r]
365
        if len(parents) > 1:
366
            leftparent = parents[0]
367
            for rightparent in parents[1:]:
368
                if not ancestry[leftparent].issuperset(
369
                        ancestry[rightparent]):
370
                    return True
371
        return False
372
373
    # filter from the view the revisions that did not change or merge 
374
    # the specific file
375
    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.
376
            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.
377
378
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
379
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
380
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
381
    """Produce an iterator of revisions to show
382
    :return: an iterator of (revision_id, revno, merge_depth)
383
    (if there is no revno for a revision, None is supplied)
384
    """
1756.2.22 by Aaron Bentley
Apply review comments
385
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
386
        revision_ids = mainline_revs[1:]
387
        if direction == 'reverse':
388
            revision_ids.reverse()
389
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
390
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
391
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
392
    merge_sorted_revisions = merge_sort(
393
        branch.repository.get_revision_graph(mainline_revs[-1]),
394
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
395
        mainline_revs,
396
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
397
398
    if direction == 'forward':
399
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
400
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
401
    elif direction != 'reverse':
402
        raise ValueError('invalid direction %r' % direction)
403
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
404
    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
405
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
406
407
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
408
def reverse_by_depth(merge_sorted_revisions, _depth=0):
409
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
410
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
411
    Revisions with a different depth are sorted as a group with the previous
412
    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
413
    but it looks much nicer.
414
    """
415
    zd_revisions = []
416
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
417
        if val[2] == _depth:
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
418
            zd_revisions.append([val])
419
        else:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
420
            assert val[2] > _depth
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
421
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
422
    for revisions in zd_revisions:
423
        if len(revisions) > 1:
424
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
425
    zd_revisions.reverse()
426
    result = []
427
    for chunk in zd_revisions:
428
        result.extend(chunk)
429
    return result
430
431
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.
432
class LogRevision(object):
433
    """A revision to be logged (by LogFormatter.log_revision).
434
435
    A simple wrapper for the attributes of a revision to be logged.
436
    The attributes may or may not be populated, as determined by the 
437
    logging options and the log formatter capabilities.
438
    """
439
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
440
    def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,
441
                 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.
442
        self.rev = rev
443
        self.revno = revno
444
        self.merge_depth = merge_depth
445
        self.delta = delta
446
        self.tags = tags
447
448
794 by Martin Pool
- Merge John's nice short-log format.
449
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.
450
    """Abstract class to display log messages.
451
452
    At a minimum, a derived class must implement the log_revision method.
453
454
    If the LogFormatter needs to be informed of the beginning or end of
455
    a log it should implement the begin_log and/or end_log hook methods.
456
457
    A LogFormatter should define the following supports_XXX flags 
458
    to indicate which LogRevision attributes it supports:
459
460
    - supports_delta must be True if this log formatter supports delta.
461
        Otherwise the delta attribute may not be populated.
462
    - supports_merge_revisions must be True if this log formatter supports 
463
        merge revisions.  If not, only revisions mainline revisions (those 
464
        with merge_depth == 0) will be passed to the formatter.
465
    - supports_tags must be True if this log formatter supports tags.
466
        Otherwise the tags attribute may not be populated.
467
    """
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
468
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
469
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
470
        self.to_file = to_file
471
        self.show_ids = show_ids
472
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
473
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.
474
# TODO: uncomment this block after show() has been removed.
475
# Until then defining log_revision would prevent _show_log calling show() 
476
# in legacy formatters.
477
#    def log_revision(self, revision):
478
#        """Log a revision.
479
#
480
#        :param  revision:   The LogRevision to be logged.
481
#        """
482
#        raise NotImplementedError('not implemented in abstract base')
483
484
    @deprecated_method(zero_seventeen)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
485
    def show(self, revno, rev, delta):
486
        raise NotImplementedError('not implemented in abstract base')
1393.1.56 by Martin Pool
- doc and small refactoring of log code
487
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
488
    def short_committer(self, rev):
489
        return re.sub('<.*@.*>', '', rev.committer).strip(' ')
2388.1.11 by Alexander Belchenko
changes after John's review
490
491
794 by Martin Pool
- Merge John's nice short-log format.
492
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
493
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.
494
    supports_merge_revisions = True
495
    supports_delta = True
496
    supports_tags = True
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
497
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.
498
    @deprecated_method(zero_seventeen)
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
499
    def show(self, revno, rev, delta, tags=None):
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
500
        lr = LogRevision(rev, revno, 0, delta, tags)
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.
501
        return self.log_revision(lr)
794 by Martin Pool
- Merge John's nice short-log format.
502
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
503
    @deprecated_method(zero_eleven)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
504
    def show_merge(self, rev, merge_depth):
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
505
        lr = LogRevision(rev, merge_depth=merge_depth)
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.
506
        return self.log_revision(lr)
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
507
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.
508
    @deprecated_method(zero_seventeen)
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
509
    def show_merge_revno(self, rev, merge_depth, revno, tags=None):
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
510
        """Show a merged revision rev, with merge_depth and a revno."""
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
511
        lr = LogRevision(rev, revno, merge_depth, tags=tags)
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.
512
        return self.log_revision(lr)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
513
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.
514
    def log_revision(self, revision):
515
        """Log a revision, either merged or not."""
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
516
        from bzrlib.osutils import format_date
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.
517
        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.
518
        to_file = self.to_file
519
        print >>to_file,  indent+'-' * 60
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.
520
        if revision.revno is not None:
521
            print >>to_file,  indent+'revno:', revision.revno
522
        if revision.tags:
523
            print >>to_file, indent+'tags: %s' % (', '.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.
524
        if self.show_ids:
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
525
            print >>to_file, indent+'revision-id:', 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.
526
            for parent_id in revision.rev.parent_ids:
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
527
                print >>to_file, indent+'parent:', parent_id
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
528
        print >>to_file, indent+'committer:', revision.rev.committer
2388.1.11 by Alexander Belchenko
changes after John's review
529
1185.35.17 by Aaron Bentley
Added branch nicks to long-format logs
530
        try:
531
            print >>to_file, indent+'branch nick: %s' % \
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
                revision.rev.properties['branch-nick']
1185.35.17 by Aaron Bentley
Added branch nicks to long-format logs
533
        except KeyError:
534
            pass
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.
535
        date_str = format_date(revision.rev.timestamp,
536
                               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.
537
                               self.show_timezone)
538
        print >>to_file,  indent+'timestamp: %s' % date_str
539
540
        print >>to_file,  indent+'message:'
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.
541
        if not revision.rev.message:
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
542
            print >>to_file,  indent+'  (no message)'
543
        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.
544
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
545
            for l in message.split('\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.
546
                print >>to_file,  indent+'  ' + 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.
547
        if revision.delta is not None:
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
548
            revision.delta.show(to_file, self.show_ids, indent=indent)
794 by Martin Pool
- Merge John's nice short-log format.
549
550
551
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.
552
553
    supports_delta = True
554
555
    @deprecated_method(zero_seventeen)
794 by Martin Pool
- Merge John's nice short-log format.
556
    def show(self, revno, rev, delta):
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
557
        lr = LogRevision(rev, revno, 0, delta)
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
558
        return self.log_revision(lr)
559
560
    def log_revision(self, revision):
794 by Martin Pool
- Merge John's nice short-log format.
561
        from bzrlib.osutils import format_date
562
563
        to_file = self.to_file
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
564
        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.
565
                               revision.rev.timezone or 0,
566
                               self.show_timezone)
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
567
        is_merge = ''
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
568
        if len(revision.rev.parent_ids) > 1:
2483.2.2 by John Arbash Meinel
Add [merge] after the timestamp for revisions with merges.
569
            is_merge = ' [merge]'
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
570
        print >>to_file, "%5s %s\t%s%s" % (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.
571
                self.short_committer(revision.rev),
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
572
                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.
573
                            revision.rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
574
                            self.show_timezone, date_fmt="%Y-%m-%d",
2483.2.5 by John Arbash Meinel
[merge] bzr.dev 2501
575
                            show_offset=False),
576
                is_merge)
794 by Martin Pool
- Merge John's nice short-log format.
577
        if self.show_ids:
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.
578
            print >>to_file,  '      revision-id:', revision.rev.revision_id
579
        if not revision.rev.message:
794 by Martin Pool
- Merge John's nice short-log format.
580
            print >>to_file,  '      (no message)'
581
        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.
582
            message = revision.rev.message.rstrip('\r\n')
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
583
            for l in message.split('\n'):
794 by Martin Pool
- Merge John's nice short-log format.
584
                print >>to_file,  '      ' + l
585
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
586
        # TODO: Why not show the modified files in a shorter form as
587
        # 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.
588
        if revision.delta is not None:
589
            revision.delta.show(to_file, self.show_ids)
1185.31.21 by John Arbash Meinel
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
590
        print >>to_file, ''
794 by Martin Pool
- Merge John's nice short-log format.
591
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
592
1185.12.25 by Aaron Bentley
Added one-line log format
593
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.
594
595
    def __init__(self, *args, **kwargs):
596
        from bzrlib.osutils import terminal_width
597
        super(LineLogFormatter, self).__init__(*args, **kwargs)
598
        self._max_chars = terminal_width() - 1
599
1185.12.25 by Aaron Bentley
Added one-line log format
600
    def truncate(self, str, max_len):
601
        if len(str) <= max_len:
602
            return str
603
        return str[:max_len-3]+'...'
604
605
    def date_string(self, rev):
606
        from bzrlib.osutils import format_date
607
        return format_date(rev.timestamp, rev.timezone or 0, 
608
                           self.show_timezone, date_fmt="%Y-%m-%d",
609
                           show_offset=False)
610
611
    def message(self, rev):
612
        if not rev.message:
613
            return '(no message)'
614
        else:
615
            return rev.message
616
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
617
    @deprecated_method(zero_seventeen)
1185.12.25 by Aaron Bentley
Added one-line log format
618
    def show(self, revno, rev, delta):
1704.2.2 by Martin Pool
Detect terminal width using ioctl
619
        from bzrlib.osutils import terminal_width
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
620
        print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
1185.12.25 by Aaron Bentley
Added one-line log format
621
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.
622
    def log_revision(self, revision):
2490.1.2 by John Arbash Meinel
Cleanup according to PEP8 and some other small whitespace fixes
623
        print >>self.to_file, self.log_string(revision.revno, revision.rev,
624
                                              self._max_chars)
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.
625
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
626
    def log_string(self, revno, rev, max_chars):
627
        """Format log info into one string. Truncate tail of string
628
        :param  revno:      revision number (int) or None.
629
                            Revision numbers counts from 1.
630
        :param  rev:        revision info object
631
        :param  max_chars:  maximum length of resulting string
632
        :return:            formatted truncated string
633
        """
634
        out = []
635
        if revno:
636
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
637
            out.append("%s:" % revno)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
638
        out.append(self.truncate(self.short_committer(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
639
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
640
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
641
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
642
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
643
1185.12.27 by Aaron Bentley
Use line log for pending merges
644
def line_log(rev, max_chars):
645
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
646
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
647
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
648
649
class LogFormatterRegistry(registry.Registry):
650
    """Registry for log formatters"""
651
652
    def make_formatter(self, name, *args, **kwargs):
653
        """Construct a formatter from arguments.
654
655
        :param name: Name of the formatter to construct.  'short', 'long' and
656
            'line' are built-in.
657
        """
658
        return self.get(name)(*args, **kwargs)
659
660
    def get_default(self, branch):
661
        return self.get(branch.get_config().log_format())
662
663
664
log_formatter_registry = LogFormatterRegistry()
665
666
667
log_formatter_registry.register('short', ShortLogFormatter,
668
                                'Moderately short log format')
669
log_formatter_registry.register('long', LongLogFormatter,
670
                                'Detailed log format')
671
log_formatter_registry.register('line', LineLogFormatter,
672
                                'Log format with one line per revision')
673
794 by Martin Pool
- Merge John's nice short-log format.
674
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
675
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
676
    log_formatter_registry.register(name, formatter)
677
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
678
794 by Martin Pool
- Merge John's nice short-log format.
679
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
680
    """Construct a formatter from arguments.
681
1185.12.27 by Aaron Bentley
Use line log for pending merges
682
    name -- Name of the formatter to construct; currently 'long', 'short' and
683
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
684
    """
794 by Martin Pool
- Merge John's nice short-log format.
685
    from bzrlib.errors import BzrCommandError
686
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
687
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
688
    except KeyError:
794 by Martin Pool
- Merge John's nice short-log format.
689
        raise BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
690
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
691
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
692
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
693
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
694
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
695
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
696
2490.1.4 by John Arbash Meinel
Update bzrlib.log.show_changed_revisions to use the new api
697
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
698
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
699
    """Show the change in revision history comparing the old revision history to the new one.
700
701
    :param branch: The branch where the revisions exist
702
    :param old_rh: The old revision history
703
    :param new_rh: The new revision history
704
    :param to_file: A file to write the results to. If None, stdout will be used
705
    """
706
    if to_file is None:
707
        import sys
708
        import codecs
709
        import bzrlib
710
        to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
711
    lf = log_formatter(log_format,
712
                       show_ids=False,
713
                       to_file=to_file,
714
                       show_timezone='original')
715
716
    # This is the first index which is different between
717
    # old and new
718
    base_idx = None
719
    for i in xrange(max(len(new_rh),
720
                        len(old_rh))):
721
        if (len(new_rh) <= i
722
            or len(old_rh) <= i
723
            or new_rh[i] != old_rh[i]):
724
            base_idx = i
725
            break
726
727
    if base_idx is None:
728
        to_file.write('Nothing seems to have changed\n')
729
        return
730
    ## TODO: It might be nice to do something like show_log
731
    ##       and show the merged entries. But since this is the
732
    ##       removed revisions, it shouldn't be as important
733
    if base_idx < len(old_rh):
734
        to_file.write('*'*60)
735
        to_file.write('\nRemoved Revisions:\n')
736
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
737
            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
738
            lr = LogRevision(rev, i+1, 0, None)
739
            lf.log_revision(lr)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
740
        to_file.write('*'*60)
741
        to_file.write('\n\n')
742
    if base_idx < len(new_rh):
743
        to_file.write('Added Revisions:\n')
744
        show_log(branch,
745
                 lf,
746
                 None,
747
                 verbose=True,
748
                 direction='forward',
749
                 start_revision=base_idx+1,
750
                 end_revision=len(new_rh),
751
                 search=None)
752