#
#
# patch "AUTHORS"
#  from [2caebc4c22cae21166dc1d1593bf1ab4d6e0f522]
#    to [72011875c7667f5249ac254679161caefe717320]
# 
# patch "config.py.example"
#  from [0a0614a487e5a055da10046a6d6a701211abce19]
#    to [3c78fa0e27d466f54df06dd69673a7b98f75fb47]
# 
# patch "release.py"
#  from [7039ccac8caa4f0a7f22b9e6ca05f406e26044cf]
#    to [02cc0da3565aacac95c45cd3cfbf493253e14f59]
# 
# patch "static/viewmtn.css"
#  from [8981409323f375efedb9599c206ac0b34bdad739]
#    to [ac955b1ed74cc9b9542c0278a46340f9383e149c]
# 
# patch "templates/base.html"
#  from [1be9c3a8bbe40d46dcd5bc6507b2547233c659dc]
#    to [781439204c039e9426f067b004cbb9ba9f0b39ad]
# 
# patch "templates/branchchanges.html"
#  from [26a4a466df7417985215c652b46b476134a11ad9]
#    to [adb0864171ae6d0bf4ca6fe4223c1436dd6bc681]
# 
# patch "templates/help.html"
#  from [8efd61e71af20d37f7c99aa54983c8e872e4701a]
#    to [6384266456beee0b7ecd968bf8ff130b92801282]
# 
# patch "templates/index.html"
#  from [a0f30606651e27222da815d33c892fc3685303b4]
#    to [547f9d166607671ec97bac4627260331d677fd3d]
# 
# patch "templates/revisionbrowse.html"
#  from [1e37ebc587a7706215d068e0e27b9b3de31b0656]
#    to [61a9e90cca82aeecb85677922f7b9a58096d4743]
# 
# patch "templates/revisiondiff.html"
#  from [0cfa3372c64f3e1dc8f6112afff98281feb88b07]
#    to [e20b8a8b50d5fea16bfc4ebe480d4044a82d3cb3]
# 
# patch "templates/revisionfilechanges.html"
#  from [3a720c1ad96e17a322cf15b2fbd135baa8323bc9]
#    to [96521a1803642a5504d4c80ecb04a8abfcb98af5]
# 
# patch "templates/revisioninfo.html"
#  from [7f77eacf697976a45ebdcc3ea8f45103c8101d33]
#    to [a6ef44ec8a9a16b735b7edea9467072e2c08ce12]
# 
# patch "viewmtn.py"
#  from [9badb8de4dcf093b2a0098b7a7d113c4107e29ff]
#    to [e76f6d2b58d5b7cda4c2ddbb92dfaeee73e05702]
# 
# patch "web/__init__.py"
#  from [4ad6a0c17ac8571d6099b2b771b32b3607197d0e]
#    to [6cd3ae0f5857354777e79399803881052493b2c2]
#
============================================================
--- AUTHORS	2caebc4c22cae21166dc1d1593bf1ab4d6e0f522
+++ AUTHORS	72011875c7667f5249ac254679161caefe717320
@@ -1,8 +1,7 @@ Authors:
 
 Authors:
-Grahame Bowland <address@hidden>
 
-Contributors:
+Grahame Bowland <address@hidden>
 Matt Johnston <address@hidden>
 Nathaniel Smith <address@hidden>
 Bruce Stephens <address@hidden>
@@ -15,3 +14,5 @@ Tony Tung <address@hidden>
 Ludovic Brenta <address@hidden>
 Rob Schoening <address@hidden>
 Tony Tung <address@hidden>
