kallithea Changeset - cad46e2a1931

Changeset - cad46e2a1931

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2015-01-06 00:54:36
madski@unity3d.com

diffs: show CR (\r) in diffs

2 files changed with 9 insertions and 1 deletions:

kallithea/lib/diffs.py

kallithea/public/css/style.css

0 comments (0 inline, 0 general)

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -196,7 +196,7 @@ class DiffProcessor(object): @@
     #used for inline highlighter word split
     _token_re = re.compile(r'()(&gt;|&lt;|&amp;|<u>\t</u>| <i></i>|\W+?)')
     _escape_re = re.compile(r'(&)|(<)|(>)|(\t)|(?<=.)( \n| $)')
+    _escape_re = re.compile(r'(&)|(<)|(>)|(\t)|(\r)|(?<=.)( \n| $)')
     def __init__(self, diff, vcs='hg', format='gitdiff', diff_limit=None):
@@ @@ -264,6 +264,8 @@ class DiffProcessor(object): @@
             if groups[3]:
                 return '<u>\t</u>'
             if groups[4]:
                 return '<u class="cr"></u>'
             if groups[5]:
                 return ' <i></i>'
             assert False

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4856,6 +4856,12 @@ table.code-difftable td.code pre u:befor @@
     display: inline-block;
     width: 0;
+}
 table.code-highlighttable div.code-highlight pre u.cr:before,
 table.code-difftable td.code pre u.cr:before {
     content: "\21a4";
     display: inline-block;
     color: rgba(0,0,0,0.5);
+}
 table.code-highlighttable div.code-highlight pre u,
 table.code-difftable td.code pre u {
     color: rgba(0,0,0,0.15);

0 comments (0 inline, 0 general)