~bzr-pqm/bzr/bzr.dev

369 by Martin Pool
- Split out log printing into new show_log function
1
# Copyright (C) 2005 Canonical Ltd
2
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.
7
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.
12
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
52
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
53
import bzrlib.errors as errors
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
54
from bzrlib.tree import EmptyTree
55
from bzrlib.delta import compare_trees
56
from bzrlib.trace import mutter
1185.12.25 by Aaron Bentley
Added one-line log format
57
import re
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
58
375 by Martin Pool
- New command touching-revisions and function to trace
59
60
def find_touching_revisions(branch, file_id):
61
    """Yield a description of revisions which affect the file_id.
62
63
    Each returned element is (revno, revision_id, description)
64
65
    This is the list of revisions where the file is either added,
66
    modified, renamed or deleted.
67
68
    TODO: Perhaps some way to limit this to only particular revisions,
522 by Martin Pool
todo
69
    or to traverse a non-mainline set of revisions?
375 by Martin Pool
- New command touching-revisions and function to trace
70
    """
71
    last_ie = None
72
    last_path = None
73
    revno = 1
74
    for revision_id in branch.revision_history():
75
        this_inv = branch.get_revision_inventory(revision_id)
76
        if file_id in this_inv:
77
            this_ie = this_inv[file_id]
78
            this_path = this_inv.id2path(file_id)
79
        else:
80
            this_ie = this_path = None
81
82
        # now we know how it was last time, and how it is in this revision.
83
        # are those two states effectively the same or not?
84
85
        if not this_ie and not last_ie:
86
            # not present in either
87
            pass
88
        elif this_ie and not last_ie:
89
            yield revno, revision_id, "added " + this_path
90
        elif not this_ie and last_ie:
91
            # deleted here
92
            yield revno, revision_id, "deleted " + last_path
93
        elif this_path != last_path:
94
            yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))
95
        elif (this_ie.text_size != last_ie.text_size
96
              or this_ie.text_sha1 != last_ie.text_sha1):
97
            yield revno, revision_id, "modified " + this_path
98
99
        last_ie = this_ie
100
        last_path = this_path
101
        revno += 1
102
103
527 by Martin Pool
- refactor log command
104
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
105
def _enumerate_history(branch):
106
    rh = []
107
    revno = 1
108
    for rev_id in branch.revision_history():
109
        rh.append((revno, rev_id))
110
        revno += 1
111
    return rh
112
113
1393.1.56 by Martin Pool
- doc and small refactoring of log code
114
def _get_revision_delta(branch, revno):
115
    """Return the delta for a mainline revision.
116
    
117
    This is used to show summaries in verbose logs, and also for finding 
118
    revisions which touch a given file."""
119
    # XXX: What are we supposed to do when showing a summary for something 
120
    # other than a mainline revision.  The delta to it's first parent, or
121
    # (more useful) the delta to a nominated other revision.
122
    return branch.get_revision_delta(revno)
123
124
378 by Martin Pool
- New usage bzr log FILENAME
125
def show_log(branch,
794 by Martin Pool
- Merge John's nice short-log format.
126
             lf,
527 by Martin Pool
- refactor log command
127
             specific_fileid=None,
378 by Martin Pool
- New usage bzr log FILENAME
128
             verbose=False,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
129
             direction='reverse',
130
             start_revision=None,
900 by Martin Pool
- patch from john to search for matching commits
131
             end_revision=None,
132
             search=None):
369 by Martin Pool
- Split out log printing into new show_log function
133
    """Write out human-readable log of commits to this branch.
134
794 by Martin Pool
- Merge John's nice short-log format.
135
    lf
136
        LogFormatter object to show the output.
137
527 by Martin Pool
- refactor log command
138
    specific_fileid
378 by Martin Pool
- New usage bzr log FILENAME
139
        If true, list only the commits affecting the specified
140
        file, rather than all commits.
141
369 by Martin Pool
- Split out log printing into new show_log function
142
    verbose
143
        If true show added/changed/deleted/renamed files.
144
527 by Martin Pool
- refactor log command
145
    direction
146
        'reverse' (default) is latest to earliest;
147
        'forward' is earliest to latest.
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
148
149
    start_revision
150
        If not None, only show revisions >= start_revision
151
152
    end_revision
153
        If not None, only show revisions <= end_revision
369 by Martin Pool
- Split out log printing into new show_log function
154
    """
