/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Alexander Belchenko
  • Date: 2007-04-12 11:12:26 UTC
  • mto: This revision was merged to the branch mainline in revision 2439.
  • Revision ID: bialix@ukr.net-20070412111226-acm9l3u82mxajriw
Slightly reworked: use None instead of [] as default tags list; PEP-8

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
273
273
                delta = None
274
274
 
275
275
            if use_tags:
276
 
                lf.show(revno, rev, delta, rev_tag_dict.get(rev_id, []))
 
276
                lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
277
277
            else:
278
278
                lf.show(revno, rev, delta)
279
279
        else:
281
281
                lf.show_merge(rev, merge_depth)
282
282
            else:
283
283
                if use_tags:
284
 
                    lf.show_merge_revno(rev, merge_depth, revno, rev_tag_dict.get(rev_id, []))
 
284
                    lf.show_merge_revno(rev, merge_depth, revno,
 
285
                                        rev_tag_dict.get(rev_id))
285
286
                else:
286
287
                    lf.show_merge_revno(rev, merge_depth, revno)
287
288
 
355
356
    
356
357
    
357
358
class LongLogFormatter(LogFormatter):
358
 
    def show(self, revno, rev, delta, tags=[]):
 
359
    supports_tags = True    # must exist and be True
 
360
                            # if this log formatter support tags.
 
361
                            # .show() and .show_merge_revno() must then accept
 
362
                            # the 'tags'-argument with list of tags
 
363
 
 
364
    def show(self, revno, rev, delta, tags=None):
359
365
        return self._show_helper(revno=revno, rev=rev, delta=delta, tags=tags)
360
 
        
361
 
    def supports_tags(self):
362
 
        """must exist if this log formatter support tags
363
 
           show and show_merge_revno must then accept the 'tags'-argument """
364
 
        pass
365
366
 
366
367
    @deprecated_method(zero_eleven)
367
368
    def show_merge(self, rev, merge_depth):
368
 
        return self._show_helper(rev=rev, indent='    '*merge_depth, merged=True, delta=None)
 
369
        return self._show_helper(rev=rev, indent='    '*merge_depth,
 
370
                                 merged=True, delta=None)
369
371
 
370
 
    def show_merge_revno(self, rev, merge_depth, revno, tags=[]):
 
372
    def show_merge_revno(self, rev, merge_depth, revno, tags=None):
371
373
        """Show a merged revision rev, with merge_depth and a revno."""
372
374
        return self._show_helper(rev=rev, revno=revno,
373
375
            indent='    '*merge_depth, merged=True, delta=None, tags=tags)
374
376
 
375
 
    def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None, tags=[]):
 
377
    def _show_helper(self, rev=None, revno=None, indent='', merged=False,
 
378
                     delta=None, tags=None):
376
379
        """Show a revision, either merged or not."""
377
380
        from bzrlib.osutils import format_date
378
381
        to_file = self.to_file