/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
369 by Martin Pool
- Split out log printing into new show_log function
1
# Copyright (C) 2005 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
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
57
from bzrlib import(
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
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
62
from bzrlib.symbol_versioning import deprecated_method, zero_eleven
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
63
from bzrlib.trace import mutter
64
from bzrlib.tsort import merge_sort
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
65
375 by Martin Pool
- New command touching-revisions and function to trace
66
67
def find_touching_revisions(branch, file_id):
68
    """Yield a description of revisions which affect the file_id.
69
70
    Each returned element is (revno, revision_id, description)
71
72
    This is the list of revisions where the file is either added,
73
    modified, renamed or deleted.
74
75
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
76
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
77
    """
78
    last_ie = None
79
    last_path = None
80
    revno = 1
81
    for revision_id in branch.revision_history():
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
82
        this_inv = branch.repository.get_revision_inventory(revision_id)
375 by Martin Pool
- New command touching-revisions and function to trace
83
        if file_id in this_inv:
84
            this_ie = this_inv[file_id]
85
            this_path = this_inv.id2path(file_id)
86
        else:
87
            this_ie = this_path = None
88
89
        # now we know how it was last time, and how it is in this revision.
90
        # are those two states effectively the same or not?
91
92
        if not this_ie and not last_ie:
93
            # not present in either
94
            pass
95
        elif this_ie and not last_ie:
96
            yield revno, revision_id, "added " + this_path
97
        elif not this_ie and last_ie:
98
            # deleted here
99
            yield revno, revision_id, "deleted " + last_path
100
        elif this_path != last_path:
101
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
102
        elif (this_ie.text_size != last_ie.text_size
103
              or this_ie.text_sha1 != last_ie.text_sha1):
104
            yield revno, revision_id, "modified " + this_path
105
106
        last_ie = this_ie
107
        last_path = this_path
108
        revno += 1
109
110
527 by Martin Pool
- refactor log command
111
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
112
def _enumerate_history(branch):
113
    rh = []
114
    revno = 1
115
    for rev_id in branch.revision_history():
116
        rh.append((revno, rev_id))
117
        revno += 1
118
    return rh
119
120
378 by Martin Pool
- New usage bzr log FILENAME
121
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
122
             lf,
527 by Martin Pool
- refactor log command
123
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
124
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
125
             direction='reverse',
126
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
127
             end_revision=None,
128
             search=None):
