# 
# 
# patch "monotone.py"
#  from [e5992f2f364241fd60b6b9c481f2353f5890d478]
#    to [594168ca14bad533817afbd34f41f73e78e6b289]
# 
============================================================
--- monotone.py	e5992f2f364241fd60b6b9c481f2353f5890d478
+++ monotone.py	594168ca14bad533817afbd34f41f73e78e6b289
@@ -214,9 +214,11 @@
             return result
 
     def annotate(self, id, file):
-        result = utility.run_command(self.base_command + " annotate --revision=%s %s" % (pipes.quote(id), pipes.quote(file)))
+        result = utility.run_command(self.base_command + " annotate --revision=%s %s" % (pipes.quote(id), 
+											 pipes.quote(file)))
         if result['exitcode'] != 0:
-            raise Exception("Unable to annotate file: %s using command '%s'" % (result['childerr'], result['run_command']))
+            raise Exception("Unable to annotate file: %s using command '%s'" % (result['childerr'], 
+										result['run_command']))
         else:
             return result['fromchild']
         
@@ -303,7 +305,6 @@
                 label += "\\n%s" % (dot_escape(attrs['Author'][0]))
                 override_fillcolor = colour_from_string(attrs['Author'][0])
             else: override_fillcolor = None
-            #opts = 'fontname=Windsor,fontsize=8,shape=box,href="revision.psp?id=%s",label="%s"' % (urllib.quote(revision), label)
             opts = 'label="%s"' % label #revision[0:8]
             for opt in graphopts['nodeopts']:
                 if opt == 'fillcolor' and override_fillcolor != None: continue
@@ -311,13 +312,13 @@
             if revision == id: opts += ",color=blue"
             opts += ',href="revision.psp?id=%s"' % urllib.quote(revision)
             if override_fillcolor != None: opts += ',fillcolor="#%s"' % (override_fillcolor)
-            #opts += ',tooltip="by %s at %s on %s"' % (dot_escape(attrs['ChangeLog'][0]),
-            #                      dot_escape(attrs['Date'][0]),
-            #                      dot_escape(attrs['Branch'][0]))
             contents += '"%s" [%s]\n' % (revision, opts)
         contents += "}\n"
         open(rv['dot_file'], 'w').write(contents)
-        os.system("%s -Tcmapx -o %s -Tpng -o %s %s" % (graphopts['dot'], pipes.quote(rv['imagemap_file']), rv['image_file'], rv['dot_file']))
+        os.system("%s -Tcmapx -o %s -Tpng -o %s %s" % (graphopts['dot'], 
+						       pipes.quote(rv['imagemap_file']), 
+						       rv['image_file'], 
+						       rv['dot_file']))
         rv['cached'] = False
         return rv