+Roland McGrath <address@hidden>
+Susie Johnston <address@hidden>
============================================================
--- config.py.example	0a0614a487e5a055da10046a6d6a701211abce19
+++ config.py.example	3c78fa0e27d466f54df06dd69673a7b98f75fb47
@@ -81,6 +81,7 @@ graphopts = {
 # Icon Theme to use for icons; 'gnome' is a safe value, 
 # as is 'hicolor'. Note that icon_size must be a string, 
 # not an integer
+# Set icon_theme = None to disable icons.
 icon_theme = 'gnome'
 icon_size = '16'
 
============================================================
--- release.py	7039ccac8caa4f0a7f22b9e6ca05f406e26044cf
+++ release.py	02cc0da3565aacac95c45cd3cfbf493253e14f59
@@ -1,9 +1,8 @@ Authors:
 version='0.08'
 authors='''
 Authors:
-Grahame Bowland <address@hidden>
 
-Contributors:
+Grahame Bowland <address@hidden>
 Matt Johnston <address@hidden>
 Nathaniel Smith <address@hidden>
 Bruce Stephens <address@hidden>
@@ -16,4 +15,6 @@ Tony Tung <address@hidden>
 Ludovic Brenta <address@hidden>
 Rob Schoening <address@hidden>
 Tony Tung <address@hidden>
+Roland McGrath <address@hidden>
+Susie Johnston <address@hidden>
 '''
============================================================
--- static/viewmtn.css	8981409323f375efedb9599c206ac0b34bdad739
+++ static/viewmtn.css	ac955b1ed74cc9b9542c0278a46340f9383e149c
@@ -1,11 +1,11 @@
 
-BODY {
+body {
 	background-color: white;
 	font-family: "Trebuchet MS", Verdana, Sans-Serif; 
 	font-size : 100%;
 }
 
-DIV#menuBar {
+div#menuBar {
 	font-family: "Trebuchet MS", Verdana, Sans-Serif; 
 	font-size: 80%;
 	padding-top: 1em;
@@ -22,40 +22,41 @@ A:hover {
 	text-decoration: none;
 }
 
-DIV#footer {
+div#footer {
 	clear: both;
 	border-top-width: 1px;
 	border-top-style: solid;
 	border-top-color: black;
 	margin-top: 2em;
 	text-align: right;
+	font-size: 60%;
 }
 
-TABLE.pretty {
+table.pretty {
 	border-width: 1px;
 	border-style: solid;
 	border-color: black;
 }
 
-TABLE.pretty TD {
+table.pretty td {
 	padding-left: 0.5em;
 	padding-right: 0.5em;
 }
 
-TABLE.pretty TH {
+table.pretty th {
 	padding-left: 0.5em;
 	padding-right: 0.5em;
 }
 
-TR.even {
+tr.even {
 	background-color: #eeeeee;
 }
 
-TR.odd {
+tr.odd {
 	background-color: #ffffff;
 }
 
-TD.branchInfoHeader {
+td.branchInfoHeader {
     border-width: 3px;
     border-style: solid;
     border-color: blue;
@@ -63,17 +64,17 @@ TD.branchInfoHeader {
     
 }
 
-TABLE.pretty TH {
+table.pretty th {
 	color: blue;
 	background-color: #dfe7f3;
 }
 
-H1#pageTitle {
+h1#pageTitle {
 	font-size: 120%;
 	font-family: sans-serif;
 }
 
-H2 {
+h2 {
 	font-size: 120%;
 	font-family: sans-serif;
 }
@@ -82,7 +83,7 @@ H2 {
     display: none;
 }
 
-DIV#popupBox {
+div#popupBox {
     position: absolute;
     border-width: 1px;
     border-style: solid;
@@ -92,7 +93,7 @@ DIV#popupBox {
     z-index: 10;
 }
 
-PRE.code {
+pre.code {
     border-left-style: solid;
     border-left-width: 3px;
     border-left-color: #A0A0A0;
============================================================
--- templates/base.html	1be9c3a8bbe40d46dcd5bc6507b2547233c659dc
+++ templates/base.html	781439204c039e9426f067b004cbb9ba9f0b39ad
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>ViewMTN: $(page_title)</title>
 <link rel="stylesheet" href="$static_join('viewmtn.css')" type="text/css" media="screen" />
@@ -37,7 +36,7 @@ installCallbacks("$dynamic_uri_path");
 </script>
 
 <div id="footer">
-  <small><small>ViewMTN $version</small</small><br/>
+  ViewMTN $version<br />
 </div>
 
 </body>
============================================================
--- templates/branchchanges.html	26a4a466df7417985215c652b46b476134a11ad9
+++ templates/branchchanges.html	adb0864171ae6d0bf4ca6fe4223c1436dd6bc681
@@ -2,7 +2,7 @@
 
 #def body
 
-<p align="center">
+<p style="text-align: center">
 Changes $from_change to $to_change on this branch are displayed below, sorted in descending chronological order.<br />
 </p>
 
@@ -37,7 +37,7 @@ Changes $from_change to $to_change on th
 #end for
 </table>
 
-<table align="center" width="50%" style="border: 1px solid black; margin-top: 1em;">
+<table width="50%" style="border: 1px solid black; margin-top: 1em; text-align: center;">
 <tr>
 <td>
 #if $next_from and $next_to
============================================================
--- templates/help.html	8efd61e71af20d37f7c99aa54983c8e872e4701a
+++ templates/help.html	6384266456beee0b7ecd968bf8ff130b92801282
@@ -22,7 +22,7 @@ software page</a> and follow the contact
 software page</a> and follow the contact instructions there.
 </p>
 
-<a name="#readinggraph"></a>
+<p><a name="readinggraph"></a></p>
 <h2>Reading revision graphs</h2>
 
 <p>
============================================================
--- templates/index.html	a0f30606651e27222da815d33c892fc3685303b4
+++ templates/index.html	547f9d166607671ec97bac4627260331d677fd3d
@@ -1,13 +1,16 @@
 #extends base
 
 #def body
-<script lang="javascript">
-function toggle_hidden (did, update_did) {
-    var s = getElement (did);
-    if (s.style['display'] && s.style['display'].length > 0) {
-        s.style['display'] = '';
+<script type="text/javascript">
+function toggle_hidden(did, update_did) {
+    var s = document.getElementById(did);
+	var toggle = document.getElementById(update_did);
+    if (s.style.display && s.style.display.length > 0 && s.style.display != 'block') {
+		s.style.display = 'block';
+		toggle.innerHTML = "[-]";
     } else {
-        s.style['display'] = 'none';
+        s.style.display = 'none';
+		toggle.innerHTML = "[+]";
     }
 }
 
@@ -26,8 +29,8 @@ might be useful.
 
 #for t, did, branch, offset in $branches
 #if $t == "d"
-    <div onClick="javascript:toggle_hidden('t_$did', 'e_$did');"><span style="font-family:monospace;">[<span id="e_$did">+</span>]</span> $branch.name</div>
-    <div id="t_$did" style="display: none; position: relative; left: 1em;">
+    <div style="cursor: pointer" onclick="toggle_hidden('t_$did', 'e_$did');"><span id="e_$did" style="font-family:monospace;">[+]</span> $branch.name</div>
+    <div id="t_$did" style="display: none; margin-left: 2em;">
 #else if $t == "e"
     </div> <!-- end of $did -->
 #else
@@ -38,6 +41,5 @@ might be useful.
     </div>
 #end if
 #end for
-</table>
 
 #end def
============================================================
--- templates/revisionbrowse.html	1e37ebc587a7706215d068e0e27b9b3de31b0656
+++ templates/revisionbrowse.html	61a9e90cca82aeecb85677922f7b9a58096d4743
@@ -10,6 +10,7 @@ $link($l).html()
 #end for
 </p>
 
+<p>
 These files are in a revision of
 #if len($branches) == 1
 branch 
@@ -54,4 +55,4 @@ $branch_links
 #end for
 </table>
 
-#end def
\ No newline at end of file
+#end def
============================================================
--- templates/revisiondiff.html	0cfa3372c64f3e1dc8f6112afff98281feb88b07
+++ templates/revisiondiff.html	e20b8a8b50d5fea16bfc4ebe480d4044a82d3cb3
@@ -5,7 +5,8 @@
 
 #filter Filter
 <p>
-The unified diff between revisions $link($revision_from).html() and $link($revision_to).html() is displayed below.
+The unified diff between revisions $link($revision_from).html() and $link($revision_to).html() is displayed below. It can 
+also be downloaded as a $link($diff_obj, "raw").html("raw diff").
 </p>
 #end filter
 
============================================================
--- templates/revisionfilechanges.html	3a720c1ad96e17a322cf15b2fbd135baa8323bc9
+++ templates/revisionfilechanges.html	96521a1803642a5504d4c80ecb04a8abfcb98af5
@@ -2,7 +2,7 @@
 
 #def body
 
-<p align="center">
+<p style="text-align: center">
 Revisions $from_change to $to_change in in which '$filename.name' was 
 changed are listed below. These revisions are ancestors of the 
 revision 
============================================================
--- templates/revisioninfo.html	7f77eacf697976a45ebdcc3ea8f45103c8101d33
+++ templates/revisioninfo.html	a6ef44ec8a9a16b735b7edea9467072e2c08ce12
@@ -47,9 +47,11 @@ $imagemap
 #filter Filter
 $imagemap
 #end filter
-<div align="center" style="float: left; margin: 0; margin-bottom: 1em;">
+<div style="float: left; margin: 0; margin-bottom: 1em; text-align: center;">
+#if $imageuri
 <img style="border-width: 1px; border-color: black; border-style: solid;" usemap="#ancestry" src="$imageuri" alt="Ancestry of $revision" />
 <br /><small><a href="$dynamic_join('help#readinggraph')">reading this graph</a></small>
+#end if
 </div>
 
 #end def
============================================================
--- viewmtn.py	9badb8de4dcf093b2a0098b7a7d113c4107e29ff
+++ viewmtn.py	e76f6d2b58d5b7cda4c2ddbb92dfaeee73e05702
@@ -33,6 +33,7 @@ import heapq
 import release
 hq = cgi.escape
 import heapq
+import binascii
 from itertools import izip, chain, repeat
 
 import web
@@ -125,9 +126,10 @@ class Link:
             uri = self.absolute_uri
         else:
             return self.description
-        rv = '<a href="%s">%s</a></span>' % (uri, d)
+        rv = '<a href="%s">%s</a>' % (uri, d)
         if self.json_args != None:
-            rv = '<span id="%s" class="%s">' % (hq(urllib.quote(json.write(self.json_args))), 
+            enc_args = binascii.hexlify(json.write(self.json_args))
+            rv = '<span id="js_%s" class="%s">' % (hq(enc_args), 
                                                 hq(str(self.__class__).split('.')[-1])) + rv + '</span>'
         return rv
 
@@ -173,7 +175,11 @@ class DiffLink(Link):
 class DiffLink(Link):
     def __init__(self, diff, **kwargs):
         Link.__init__(*(self, ), **kwargs)
-        self.relative_uri = 'revision/diff/' + diff.from_rev + '/with/' + diff.to_rev
+        if kwargs.get('link_type', None) == "raw":
+            mode = "rawdiff"
+        else:
+            mode = "diff"
+        self.relative_uri = 'revision/%s/' % (mode) + diff.from_rev + '/with/' + diff.to_rev
         if diff.fname:
             self.relative_uri += '/'+urllib.quote(diff.fname)
         self.description = "diff"
@@ -386,7 +392,14 @@ mimehelp = sharedmimeinfo.LookupHelper(g
 op_fact = OperationsFactory()
 ops = mtn.Operations([config.monotone, config.dbfile])
 mimehelp = sharedmimeinfo.LookupHelper(getattr(config, "mime_map", None))
-mimeicon = icontheme.MimeIcon(icontheme.IconTheme(config.icon_theme), config.icon_size)
+if config.icon_theme:
+    try:
+        mimeicon = icontheme.MimeIcon(icontheme.IconTheme(config.icon_theme), config.icon_size)
+    except Exception, e:
+        print>>sys.stderr, "\nFailed to load icon theme: perhaps you want to set config.icon_theme = None\n"
+        raise e
+else:
+    mimeicon = None
 
 from mk2 import MarkovChain
 
@@ -740,14 +753,34 @@ class RevisionDiff(RevisionPage):
         else:
             files = []
         diff = ops.diff(revision_from, revision_to, files)
+        diff_obj = Diff(revision_from, revision_to, files)
         renderer.render('revisiondiff.html', 
                         page_title="Diff from %s to %s" % (revision_from.abbrev(), revision_to.abbrev()),
                         revision=revision_from,
                         revision_from=revision_from,
                         revision_to=revision_to,
                         diff=syntax.highlight(diff, 'diff'),
+                        diff_obj=diff_obj,
                         files=files)
 
+class RevisionRawDiff(RevisionPage):
+    def GET(self, revision_from, revision_to, filename=None):
+        revision_from = mtn.Revision(revision_from)
+        revision_to = mtn.Revision(revision_to)
+        if not self.exists(revision_from):
+            return web.notfound()
+        if not self.exists(revision_to):
+            return web.notfound()
+        if filename != None:
+            files = [filename]
+        else:
+            files = []
+        diff = ops.diff(revision_from, revision_to, files)
+        web.header('Content-Type', 'text/x-diff')
+        for line in diff:
+            sys.stdout.write (line)
+        sys.stdout.flush()
+        
 class RevisionFile(RevisionPage):
     def GET(self, revision, filename):
         revision = mtn.Revision(revision)
@@ -1196,7 +1229,9 @@ class Json(object):
 
     def GET(self, method, encoded_args):
         writer = json.JsonWriter()
-        args = json.read(urllib.unquote(encoded_args))
+        if not encoded_args.startswith('js_'):
+            return web.notfound()
+        args = json.read(binascii.unhexlify((encoded_args[3:])))
         if hasattr(self, method):
             rv = getattr(self, method)(*args)
         else:
@@ -1240,6 +1275,8 @@ class MimeIcon:
 
 class MimeIcon:
     def GET(self, type, sub_type):
+        if not mimeicon:
+            return web.notfound()
         mime_type = type+'/'+sub_type
         icon_file = mimeicon.lookup(mime_type)
         if icon_file:
============================================================
--- web/__init__.py	4ad6a0c17ac8571d6099b2b771b32b3607197d0e
+++ web/__init__.py	6cd3ae0f5857354777e79399803881052493b2c2
@@ -24,11 +24,8 @@ from debugerror import *
 from httpserver import *
 from debugerror import *
 
-try:
-    import cheetah
-    from cheetah import *
-except ImportError:
-    pass
+import cheetah
+from cheetah import *
 
 def main():
     import doctest