369 by Martin Pool
- Split out log printing into new show_log function
129
    """Write out human-readable log of commits to this branch.
130
794 by Martin Pool
- Merge John's nice short-log format.
131
    lf
132
        LogFormatter object to show the output.
133
527 by Martin Pool
- refactor log command
134
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
135
        If true, list only the commits affecting the specified
136
        file, rather than all commits.
137
369 by Martin Pool
- Split out log printing into new show_log function
138
    verbose
139
        If true show added/changed/deleted/renamed files.
140
527 by Martin Pool
- refactor log command
141
    direction
142
        'reverse' (default) is latest to earliest;
143
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
144
145
    start_revision
146
        If not None, only show revisions >= start_revision
147
148
    end_revision
149
        If not None, only show revisions <= end_revision
369 by Martin Pool
- Split out log printing into new show_log function
150
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
151
    branch.lock_read()
152
    try:
1756.1.6 by Aaron Bentley
Revert locking fix
153
        _show_log(branch, lf, specific_fileid, verbose, direction,
154
                  start_revision, end_revision, search)
1417.1.7 by Robert Collins
teach log it needs a read lock
155
    finally:
156
        branch.unlock()
157
    
158
def _show_log(branch,
159
             lf,
160
             specific_fileid=None,
161
             verbose=False,
162
             direction='reverse',
163
             start_revision=None,
164
             end_revision=None,
165
             search=None):
166
    """Worker function for show_log - see show_log."""
794 by Martin Pool
- Merge John's nice short-log format.
167
    from bzrlib.osutils import format_date
168
    from bzrlib.errors import BzrCheckError
169
    
170
    from warnings import warn
369 by Martin Pool
- Split out log printing into new show_log function
171
794 by Martin Pool
- Merge John's nice short-log format.
172
    if not isinstance(lf, LogFormatter):
173
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
174
175
    if specific_fileid:
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
176
        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
177
900 by Martin Pool
- patch from john to search for matching commits
178
    if search is not None:
179
        import re
180
        searchRE = re.compile(search, re.IGNORECASE)
181
    else:
182
        searchRE = None
183
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
184
    which_revs = _enumerate_history(branch)
185
    
186
    if start_revision is None:
187
        start_revision = 1
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
188
    else:
189
        branch.check_real_revno(start_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
190
    
191
    if end_revision is None:
192
        end_revision = len(which_revs)
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
193
    else:
194
        branch.check_real_revno(end_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
195
196
    # list indexes are 0-based; revisions are 1-based
197
    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.
198
    if not cut_revs:
199
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
200
201
    # convert the revision history to a dictionary:
1756.2.27 by Aaron Bentley
Tweak rev_nos style
202
    rev_nos = dict((k, v) for v, k in cut_revs)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
203
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
204
    # override the mainline to look like the revision history.
205
    mainline_revs = [revision_id for index, revision_id in cut_revs]
206
    if cut_revs[0][0] == 1:
207
        mainline_revs.insert(0, None)
208
    else:
209
        mainline_revs.insert(0, which_revs[start_revision-2][1])
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
210
    # how should we show merged revisions ?
211
    # old api: show_merge. New api: show_merge_revno
212
    show_merge_revno = getattr(lf, 'show_merge_revno', None)
213
    show_merge = getattr(lf, 'show_merge', None)
214
    if show_merge is None and show_merge_revno is None:
215
        # no merged-revno support
216
        include_merges = False
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
217
    else:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
218
        include_merges = True
219
    if show_merge is not None and show_merge_revno is None:
220
        # tell developers to update their code
221
        symbol_versioning.warn('LogFormatters should provide show_merge_revno '
222
            'instead of show_merge since bzr 0.11.',
223
            DeprecationWarning, stacklevel=3)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
224
    view_revisions = list(get_view_revisions(mainline_revs, rev_nos, branch,
1756.2.22 by Aaron Bentley
Apply review comments
225
                          direction, include_merges=include_merges))
2388.1.11 by Alexander Belchenko
changes after John's review
226
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
227
    use_tags = getattr(lf, 'supports_tags', False)
228
    if use_tags:
229
        rev_tag_dict = {}
230
        if branch.supports_tags():
231
            rev_tag_dict = branch.tags.get_reverse_tag_dict()
2388.1.11 by Alexander Belchenko
changes after John's review
232
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
233
    def iter_revisions():
1756.3.22 by Aaron Bentley
Tweaks from review
234
        # r = revision, n = revno, d = merge depth
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
235
        revision_ids = [r for r, n, d in view_revisions]
1756.3.2 by Aaron Bentley
Refactor revision_delta call
236
        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
237
        num = 9
1756.3.22 by Aaron Bentley
Tweaks from review
238
        repository = branch.repository
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
239
        while revision_ids:
1756.3.22 by Aaron Bentley
Tweaks from review
240
            cur_deltas = {}
241
            revisions = repository.get_revisions(revision_ids[:num])
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
242
            if verbose or specific_fileid:
243
                delta_revisions = [r for r in revisions if
244
                                   r.revision_id in zeros]
1756.3.22 by Aaron Bentley
Tweaks from review
245
                deltas = repository.get_deltas_for_revisions(delta_revisions)
246
                cur_deltas = dict(izip((r.revision_id for r in 
247
                                        delta_revisions), deltas))
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
248
            for revision in revisions:
1756.3.22 by Aaron Bentley
Tweaks from review
249
                # The delta value will be None unless
250
                # 1. verbose or specific_fileid is specified, and
251
                # 2. the revision is a mainline revision
1756.3.3 by Aaron Bentley
More refactoring, introduce revision_trees.
252
                yield revision, cur_deltas.get(revision.revision_id)
1756.2.13 by Aaron Bentley
Used scaled iterator to retrive revisions
253
            revision_ids  = revision_ids[num:]
254
            num = int(num * 1.5)
255
            
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
256
    # now we just print all the revisions
1756.3.2 by Aaron Bentley
Refactor revision_delta call
257
    for ((rev_id, revno, merge_depth), (rev, delta)) in \
1756.2.18 by Aaron Bentley
Factor out the revision list generation
258
         izip(view_revisions, iter_revisions()):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
259
260
        if searchRE:
261
            if not searchRE.search(rev.message):
262
                continue
263
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
264
        if merge_depth == 0:
265
            # a mainline revision.
2388.1.11 by Alexander Belchenko
changes after John's review
266
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
267
            if specific_fileid:
268
                if not delta.touches_file_id(specific_fileid):
269
                    continue
2388.1.11 by Alexander Belchenko
changes after John's review
270
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
271
            if not verbose:
272
                # although we calculated it, throw it away without display
273
                delta = None
274
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
275
            if use_tags:
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
276
                lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
277
            else:
278
                lf.show(revno, rev, delta)
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
279
        else:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
280
            if show_merge_revno is None:
281
                lf.show_merge(rev, merge_depth)
282
            else:
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
283
                if use_tags:
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
284
                    lf.show_merge_revno(rev, merge_depth, revno,
285
                                        rev_tag_dict.get(rev_id))
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
286
                else:
287
                    lf.show_merge_revno(rev, merge_depth, revno)
527 by Martin Pool
- refactor log command
288
530 by Martin Pool
- put back verbose log support for reversed logs
289
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
290
def get_view_revisions(mainline_revs, rev_nos, branch, direction,
1756.2.22 by Aaron Bentley
Apply review comments
291
                       include_merges=True):
1756.2.18 by Aaron Bentley
Factor out the revision list generation
292
    """Produce an iterator of revisions to show
