X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=blobdiff_plain;f=Servus-chiark.py;h=26d46a1f32aa8d7322b3395ccb6590141b444446;hp=81f8076dfd7ad925c42946b4715a833797cae818;hb=19d6020ad007e3a4516d94d5a780ec062631f7b8;hpb=5ec921a98112b8971747d0c84bdb4a35bdf0688d

diff --git a/Servus-chiark.py b/Servus-chiark.py
old mode 100644
new mode 100755
index 81f8076..26d46a1
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -35,7 +35,7 @@ owner = "Emperor"
 
 # Everything else in this file is configuration-specific.
 
-import os, time, re, twitter
+import os, time, re, twitter, subprocess, sys
 
 # Most command implementations are stored in a separate module.
 import commands as c
@@ -51,6 +51,30 @@ class fish:
 	DoS=0
 	Boring_Git='Nobody'
 	quotatime=0
+	last=""
+
+# load the "blame" details for a file
+def loadblame(filename):
+    p=subprocess.Popen(["git","blame","-s",filename],
+                       stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err=p.communicate()
+    if len(err)>0:
+        sys.exit("git blame failure: %s" % err)
+    bdb={}
+    lines=out.split("\n")
+    for line in lines:
+        l=line.split()
+        if len(line.strip())>0:
+            commit=l[0]
+            thing=' '.join(l[2:])
+            bdb[thing]=commit
+    keys=bdb.keys()
+    return bdb,keys
+    
+#set up blame dbs for trouts/flirts/slashes
+tbdb,tbdbk=loadblame("trouts")
+fbdb,fbdbk=loadblame("flirts")
+sbdb,sbdbk=loadblame("slashes")
 
 # load a file full of flirts or trouts
 def __load(filename):
@@ -169,6 +193,8 @@ commands = {"karma": (c.karmaq,karmadb),
 	    "nsfw": (c.nsfwq,urldb),
 	    "nws": (c.nsfwq,urldb),
 	    "units": c.unitq,
+	    "currency":c.currencyq,
+            "blame": (c.blameq,fish,tbdb,tbdbk,fbdb,fbdbk,sbdb,sbdbk),
 	    "help": c.helpq,
             "say": c.sayq,
             "do": c.doq,