blame: Put the filename in the loadblame result

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index adcd273af76e4d9854b168c61c18090c9c8bbc8d..8cc34f03ac6f4dc4997b4f435523842bc7b40601 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -314,14 +314,21 @@ def __getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,what):
     sans=__getcommits(sdb,sdbk,what)
     return tans+fans+sans
 
-def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
+def blameq(bot,cmd,nick,conn,public,fish,cfgs):
+    tdb,tdbk,x = cfgs[0][7] # urgh, magic, to support magic knowledge below
+    fdb,fdbk,x = cfgs[1][7]
+    sdb,sdbk,x = cfgs[2][7]
     clist=cmd.split()
     if len(clist) < 2:
        bot.automsg(public,nick,"Who or what do you want to blame?")
        return
     cwhat=' '.join(clist[2:])
     if clist[1]=="#last":
-       ans=__getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,fish.last)
+       if fish.last_cfg is None:
+           bot.automsg(public,nick,"Nothing")
+           return
+       xdb,xdbk,kindsfile = fish.last_cfg[7]
+       ans=__getcommits(xdb,xdbk,fish.last)
     elif clist[1]=="#trouts" or clist[1]=="#trout":
        ans=__getcommits(tdb,tdbk,cwhat)
     elif clist[1]=="#flirts" or clist[1]=="#flirt":