293
    :return: an iterator of (revision_id, revno, merge_depth)
294
    (if there is no revno for a revision, None is supplied)
295
    """
1756.2.22 by Aaron Bentley
Apply review comments
296
    if include_merges is False:
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
297
        revision_ids = mainline_revs[1:]
298
        if direction == 'reverse':
299
            revision_ids.reverse()
300
        for revision_id in revision_ids:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
301
            yield revision_id, str(rev_nos[revision_id]), 0
1756.2.20 by Aaron Bentley
Optimize log formats that don't show merges
302
        return
1756.2.18 by Aaron Bentley
Factor out the revision list generation
303
    merge_sorted_revisions = merge_sort(
304
        branch.repository.get_revision_graph(mainline_revs[-1]),
305
        mainline_revs[-1],
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
306
        mainline_revs,
307
        generate_revno=True)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
308
309
    if direction == 'forward':
310
        # forward means oldest first.
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
311
        merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)
1756.2.18 by Aaron Bentley
Factor out the revision list generation
312
    elif direction != 'reverse':
313
        raise ValueError('invalid direction %r' % direction)
314
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
315
    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
316
        yield rev_id, '.'.join(map(str, revno)), merge_depth
1756.2.18 by Aaron Bentley
Factor out the revision list generation
317
318
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
319
def reverse_by_depth(merge_sorted_revisions, _depth=0):
320
    """Reverse revisions by depth.
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
321
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
322
    Revisions with a different depth are sorted as a group with the previous
323
    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
324
    but it looks much nicer.
