Add blame-filtering

This simply works on the md5 of the offending commit message, and
replaces it with new text.

blame_filter.py is a simple dictionary of md5: replacement pairs; it
is not committed itself (and is ignored by git)

diff --git a/.gitignore b/.gitignore
index 6791423a57a19e94b075f86b42ed47a38e903215..44a9ccd3d12a79cb1a13696d54d6cb913061e63e 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.pyc
 *~
 trouts-local
 *.pyc
 *~
 trouts-local

+blame_filter.py

diff --git a/commands.py b/commands.py
index 2864bb9de6ae05b1a9c867738e79fafedbc352f8..3974bfbc8d9f9b886aed358f5d50b3c3a86fbab7 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -1,8 +1,13 @@
 # Part of Acrobat.
 # Part of Acrobat.

-import string, cPickle, random, urllib, sys, time, re, os, twitter, subprocess, datetime, urlparse
+import string, cPickle, random, urllib, sys, time, re, os, twitter, subprocess, datetime, urlparse, hashlib

 from collections import defaultdict
 from irclib import irc_lower, nm_to_n
 
 from collections import defaultdict
 from irclib import irc_lower, nm_to_n
 

+try:
+    from blame_filter import bfd
+except ImportError:
+    bfd = None
+

 # query karma
 def karmaq(bot, cmd, nick, conn, public, karma):
     try:
 # query karma
 def karmaq(bot, cmd, nick, conn, public, karma):
     try:


@@ -279,8 +284,12 @@ def __getcommitinfo(commit):
        return(err)
 
     ts,mes=out.split('|')
        return(err)
 
     ts,mes=out.split('|')

+    mes=mes.strip()
+    md5mes=hashlib.md5(mes).hexdigest()
+    if bfd and md5mes in bfd:
+        mes=bfd[md5mes]

     when=datetime.date.fromtimestamp(float(ts))
     when=datetime.date.fromtimestamp(float(ts))

-    return mes.strip(), when
+    return mes, when

 
 ###Return an array of commit messages and timestamps for lines in db that match what
 def __getcommits(db,keys,what):
 
 ###Return an array of commit messages and timestamps for lines in db that match what
 def __getcommits(db,keys,what):