##// END OF EJS Templates
helpers: cleanup of journal action_parser...
Mads Kiilerich -
r5283:d23d70cc default
parent child Browse files
Show More
@@ -353,12 +353,10 b' def pygmentize_annotation(repo_name, fil'
353 author = escape(changeset.author)
353 author = escape(changeset.author)
354 date = changeset.date
354 date = changeset.date
355 message = escape(changeset.message)
355 message = escape(changeset.message)
356
357 tooltip_html = ("<div style='font-size:0.8em'><b>Author:</b>"
356 tooltip_html = ("<div style='font-size:0.8em'><b>Author:</b>"
358 " %s<br/><b>Date:</b> %s</b><br/><b>Message:"
357 " %s<br/><b>Date:</b> %s</b><br/><b>Message:"
359 "</b> %s<br/></div>")
358 "</b> %s<br/></div>") % (author, date, message)
360
359
361 tooltip_html = tooltip_html % (author, date, message)
362 lnk_format = show_id(changeset)
360 lnk_format = show_id(changeset)
363 uri = link_to(
361 uri = link_to(
364 lnk_format,
362 lnk_format,
@@ -618,28 +616,25 b' def action_parser(user_log, feed=False, '
618 repo_name = user_log.repository.repo_name
616 repo_name = user_log.repository.repo_name
619
617
620 def lnk(rev, repo_name):
618 def lnk(rev, repo_name):
619 lazy_cs = False
620 title = None
621 _url = '#'
621 if isinstance(rev, BaseChangeset) or isinstance(rev, AttributeDict):
622 if isinstance(rev, BaseChangeset) or isinstance(rev, AttributeDict):
622 lazy_cs = True
623 if rev.op and rev.ref_name:
623 if getattr(rev, 'op', None) and getattr(rev, 'ref_name', None):
624 lazy_cs = False
625 lbl = '?'
626 if rev.op == 'delete_branch':
624 if rev.op == 'delete_branch':
627 lbl = '%s' % _('Deleted branch: %s') % rev.ref_name
625 lbl = '%s' % _('Deleted branch: %s') % rev.ref_name
628 title = ''
629 elif rev.op == 'tag':
626 elif rev.op == 'tag':
630 lbl = '%s' % _('Created tag: %s') % rev.ref_name
627 lbl = '%s' % _('Created tag: %s') % rev.ref_name
631 title = ''
628 else:
632 _url = '#'
629 lbl = 'Unknown operation %s' % rev.op
633
634 else:
630 else:
635 lbl = '%s' % (rev.short_id[:8])
631 lazy_cs = True
632 lbl = rev.short_id[:8]
636 _url = url('changeset_home', repo_name=repo_name,
633 _url = url('changeset_home', repo_name=repo_name,
637 revision=rev.raw_id)
634 revision=rev.raw_id)
638 title = tooltip(rev.message)
639 else:
635 else:
640 ## changeset cannot be found/striped/removed etc.
636 # changeset cannot be found - it might have been stripped or removed
641 lbl = ('%s' % rev)[:12]
637 lbl = ('%s' % rev)[:12]
642 _url = '#'
643 title = _('Changeset not found')
638 title = _('Changeset not found')
644 if parse_cs:
639 if parse_cs:
645 return link_to(lbl, _url, title=title, class_='tooltip')
640 return link_to(lbl, _url, title=title, class_='tooltip')
@@ -669,7 +664,6 b' def action_parser(user_log, feed=False, '
669 except ChangesetDoesNotExistError:
664 except ChangesetDoesNotExistError:
670 log.error('cannot find revision %s in this repo' % rev)
665 log.error('cannot find revision %s in this repo' % rev)
671 revs.append(rev)
666 revs.append(rev)
672 continue
673 else:
667 else:
674 _rev = AttributeDict({
668 _rev = AttributeDict({
675 'short_id': rev[:12],
669 'short_id': rev[:12],
General Comments 0
You need to be logged in to leave comments. Login now