comparison rhodecode/lib/helpers.py @ 3540:6e8027c2f49c beta

Merge
author Leonardo <leo@unity3d.com>
date Mon, 11 Mar 2013 17:09:43 +0100
parents ed48d17836a4 71fa9a198ac3
children 58dcef7eef03
comparison
equal deleted inserted replaced
3539:c65b440540da 3540:6e8027c2f49c
548 if parse_cs: 548 if parse_cs:
549 return link_to(lbl, _url, title=title, class_='tooltip') 549 return link_to(lbl, _url, title=title, class_='tooltip')
550 return link_to(lbl, _url, raw_id=rev.raw_id, repo_name=repo_name, 550 return link_to(lbl, _url, raw_id=rev.raw_id, repo_name=repo_name,
551 class_='lazy-cs' if lazy_cs else '') 551 class_='lazy-cs' if lazy_cs else '')
552 552
553 def _get_op(rev_txt):
554 _op = None
555 _name = rev_txt
556 if len(rev_txt.split('=>')) == 2:
557 _op, _name = rev_txt.split('=>')
558 return _op, _name
559
553 revs = [] 560 revs = []
554 if len(filter(lambda v: v != '', revs_ids)) > 0: 561 if len(filter(lambda v: v != '', revs_ids)) > 0:
555 repo = None 562 repo = None
556 for rev in revs_ids[:revs_top_limit]: 563 for rev in revs_ids[:revs_top_limit]:
557 _op = _name = None 564 _op, _name = _get_op(rev)
558 if len(rev.split('=>')) == 2:
559 _op, _name = rev.split('=>')
560 565
561 # we want parsed changesets, or new log store format is bad 566 # we want parsed changesets, or new log store format is bad
562 if parse_cs: 567 if parse_cs:
563 try: 568 try:
564 if repo is None: 569 if repo is None:
581 cs_links = [] 586 cs_links = []
582 cs_links.append(" " + ', '.join( 587 cs_links.append(" " + ', '.join(
583 [lnk(rev, repo_name) for rev in revs[:revs_limit]] 588 [lnk(rev, repo_name) for rev in revs[:revs_limit]]
584 ) 589 )
585 ) 590 )
591 _op1, _name1 = _get_op(revs_ids[0])
592 _op2, _name2 = _get_op(revs_ids[-1])
593
594 _rev = '%s...%s' % (_name1, _name2)
586 595
587 compare_view = ( 596 compare_view = (
588 ' <div class="compare_view tooltip" title="%s">' 597 ' <div class="compare_view tooltip" title="%s">'
589 '<a href="%s">%s</a> </div>' % ( 598 '<a href="%s">%s</a> </div>' % (
590 _('Show all combined changesets %s->%s') % ( 599 _('Show all combined changesets %s->%s') % (
591 revs_ids[0][:12], revs_ids[-1][:12] 600 revs_ids[0][:12], revs_ids[-1][:12]
592 ), 601 ),
593 url('changeset_home', repo_name=repo_name, 602 url('changeset_home', repo_name=repo_name,
594 revision='%s...%s' % (revs_ids[0], revs_ids[-1]) 603 revision=_rev
595 ), 604 ),
596 _('compare view') 605 _('compare view')
597 ) 606 )
598 ) 607 )
599 608