projects
/
irker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version bump for release 2.4.
[irker.git]
/
irkerhook.py
diff --git
a/irkerhook.py
b/irkerhook.py
index d09eb17d526f419b5023e3924cdc313694779eb1..4ea7fbe21ff8accc1681f486ff8b90ba586371d2 100755
(executable)
--- a/
irkerhook.py
+++ b/
irkerhook.py
@@
-37,7
+37,7
@@
default_channels = "irc://chat.freenode.net/#commits"
# No user-serviceable parts below this line:
#
# No user-serviceable parts below this line:
#
-version = "
1.20
"
+version = "
2.4
"
import os, sys, commands, socket, urllib, subprocess, locale, datetime
from pipes import quote as shellquote
import os, sys, commands, socket, urllib, subprocess, locale, datetime
from pipes import quote as shellquote
@@
-88,7
+88,8
@@
class Commit:
self.url = webview
except IOError:
self.url = ""
self.url = webview
except IOError:
self.url = ""
- return self.template % self.__dict__
+ res = self.template % self.__dict__
+ return unicode(res, 'UTF-8') if not isinstance(res, unicode) else res
class GenericExtractor:
"Generic class for encapsulating data from a VCS."
class GenericExtractor:
"Generic class for encapsulating data from a VCS."
@@
-271,12
+272,11
@@
class GitExtractor(GenericExtractor):
# Extract the meta-information for the commit
commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
commit.files = " ".join(commit.files.strip().split("\n")[1:])
# Extract the meta-information for the commit
commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
commit.files = " ".join(commit.files.strip().split("\n")[1:])
- # Design choice: for git we ship only the first line, which is
+ # Design choice: for git we ship only the first
message
line, which is
# conventionally supposed to be a summary of the commit. Under
# other VCSes a different choice may be appropriate.
# conventionally supposed to be a summary of the commit. Under
# other VCSes a different choice may be appropriate.
- commit.author_name = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit))
- commit.mail = do("git log -1 '--pretty=format:%ae' " + shellquote(commit.commit))
- commit.logmsg = do("git log -1 '--pretty=format:%s' " + shellquote(commit.commit))
+ commit.author_name, commit.mail, commit.logmsg = \
+ do("git log -1 '--pretty=format:%an%n%ae%n%s' " + shellquote(commit.commit)).split("\n")
# This discards the part of the author's address after @.
# Might be be nice to ship the full email address, if not
# for spammers' address harvesters - getting this wrong
# This discards the part of the author's address after @.
# Might be be nice to ship the full email address, if not
# for spammers' address harvesters - getting this wrong