Mercurial > kallithea
diff kallithea/tests/models/test_diff_parsers.py @ 6131:6b723a49a9a1
diff: only highlight of difference between del and add line for one-liners
Comparing a single del line with the first of several add lines would often be
quite arbitrary and misleading.
Note: the non-gitdiff code paths in diffs.py are incomplete and unused and
unusable.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 12 Aug 2016 03:13:59 +0200 |
| parents | 7f2aa3ec2931 |
| children | 8d98924c58b1 |
line wrap: on
line diff
--- a/kallithea/tests/models/test_diff_parsers.py Fri Aug 12 03:04:48 2016 +0200 +++ b/kallithea/tests/models/test_diff_parsers.py Fri Aug 12 03:13:59 2016 +0200 @@ -298,7 +298,7 @@ s = ''.join(l) print s assert s == r''' -context ... ... u'@@ -51,5 +51,12 @@\n' +context ... ... u'@@ -51,6 +51,13 @@\n' unmod 51 51 u'<u>\t</u>begin();\n' unmod 52 52 u'<u>\t</u>\n' add 53 u'<u>\t</u>int foo;<u class="cr"></u>\n' @@ -308,8 +308,10 @@ add 57 u'<u>\t</u>int tab;<u>\t</u>\n' add 58 u'<u>\t</u>\n' unmod 59 53 u' <i></i>' -del 54 u'<u>\t</u><del>#define MAX_STEPS (48)</del>\n' -add 60 u'<u>\t</u><ins><u class="cr"></u></ins>\n' +del 54 u'<u>\t</u>#define MAX_STEPS (48)\n' +add 60 u'<u>\t</u><u class="cr"></u>\n' add 61 u'<u>\t</u>#define MAX_STEPS (64)<u class="cr"></u>\n' unmod 62 55 u'\n' +del 56 u'<u>\t</u>#define MIN_STEPS (<del>48</del>)\n' +add 63 u'<u>\t</u>#define MIN_STEPS (<ins>42</ins>)\n' '''