325
    """
326
    zd_revisions = []
327
    for val in merge_sorted_revisions:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
328
        if val[2] == _depth:
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
329
            zd_revisions.append([val])
330
        else:
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
331
            assert val[2] > _depth
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
332
            zd_revisions[-1].append(val)
1756.2.25 by Aaron Bentley
Sort revisions at each depth, instead of just mainline revisions.
333
    for revisions in zd_revisions:
334
        if len(revisions) > 1:
335
            revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)
1756.2.24 by Aaron Bentley
Forward sorting shows merges under mainline revision
336
    zd_revisions.reverse()
337
    result = []
338
    for chunk in zd_revisions:
339
        result.extend(chunk)
340
    return result
341
342
794 by Martin Pool
- Merge John's nice short-log format.
343
class LogFormatter(object):
344
    """Abstract class to display log messages."""
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
345
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
346
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
347
        self.to_file = to_file
348
        self.show_ids = show_ids
349
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
350
351
    def show(self, revno, rev, delta):
352
        raise NotImplementedError('not implemented in abstract base')
1393.1.56 by Martin Pool
- doc and small refactoring of log code
353
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
354
    def short_committer(self, rev):
355
        return re.sub('<.*@.*>', '', rev.committer).strip(' ')
2388.1.11 by Alexander Belchenko
changes after John's review
356
357
794 by Martin Pool
- Merge John's nice short-log format.
358
class LongLogFormatter(LogFormatter):
2388.1.11 by Alexander Belchenko
changes after John's review
359
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
360
    supports_tags = True    # must exist and be True
361
                            # if this log formatter support tags.
362
                            # .show() and .show_merge_revno() must then accept
363
                            # the 'tags'-argument with list of tags
364
365
    def show(self, revno, rev, delta, tags=None):
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
366
        return self._show_helper(revno=revno, rev=rev, delta=delta, tags=tags)
794 by Martin Pool
- Merge John's nice short-log format.
367
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
368
    @deprecated_method(zero_eleven)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
369
    def show_merge(self, rev, merge_depth):
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
370
        return self._show_helper(rev=rev, indent='    '*merge_depth,
371
                                 merged=True, delta=None)
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
372
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
373
    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,
374
        """Show a merged revision rev, with merge_depth and a revno."""
375
        return self._show_helper(rev=rev, revno=revno,
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
376
            indent='    '*merge_depth, merged=True, delta=None, tags=tags)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
377
2388.1.10 by Alexander Belchenko
Slightly reworked: use None instead of [] as default tags list; PEP-8
378
    def _show_helper(self, rev=None, revno=None, indent='', merged=False,
379
                     delta=None, tags=None):
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
380
        """Show 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)
381
        from bzrlib.osutils import format_date
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
382
        to_file = self.to_file
383
        print >>to_file,  indent+'-' * 60
1185.35.18 by Aaron Bentley
Refactored long-format log printing
384
        if revno is not None:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
385
            print >>to_file,  indent+'revno:', revno
2388.1.8 by Erik Bagfors
Redo based on input from Alexander
386
        if tags:
387
            print >>to_file, indent+'tags: %s' % (', '.join(tags))
1185.35.18 by Aaron Bentley
Refactored long-format log printing
388
        if merged:
389
            print >>to_file,  indent+'merged:', rev.revision_id
390
        elif self.show_ids:
391
            print >>to_file,  indent+'revision-id:', rev.revision_id
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
392
        if self.show_ids:
393
            for parent_id in rev.parent_ids:
394
                print >>to_file, indent+'parent:', parent_id
395
        print >>to_file,  indent+'committer:', rev.committer
2388.1.11 by Alexander Belchenko
changes after John's review
396
1185.35.17 by Aaron Bentley
Added branch nicks to long-format logs
397
        try:
398
            print >>to_file, indent+'branch nick: %s' % \
399
                rev.properties['branch-nick']
400
        except KeyError:
401
            pass
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
402
        date_str = format_date(rev.timestamp,
403
                               rev.timezone or 0,
404
                               self.show_timezone)
