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