1417.1.7 by Robert Collins
teach log it needs a read lock
155
    branch.lock_read()
156
    try:
157
        _show_log(branch, lf, specific_fileid, verbose, direction,
158
                  start_revision, end_revision, search)
159
    finally:
160
        branch.unlock()
161
    
162
def _show_log(branch,
163
             lf,
164
             specific_fileid=None,
165
             verbose=False,
166
             direction='reverse',
167
             start_revision=None,
168
             end_revision=None,
169
             search=None):
170
    """Worker function for show_log - see show_log."""
794 by Martin Pool
- Merge John's nice short-log format.
171
    from bzrlib.osutils import format_date
172
    from bzrlib.errors import BzrCheckError
173
    from bzrlib.textui import show_status
174
    
175
    from warnings import warn
369 by Martin Pool
- Split out log printing into new show_log function
176
794 by Martin Pool
- Merge John's nice short-log format.
177
    if not isinstance(lf, LogFormatter):
178
        warn("not a LogFormatter instance: %r" % lf)
533 by Martin Pool
- fix up asking for the log for the root of a remote branch
179
180
    if specific_fileid:
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
181
        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
182
900 by Martin Pool
- patch from john to search for matching commits
183
    if search is not None:
184
        import re
185
        searchRE = re.compile(search, re.IGNORECASE)
186
    else:
187
        searchRE = None
188
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
189
    which_revs = _enumerate_history(branch)
190
    
191
    if start_revision is None:
192
        start_revision = 1
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
193
    else:
