kallithea Changeset - 4fb8e175cbb9

Changeset - 4fb8e175cbb9

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich (mads) - 5 years ago 2021-02-16 21:59:00
mads@kiilerich.com

diffs: drop as_html default value for mandatory argument 'parsed_lines'

1 file changed with 2 insertions and 2 deletions:

kallithea/lib/diffs.py

0 comments (0 inline, 0 general)

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -18,100 +18,100 @@ kallithea.lib.diffs @@
 Set of diffing helpers, previously part of vcs
 This file was forked by the Kallithea project in July 2014.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Dec 4, 2011
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import difflib
 import logging
 import re
 from tg.i18n import ugettext as _
 from kallithea.lib import webutils
 from kallithea.lib.utils2 import safe_str
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.exceptions import VCSError
 from kallithea.lib.vcs.nodes import FileNode, SubModuleNode
 log = logging.getLogger(__name__)
 def _safe_id(idstring):
     r"""Make a string safe for including in an id attribute.
     The HTML spec says that id attributes 'must begin with
     a letter ([A-Za-z]) and may be followed by any number
     of letters, digits ([0-9]), hyphens ("-"), underscores
     ("_"), colons (":"), and periods (".")'. These regexps
     are slightly over-zealous, in that they remove colons
     and periods unnecessarily.
     Whitespace is transformed into underscores, and then
     anything which is not a hyphen or a character that
     matches \w (alphanumerics and underscore) is removed.
     """
     # Transform all whitespace to underscore
     idstring = re.sub(r'\s', "_", idstring)
     # Remove everything that is not a hyphen or a member of \w
     idstring = re.sub(r'(?!-)\W', "", idstring).lower()
     return idstring
 def as_html(table_class='code-difftable', line_class='line',
+def as_html(parsed_lines, table_class='code-difftable', line_class='line',
             old_lineno_class='lineno old', new_lineno_class='lineno new',
             no_lineno_class='lineno',
-            code_class='code', parsed_lines=None):
             code_class='code'):
     """
     Return given diff as html table with customized css classes
     """
     _html_empty = True
     _html = []
     _html.append('''<table class="%(table_class)s">\n''' % {
         'table_class': table_class
     })
     for file_info in parsed_lines:
         count_no_lineno = 0  # counter to allow comments on lines without new/old line numbers
         for chunk in file_info['chunks']:
             _html_empty = False
             for change in chunk:
                 _html.append('''<tr class="%(lc)s %(action)s">\n''' % {
                     'lc': line_class,
                     'action': change['action']
                 })
                 if change['old_lineno'] or change['new_lineno']:
                     ###########################################################
                     # OLD LINE NUMBER
                     ###########################################################
                     anchor_old = "%(filename)s_o%(oldline_no)s" % {
                         'filename': _safe_id(file_info['filename']),
                         'oldline_no': change['old_lineno']
+                    }
                     anchor_old_id = ''
                     if change['old_lineno']:
                         anchor_old_id = 'id="%s"' % anchor_old
                     _html.append('''\t<td %(a_id)s class="%(olc)s">''' % {
                         'a_id': anchor_old_id,
                         'olc': old_lineno_class,
                     })
                     _html.append('''<a href="%(url)s" data-pseudo-content="%(label)s"></a>''' % {
                         'label': change['old_lineno'],
                         'url': '#%s' % anchor_old,
                     })
                     _html.append('''</td>\n''')
                     ###########################################################
                     # NEW LINE NUMBER
                     ###########################################################
                     anchor_new = "%(filename)s_n%(newline_no)s" % {
                         'filename': _safe_id(file_info['filename']),
                         'newline_no': change['new_lineno']
+                    }
                     anchor_new_id = ''
                     if change['new_lineno']:
                         anchor_new_id = 'id="%s"' % anchor_new

0 comments (0 inline, 0 general)