← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Aaron Bentley
  • Date: 2005-10-13 15:23:50 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@panoramicfeedback.com-20051013152350-2b1ad39d05212ae3
Avoid gathering merge info if log formatter can't display it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
228
228
                continue
229
229
 
230
230
        lf.show(revno, rev, delta)
231
 
        if revno == 1:
232
 
            excludes = set()
233
 
        else:
234
 
            # revno is 1 based, so -2 to get back 1 less.
235
 
            excludes = set(branch.get_ancestry(revision_history[revno - 2]))
236
 
        pending = list(rev.parent_ids)
237
 
        while pending:
238
 
            rev_id = pending.pop()
239
 
            if rev_id in excludes:
240
 
                continue
241
 
            # prevent showing merged revs twice if they multi-path.
242
 
            excludes.add(rev_id)
243
 
            try:
244
 
                rev = branch.get_revision(rev_id)
245
 
            except errors.NoSuchRevision:
246
 
                continue
247
 
            pending.extend(rev.parent_ids)
248
 
            lf.show_merge(rev)
 
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)
249
250
 
250
251
 
251
252
def deltas_for_log_dummy(branch, which_revs):
341
342
    def show(self, revno, rev, delta):
342
343
        raise NotImplementedError('not implemented in abstract base')
343
344
 
344
 
    def show_merge(self, rev):
345
 
        pass
346
 
 
347
345
    
348
346
class LongLogFormatter(LogFormatter):
349
347
    def show(self, revno, rev, delta):