194
        branch.check_real_revno(start_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
195
    
196
    if end_revision is None:
197
        end_revision = len(which_revs)
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
198
    else:
199
        branch.check_real_revno(end_revision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
200
201
    # list indexes are 0-based; revisions are 1-based
202
    cut_revs = which_revs[(start_revision-1):(end_revision)]
203
204
    if direction == 'reverse':
205
        cut_revs.reverse()
206
    elif direction == 'forward':
207
        pass
208
    else:
209
        raise ValueError('invalid direction %r' % direction)
210
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
211
    revision_history = branch.revision_history()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
212
    for revno, rev_id in cut_revs:
213
        if verbose or specific_fileid:
1393.1.56 by Martin Pool
- doc and small refactoring of log code
214
            delta = _get_revision_delta(branch, revno)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
215
            
532 by Martin Pool
- put back support for log on specific files
216
        if specific_fileid:
217
            if not delta.touches_file_id(specific_fileid):
218
                continue
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
219
532 by Martin Pool
- put back support for log on specific files
220
        if not verbose:
221
            # although we calculated it, throw it away without display
222
            delta = None
794 by Martin Pool
- Merge John's nice short-log format.
223
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
224
        rev = branch.get_revision(rev_id)
225
226
        if searchRE:
227
            if not searchRE.search(rev.message):
228
                continue
229
230
        lf.show(revno, rev, delta)
1185.12.26 by Aaron Bentley
Avoid gathering merge info if log formatter can't display it.
231
        if hasattr(lf, 'show_merge'):
232
            if revno == 1:
233
                excludes = set()
234
            else:
235
                # revno is 1 based, so -2 to get back 1 less.
236
                excludes = set(branch.get_ancestry(revision_history[revno - 2]))
237
            pending = list(rev.parent_ids)
238
            while pending:
239
                rev_id = pending.pop()
240
                if rev_id in excludes:
241
                    continue
242
                # prevent showing merged revs twice if they multi-path.
243
                excludes.add(rev_id)
244
                try:
245
                    rev = branch.get_revision(rev_id)
246
                except errors.NoSuchRevision:
247
                    continue
248
                pending.extend(rev.parent_ids)
249
                lf.show_merge(rev)
527 by Martin Pool
- refactor log command
250
530 by Martin Pool
- put back verbose log support for reversed logs
251
252
def deltas_for_log_dummy(branch, which_revs):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
253
    """Return all the revisions without intermediate deltas.
254
255
    Useful for log commands that won't need the delta information.
256
    """
257
    
530 by Martin Pool
- put back verbose log support for reversed logs
258
    for revno, revision_id in which_revs:
259
        yield revno, branch.get_revision(revision_id), None
260
261
262
def deltas_for_log_reverse(branch, which_revs):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
263
    """Compute deltas for display in latest-to-earliest order.
264
265
    branch
266
        Branch to traverse
267
268
    which_revs
269
        Sequence of (revno, revision_id) for the subset of history to examine
270
271
    returns 
272
        Sequence of (revno, rev, delta)
530 by Martin Pool
- put back verbose log support for reversed logs
273
274
    The delta is from the given revision to the next one in the
275
    sequence, which makes sense if the log is being displayed from
276
    newest to oldest.
277
    """
278
    last_revno = last_revision_id = last_tree = None
279
    for revno, revision_id in which_revs:
280
        this_tree = branch.revision_tree(revision_id)
281
        this_revision = branch.get_revision(revision_id)
282
        
283
        if last_revno:
284
            yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
285
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
286
        this_tree = EmptyTree(branch.get_root_id())
287
530 by Martin Pool
- put back verbose log support for reversed logs
288
        last_revno = revno
289
        last_revision = this_revision
290
        last_tree = this_tree
291
292
    if last_revno:
805 by Martin Pool
Merge John's log patch:
293
        if last_revno == 1:
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
294
            this_tree = EmptyTree(branch.get_root_id())
805 by Martin Pool
Merge John's log patch:
295
        else:
296
            this_revno = last_revno - 1
297
            this_revision_id = branch.revision_history()[this_revno]
298
            this_tree = branch.revision_tree(this_revision_id)
530 by Martin Pool
- put back verbose log support for reversed logs
299
        yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
300
301
805 by Martin Pool
Merge John's log patch:
302
def deltas_for_log_forward(branch, which_revs):
303
    """Compute deltas for display in forward log.
304
305
    Given a sequence of (revno, revision_id) pairs, return
306
    (revno, rev, delta).
307
308
    The delta is from the given revision to the next one in the
309
    sequence, which makes sense if the log is being displayed from
310
    newest to oldest.
311
    """
312
    last_revno = last_revision_id = last_tree = None
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
313
    prev_tree = EmptyTree(branch.get_root_id())
314
805 by Martin Pool
Merge John's log patch:
315
    for revno, revision_id in which_revs:
316
        this_tree = branch.revision_tree(revision_id)
317
        this_revision = branch.get_revision(revision_id)
318
319
        if not last_revno:
320
            if revno == 1:
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
321
                last_tree = EmptyTree(branch.get_root_id())
805 by Martin Pool
Merge John's log patch:
322
            else:
323
                last_revno = revno - 1
324
                last_revision_id = branch.revision_history()[last_revno]
325
                last_tree = branch.revision_tree(last_revision_id)
326
327
        yield revno, this_revision, compare_trees(last_tree, this_tree, False)
328
329
        last_revno = revno
330
        last_revision = this_revision
331
        last_tree = this_tree
530 by Martin Pool
- put back verbose log support for reversed logs
332
527 by Martin Pool
- refactor log command
333
794 by Martin Pool
- Merge John's nice short-log format.
334
class LogFormatter(object):
335
    """Abstract class to display log messages."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
336
    def __init__(self, to_file, show_ids=False, show_timezone='original'):
794 by Martin Pool
- Merge John's nice short-log format.
337
        self.to_file = to_file
338
        self.show_ids = show_ids
339
        self.show_timezone = show_timezone
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
340
341
342
    def show(self, revno, rev, delta):
343
        raise NotImplementedError('not implemented in abstract base')
1393.1.56 by Martin Pool
- doc and small refactoring of log code
344
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
345
    def short_committer(self, rev):
346
        return re.sub('<.*@.*>', '', rev.committer).strip(' ')
347
    
1393.1.56 by Martin Pool
- doc and small refactoring of log code
348
    
794 by Martin Pool
- Merge John's nice short-log format.
349
class LongLogFormatter(LogFormatter):
350
    def show(self, revno, rev, delta):
1185.35.18 by Aaron Bentley
Refactored long-format log printing
351
        return self._show_helper(revno=revno, rev=rev)
794 by Martin Pool
- Merge John's nice short-log format.
352
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
353
    def show_merge(self, rev):
1185.35.18 by Aaron Bentley
Refactored long-format log printing
354
        return self._show_helper(rev=rev, indent='    ', merged=True)
355
356
    def _show_helper(self, rev=None, revno=None, indent='', merged=False):
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
357
        from osutils import format_date
358
359
        to_file = self.to_file
360
361
362
        print >>to_file,  indent+'-' * 60
1185.35.18 by Aaron Bentley
Refactored long-format log printing
363
        if revno is not None:
364
            print >>to_file,  'revno:', revno
365
        if merged:
366
            print >>to_file,  indent+'merged:', rev.revision_id
367
        elif self.show_ids:
368
            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.
369
        if self.show_ids:
370
            for parent_id in rev.parent_ids:
371
                print >>to_file, indent+'parent:', parent_id
372
            
373
        print >>to_file,  indent+'committer:', rev.committer
1185.35.17 by Aaron Bentley
Added branch nicks to long-format logs
374
        try:
375
            print >>to_file, indent+'branch nick: %s' % \
376
                rev.properties['branch-nick']
377
        except KeyError:
378
            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.
379
380
        date_str = format_date(rev.timestamp,
381
                               rev.timezone or 0,
382
                               self.show_timezone)
383
        print >>to_file,  indent+'timestamp: %s' % date_str
384
385
        print >>to_file,  indent+'message:'
386
        if not rev.message:
387
            print >>to_file,  indent+'  (no message)'
388
        else:
389
            for l in rev.message.split('\n'):
390
                print >>to_file,  indent+'  ' + l
794 by Martin Pool
- Merge John's nice short-log format.
391
392
393
class ShortLogFormatter(LogFormatter):
394
    def show(self, revno, rev, delta):
395
        from bzrlib.osutils import format_date
396
397
        to_file = self.to_file
1185.12.25 by Aaron Bentley
Added one-line log format
398
        date_str = format_date(rev.timestamp, rev.timezone or 0,
399
                            self.show_timezone)
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
400
        print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev),
794 by Martin Pool
- Merge John's nice short-log format.
401
                format_date(rev.timestamp, rev.timezone or 0,
1185.35.19 by Aaron Bentley
Tweaked short-log as Meinel suggested
402
                            self.show_timezone, date_fmt="%Y-%m-%d",
403
                           show_offset=False))
794 by Martin Pool
- Merge John's nice short-log format.
404
        if self.show_ids:
405
            print >>to_file,  '      revision-id:', rev.revision_id
406
        if not rev.message:
407
            print >>to_file,  '      (no message)'
408
        else:
409
            for l in rev.message.split('\n'):
410
                print >>to_file,  '      ' + l
411
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
412
        # TODO: Why not show the modified files in a shorter form as
413
        # well? rewrap them single lines of appropriate length
794 by Martin Pool
- Merge John's nice short-log format.
414
        if delta != None:
415
            delta.show(to_file, self.show_ids)
416
        print
417
1185.12.25 by Aaron Bentley
Added one-line log format
418
class LineLogFormatter(LogFormatter):
419
    def truncate(self, str, max_len):
420
        if len(str) <= max_len:
421
            return str
422
        return str[:max_len-3]+'...'
423
424
    def date_string(self, rev):
425
        from bzrlib.osutils import format_date
426
        return format_date(rev.timestamp, rev.timezone or 0, 
427
                           self.show_timezone, date_fmt="%Y-%m-%d",
428
                           show_offset=False)
429
430
    def message(self, rev):
431
        if not rev.message:
432
            return '(no message)'
433
        else:
434
            return rev.message
435
436
    def show(self, revno, rev, delta):
437
        print >> self.to_file, self.log_string(rev, 79) 
438
439
    def log_string(self, rev, max_chars):
440
        out = [self.truncate(self.short_committer(rev), 20)]
441
        out.append(self.date_string(rev))
442
        out.append(self.message(rev).replace('\n', ' '))
443
        return self.truncate(" ".join(out).rstrip('\n'), max_chars)
794 by Martin Pool
- Merge John's nice short-log format.
444
1185.12.27 by Aaron Bentley
Use line log for pending merges
445
def line_log(rev, max_chars):
446
    lf = LineLogFormatter(None)
447
    return lf.log_string(rev, max_chars)
448
794 by Martin Pool
- Merge John's nice short-log format.
449
FORMATTERS = {'long': LongLogFormatter,
450
              'short': ShortLogFormatter,
1185.12.25 by Aaron Bentley
Added one-line log format
451
              'line': LineLogFormatter,
794 by Martin Pool
- Merge John's nice short-log format.
452
              }
453
454
455
def log_formatter(name, *args, **kwargs):
1393.1.56 by Martin Pool
- doc and small refactoring of log code
456
    """Construct a formatter from arguments.
457
1185.12.27 by Aaron Bentley
Use line log for pending merges
458
    name -- Name of the formatter to construct; currently 'long', 'short' and
459
        'line' are supported.
1393.1.56 by Martin Pool
- doc and small refactoring of log code
460
    """
794 by Martin Pool
- Merge John's nice short-log format.
461
    from bzrlib.errors import BzrCommandError
462
    try:
463
        return FORMATTERS[name](*args, **kwargs)
464
    except IndexError:
465
        raise BzrCommandError("unknown log formatter: %r" % name)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
466
467
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
468
    # deprecated; for compatability
469
    lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
470
    lf.show(revno, rev, delta)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
471
472
def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
473
    """Show the change in revision history comparing the old revision history to the new one.
474
475
    :param branch: The branch where the revisions exist
476
    :param old_rh: The old revision history
477
    :param new_rh: The new revision history
478
    :param to_file: A file to write the results to. If None, stdout will be used
479
    """
480
    if to_file is None:
481
        import sys
482
        import codecs
483
        import bzrlib
484
        to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
485
    lf = log_formatter(log_format,
486
                       show_ids=False,
487
                       to_file=to_file,
488
                       show_timezone='original')
489
490
    # This is the first index which is different between
491
    # old and new
492
    base_idx = None
493
    for i in xrange(max(len(new_rh),
494
                        len(old_rh))):
495
        if (len(new_rh) <= i
496
            or len(old_rh) <= i
497
            or new_rh[i] != old_rh[i]):
498
            base_idx = i
499
            break
500
501
    if base_idx is None:
502
        to_file.write('Nothing seems to have changed\n')
503
        return
504
    ## TODO: It might be nice to do something like show_log
505
    ##       and show the merged entries. But since this is the
506
    ##       removed revisions, it shouldn't be as important
507
    if base_idx < len(old_rh):
508
        to_file.write('*'*60)
509
        to_file.write('\nRemoved Revisions:\n')
510
        for i in range(base_idx, len(old_rh)):
511
            rev = branch.get_revision(old_rh[i])
512
            lf.show(i+1, rev, None)
513
        to_file.write('*'*60)
514
        to_file.write('\n\n')
515
    if base_idx < len(new_rh):
516
        to_file.write('Added Revisions:\n')
517
        show_log(branch,
518
                 lf,
519
                 None,
520
                 verbose=True,
521
                 direction='forward',
522
                 start_revision=base_idx+1,
523
                 end_revision=len(new_rh),
524
                 search=None)
525