kallithea Changeset - 7d5e50517430

Changeset - 7d5e50517430

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 5 years ago 2021-02-18 12:23:19
mads@kiilerich.com

diffs: change name of high level function name for generating HTML diff to html_diff

2 files changed with 3 insertions and 3 deletions:

kallithea/controllers/files.py

kallithea/lib/diffs.py

0 comments (0 inline, 0 general)

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -630,25 +630,25 @@ class FilesController(base.BaseRepoContr @@
             return raw_diff
         elif c.action == 'raw':
             raw_diff = diffs.get_gitdiff(node1, node2,
                                       ignore_whitespace=ignore_whitespace_diff,
                                       context=diff_context_size)
             response.content_type = 'text/plain'
             return raw_diff
         else:
             fid = h.FID(diff2, node2.path)
             diff_limit = None if fulldiff else self.cut_off_limit
-            c.a_rev, c.cs_rev, a_path, diff, st, op = diffs.wrapped_diff(filenode_old=node1,
+            c.a_rev, c.cs_rev, a_path, diff, st, op = diffs.html_diff(filenode_old=node1,
                                          filenode_new=node2,
                                          diff_limit=diff_limit,
                                          ignore_whitespace=ignore_whitespace_diff,
                                          line_context=diff_context_size)
             c.file_diff_data = [(fid, fid, op, a_path, node2.path, diff, st)]
             return base.render('files/file_diff.html')
     @LoginRequired(allow_default_user=True)
     @HasRepoPermissionLevelDecorator('read')
     def diff_2way(self, repo_name, f_path):
         diff1 = request.GET.get('diff1', '')
         diff2 = request.GET.get('diff2', '')

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -159,28 +159,28 @@ def as_html(table_class='code-difftable' @@
 def wrap_to_table(html):
     """Given a string with html, return it wrapped in a table, similar to what
     as_html returns."""
     return '''\
               <table class="code-difftable">
                 <tr class="line">
                 <td class="lineno new"></td>
                 <td class="code"><pre>%s</pre></td>
                 </tr>
               </table>''' % html
-def wrapped_diff(filenode_old, filenode_new, diff_limit=None,
+def html_diff(filenode_old, filenode_new, diff_limit=None,
                 ignore_whitespace=True, line_context=3):
     """
     Returns a file diff wrapped into a table.
+    Returns a file diff as HTML wrapped into a table.
     Checks for diff_limit and presents a message if the diff is too big.
     """
     if filenode_old is None:
         filenode_old = FileNode(filenode_new.path, '', EmptyChangeset())
     op = None
     a_path = filenode_old.path # default, might be overriden by actual rename in diff
     if filenode_old.is_binary or filenode_new.is_binary:
         html_diff = wrap_to_table(_('Binary file'))
         stats = (0, 0)
     elif diff_limit != -1 and (

0 comments (0 inline, 0 general)