[SCM] build.samba.org - branch master updated

Jelmer Vernooij jelmer at samba.org
Sun Nov 21 07:15:48 MST 2010


The branch, master has been updated
       via  48ce95e Fix unicode handling in diffs.
      from  a7596e4 Simplify diff handling.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 48ce95ed1aff318bb8de8e8de0e08292313970ad
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 21 15:15:09 2010 +0100

    Fix unicode handling in diffs.

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/web/__init__.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 29b88ab..1762650 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -826,9 +826,8 @@ class DiffPage(BuildFarmPage):
         yield "<h2>%s</h2>" % title
         changes = branch.changes_summary(revision)
         yield "".join(history_row_html(myself, entry, t, changes))
-        diff = cgi.escape(diff)
         diff = highlight(diff, DiffLexer(), HtmlFormatter())
-        yield "<pre>%s</pre>\n" % diff
+        yield "<pre>%s</pre>\n" % diff.encode("utf-8")
 
 
 class RecentCheckinsPage(BuildFarmPage):


-- 
build.samba.org


More information about the samba-cvs mailing list