405
        print >>to_file,  indent+'timestamp: %s' % date_str
406
407
        print >>to_file,  indent+'message:'
408
        if not rev.message:
409
            print >>to_file,  indent+'  (no message)'
410
        else:
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
411
            message = rev.message.rstrip('\r\n')
412
            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.
413
                print >>to_file,  indent+'  ' + l
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
414
        if delta is not None:
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
415
            delta.show(to_file, self.show_ids)
794 by Martin Pool
- Merge John's nice short-log format.
416
417
418
class ShortLogFormatter(LogFormatter):
419
    def show(self, revno, rev, delta):
420
        from bzrlib.osutils import format_date
421
422
        to_file = self.to_file
1185.12.25 by Aaron Bentley
Added one-line log format
423
        date_str = format_date(rev.timestamp, rev.timezone or 0,
424
                            self.show_timezone)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
425
        print >>to_file, "%5s %s\t%s" % (revno, self.short_committer(rev),
794 by Martin Pool
- Merge John's nice short-log format.
426
                format_date(rev.timestamp, rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
427
                            self.show_timezone, date_fmt="%Y-%m-%d",
428
                           show_offset=False))
794 by Martin Pool
- Merge John's nice short-log format.
429
        if self.show_ids:
430
            print >>to_file,  '      revision-id:', rev.revision_id
431
        if not rev.message:
432
            print >>to_file,  '      (no message)'
433
        else:
1185.31.20 by John Arbash Meinel
Stripping trailing newlines when displaying log messages
434
            message = rev.message.rstrip('\r\n')
435
            for l in message.split('\n'):
794 by Martin Pool
- Merge John's nice short-log format.
436
                print >>to_file,  '      ' + l
437
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
438
        # TODO: Why not show the modified files in a shorter form as
439
        # well? rewrap them single lines of appropriate length
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
440
        if delta is not None:
794 by Martin Pool
- Merge John's nice short-log format.
441
            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.
442
        print >>to_file, ''
794 by Martin Pool
- Merge John's nice short-log format.
443
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
444
1185.12.25 by Aaron Bentley
Added one-line log format
445
class LineLogFormatter(LogFormatter):
446
    def truncate(self, str, max_len):
447
        if len(str) <= max_len:
448
            return str
449
        return str[:max_len-3]+'...'
450
451
    def date_string(self, rev):
452
        from bzrlib.osutils import format_date
453
        return format_date(rev.timestamp, rev.timezone or 0, 
454
                           self.show_timezone, date_fmt="%Y-%m-%d",
455
                           show_offset=False)
456
457
    def message(self, rev):
458
        if not rev.message:
459
            return '(no message)'
460
        else:
461
            return rev.message
462
463
    def show(self, revno, rev, delta):
1704.2.2 by Martin Pool
Detect terminal width using ioctl
464
        from bzrlib.osutils import terminal_width
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
465
        print >> self.to_file, self.log_string(revno, rev, terminal_width()-1)
1185.12.25 by Aaron Bentley
Added one-line log format
466
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
467
    def log_string(self, revno, rev, max_chars):
468
        """Format log info into one string. Truncate tail of string
469
        :param  revno:      revision number (int) or None.
470
                            Revision numbers counts from 1.
471
        :param  rev:        revision info object
472
        :param  max_chars:  maximum length of resulting string
473
        :return:            formatted truncated string
474
        """
475
        out = []
476
        if revno:
477
            # show revno only when is not None
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
478
            out.append("%s:" % revno)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
479
        out.append(self.truncate(self.short_committer(rev), 20))
1185.12.25 by Aaron Bentley
Added one-line log format
480
        out.append(self.date_string(rev))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
481
        out.append(rev.get_summary())
1185.12.25 by Aaron Bentley
Added one-line log format
482
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
483
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
484
1185.12.27 by Aaron Bentley
Use line log for pending merges
485
def line_log(rev, max_chars):
486
    lf = LineLogFormatter(None)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
