#
#
# patch "config.py.example"
#  from [0a0614a487e5a055da10046a6d6a701211abce19]
#    to [3c78fa0e27d466f54df06dd69673a7b98f75fb47]
# 
# patch "templates/index.html"
#  from [a0f30606651e27222da815d33c892fc3685303b4]
#    to [4ac82196415faf4687ad133eb0f0f9d4dc12d716]
# 
# patch "viewmtn.py"
#  from [2bd5932cb88ac04b68c8297459d0ac41341ea314]
#    to [4521b416b3e46688199a94d4f20d991fd940dced]
#
============================================================
--- 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'
 
============================================================
--- templates/index.html	a0f30606651e27222da815d33c892fc3685303b4
+++ templates/index.html	4ac82196415faf4687ad133eb0f0f9d4dc12d716
@@ -1,9 +1,9 @@
 #extends base
 
 #def body
-<script lang="javascript">
-function toggle_hidden (did, update_did) {
-    var s = getElement (did);
+<script type="text/javascript">
+function toggle_hidden(did, update_did) {
+    var s = document.getElementById(did);
     if (s.style['display'] && s.style['display'].length > 0) {
         s.style['display'] = '';
     } else {
@@ -26,7 +26,7 @@ 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><span  style="cursor: pointer" onclick="toggle_hidden('t_$did', 'e_$did');"><span style="font-family:monospace;">[<span id="e_$did">+</span>]</span> $branch.name</span> </div>
     <div id="t_$did" style="display: none; position: relative; left: 1em;">
 #else if $t == "e"
     </div> <!-- end of $did -->
============================================================
--- viewmtn.py	2bd5932cb88ac04b68c8297459d0ac41341ea314
+++ viewmtn.py	4521b416b3e46688199a94d4f20d991fd940dced
@@ -356,7 +356,14 @@ mimehelp = sharedmimeinfo.LookupHelper(g
 renderer = Renderer()
 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
 
@@ -718,6 +725,23 @@ class RevisionDiff(RevisionPage):
                         diff=syntax.highlight(diff, 'diff'),
                         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')
+        stdout.write(diff)
+        sys.stdout.flush()
+        
 class RevisionFile(RevisionPage):
     def GET(self, revision, filename):
         revision = mtn.Revision(revision)
@@ -1210,6 +1234,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:
@@ -1239,7 +1265,9 @@ urls = (
     r'/revision/browse/('+mtn.revision_re+')/(.*)', 'RevisionBrowse',
     r'/revision/browse/('+mtn.revision_re+')()', 'RevisionBrowse',
     r'/revision/diff/('+mtn.revision_re+')/with/('+mtn.revision_re+')', 'RevisionDiff',
+    r'/revision/rawdiff/('+mtn.revision_re+')/with/('+mtn.revision_re+')', 'RevisionRawDiff',
     r'/revision/diff/('+mtn.revision_re+')/with/('+mtn.revision_re+')'+'/(.*)', 'RevisionDiff',
+    r'/revision/rawdiff/('+mtn.revision_re+')/with/('+mtn.revision_re+')'+'/(.*)', 'RevisionRawDiff',
     r'/revision/file/('+mtn.revision_re+')/(.*)', 'RevisionFile',
     r'/revision/filechanges/()()('+mtn.revision_re+')/(.*)', 'RevisionFileChanges',
     r'/revision/filechanges/from/(\d+)/to/(\d+)/('+mtn.revision_re+')/(.*)', 'RevisionFileChanges',