Mercurial Mercurial > comt / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup diff for human reading
authorraph
Fri, 16 Apr 2010 10:34:54 +0200
changeset 255 81842341dc5a
parent 251 3eb5299e8085
child 256 adccf7c023ef
cleanup diff for human reading
src/cm/media/css/base.css file | annotate | diff | comparison | revisions
src/cm/views/texts.py file | annotate | diff | comparison | revisions 
--- a/src/cm/media/css/base.css	Thu Apr 15 14:35:44 2010 +0200
+++ b/src/cm/media/css/base.css	Fri Apr 16 10:34:54 2010 +0200
@@ -189,6 +189,8 @@
 
 .diff-context {
 	background-color: #EEEEEE;
+	width: 42%;
+	vertical-align: top; 
 }
 
 .diff-addedline {
--- a/src/cm/views/texts.py	Thu Apr 15 14:35:44 2010 +0200
+++ b/src/cm/views/texts.py	Fri Apr 16 10:34:54 2010 +0200
@@ -597,8 +597,10 @@
                 
                 minus, plus = '<br />'.join(minus), '<br />'.join(plus)                
                 dif = diff_match_patch2()
-                p = dif.diff_prettyHtml_one_way(dif.diff_main(minus, plus), 1)
-                minus = dif.diff_prettyHtml_one_way(dif.diff_main(minus, plus), 2)
+                res_diff1 = dif.diff_main(minus, plus)
+                dif.diff_cleanupSemantic(res_diff1)
+                p = dif.diff_prettyHtml_one_way(res_diff1, 1)
+                minus = dif.diff_prettyHtml_one_way(res_diff1, 2)
                 plus = p
                 res.append('<tr><td class="diff-marker">-</td><td class="diff-deletedline">%s</td><td class="diff-separator"></td><td class="diff-marker">+</td><td class="diff-addedline">%s</td></tr>' % (minus, plus))
comt