487
    return lf.log_string(None, rev, max_chars)
1185.12.27 by Aaron Bentley
Use line log for pending merges
488
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
489
490
class LogFormatterRegistry(registry.Registry):
491
    """Registry for log formatters"""
492
493
    def make_formatter(self, name, *args, **kwargs):
494
        """Construct a formatter from arguments.
495
496
        :param name: Name of the formatter to construct.  'short', 'long' and
497
            'line' are built-in.
498
        """
499
        return self.get(name)(*args, **kwargs)
500
501
    def get_default(self, branch):
502
        return self.get(branch.get_config().log_format())
503
504
505
log_formatter_registry = LogFormatterRegistry()
506
507
508
log_formatter_registry.register('short', ShortLogFormatter,
509
                                'Moderately short log format')
510
log_formatter_registry.register('long', LongLogFormatter,
511
                                'Detailed log format')
512
log_formatter_registry.register('line', LineLogFormatter,
513
                                'Log format with one line per revision')
514
794 by Martin Pool
- Merge John's nice short-log format.
515
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
516
def register_formatter(name, formatter):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
517
    log_formatter_registry.register(name, formatter)
518
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
519
794 by Martin Pool
- Merge John's nice short-log format.
520
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
521
    """Construct a formatter from arguments.
522
1185.12.27 by Aaron Bentley
Use line log for pending merges
523
    name -- Name of the formatter to construct; currently 'long', 'short' and
524
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
525
    """
794 by Martin Pool
- Merge John's nice short-log format.
526
    from bzrlib.errors import BzrCommandError
527
    try:
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
528
        return log_formatter_registry.make_formatter(name, *args, **kwargs)
1553.2.2 by Erik Bågfors
Made "unknown log formatter" error message work
529
    except KeyError:
794 by Martin Pool
- Merge John's nice short-log format.
530
        raise BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
531
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
532
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
533
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
534
    # deprecated; for compatibility
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
535
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
536
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
537
538
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
539
    """Show the change in revision history comparing the old revision history to the new one.
540
541
    :param branch: The branch where the revisions exist
542
    :param old_rh: The old revision history
543
    :param new_rh: The new revision history
544
    :param to_file: A file to write the results to. If None, stdout will be used
545
    """
546
    if to_file is None:
547
        import sys
548
        import codecs
549
        import bzrlib
550
        to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
551
    lf = log_formatter(log_format,
552
                       show_ids=False,
553
                       to_file=to_file,
554
                       show_timezone='original')
555
556
    # This is the first index which is different between
557
    # old and new
558
    base_idx = None
559
    for i in xrange(max(len(new_rh),
560
                        len(old_rh))):
561
        if (len(new_rh) <= i
562
            or len(old_rh) <= i
563
            or new_rh[i] != old_rh[i]):
564
            base_idx = i
565
            break
566
567
    if base_idx is None:
568
        to_file.write('Nothing seems to have changed\n')
569
        return
570
    ## TODO: It might be nice to do something like show_log
571
    ##       and show the merged entries. But since this is the
572
    ##       removed revisions, it shouldn't be as important
573
    if base_idx < len(old_rh):
574
        to_file.write('*'*60)
575
        to_file.write('\nRemoved Revisions:\n')
576
        for i in range(base_idx, len(old_rh)):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
577
            rev = branch.repository.get_revision(old_rh[i])
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
578
            lf.show(i+1, rev, None)
579
        to_file.write('*'*60)
580
        to_file.write('\n\n')
581
    if base_idx < len(new_rh):
582
        to_file.write('Added Revisions:\n')
583
        show_log(branch,
584
                 lf,
585
                 None,
586
                 verbose=True,
587
                 direction='forward',
588
                 start_revision=base_idx+1,
589
                 end_revision=len(new_rh),
590
                 search=None)
591