Convert bzr commit hook to git commit hook

setup/git_pre_commit_hook.py

@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+'''
+Hook to make the commit command automatically close bugs when the commit
+message contains `Fix #number` or `Implement #number`. Also updates the commit
+message with the summary of the closed bug.
+
+'''
+import re, urllib, importlib, sys, json
+
+from lxml import html
+
+SENDMAIL = ('/home/kovid/work/env', 'pgp_mail')
+LAUNCHPAD_BUG = 'https://bugs.launchpad.net/calibre/+bug/%s'
+GITHUB_BUG = 'https://api.github.com/repos/kovidgoyal/calibre/issues/%s'
+BUG_PAT = r'(Fix|Implement|Fixes|Fixed|Implemented)\s+#(\d+)'
+
+class Bug:
+
+    def __init__(self):
+        self.seen = set()
+
+    def __call__(self, match):
+        action, bug = match.group(1), match.group(2)
+        summary = ''
+        if bug in self.seen:
+            return match.group()
+        self.seen.add(bug)
+
+        if int(bug) > 100000:  # Launchpad bug
+            raw = urllib.urlopen(LAUNCHPAD_BUG % bug).read()
+            try:
+                h1 = html.fromstring(raw).xpath('//h1[@id="edit-title"]')[0]
+                summary = html.tostring(h1, method='text', encoding=unicode).strip()
+            except:
+                summary = 'Private bug'
+        else:
+            summary = json.loads(urllib.urlopen(GITHUB_BUG % bug).read())['title']
+        if summary:
+            print ('Working on bug:', summary)
+            if int(bug) > 100000:
+                self.close_bug(bug, action)
+            return match.group() + ' (%s)' % summary
+        return match.group()
+
+    def close_bug(self, bug, action):
+        print ('Closing bug #%s'% bug)
+        suffix = ('The fix will be in the next release. '
+                'calibre is usually released every Friday.')
+        action += 'ed'
+        msg = '%s in branch %s. %s'%(action, 'master', suffix)
+        msg = msg.replace('Fixesed', 'Fixed')
+        msg += '\n\n status fixreleased'
+
+        sys.path.insert(0, SENDMAIL[0])
+
+        sendmail = importlib.import_module(SENDMAIL[1])
+
+        to = bug+'@bugs.launchpad.net'
+        sendmail.sendmail(msg, to, 'Fixed in master')
+
+def main():
+    with open(sys.argv[-1], 'r+b') as f:
+        raw = f.read().decode('utf-8')
+        bug = Bug()
+        msg = re.sub(BUG_PAT, bug, raw)
+        if msg != raw:
+            f.seek(0)
+            f.truncate()
+            f.write(msg.encode('utf-8'))
+    raise SystemExit(1)
+
+if __name__ == '__main__':
+    main()
+

src/calibre/trac/__init__.py

@@ -1,6 +0,0 @@
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-'''
-To test
-sudo tracd --port 8000 --auth calibre,/var/www/localhost/htdocs/calibre/passwd,calibre /var/www/localhost/htdocs/calibre  
-'''

src/calibre/trac/bzr_commit_plugin.py

@@ -1,81 +0,0 @@
-#!/usr/bin/env  python2
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
-__docformat__ = 'restructuredtext en'
-
-'''
-Plugin to make the commit command automatically close bugs when the commit
-message contains `Fix #number` or `Implement #number`. Also updates the commit
-message with the summary of the closed bug. It also set the `--fixes` metadata
-appropriately.
-
-'''
-import re, urllib, importlib, sys
-from bzrlib.builtins import cmd_commit as _cmd_commit
-import bzrlib
-
-from lxml import html
-
-SENDMAIL = ('/home/kovid/work/kde', 'pgp_mail')
-
-class cmd_commit(_cmd_commit):
-
-    def expand_bug(self, msg):
-        close_bug = r'(Fix|Implement|Fixes|Fixed|Implemented)\s+#(\d+)'
-        close_bug_pat = re.compile(close_bug, re.IGNORECASE)
-        match = close_bug_pat.search(msg)
-        if not match:
-            return msg, None, None
-        action, bug = match.group(1), match.group(2)
-        summary = ''
-        raw = urllib.urlopen('https://bugs.launchpad.net/calibre/+bug/' +
-                bug).read()
-        try:
-            h1 = html.fromstring(raw).xpath('//h1[@id="edit-title"]')[0]
-            summary = html.tostring(h1, method='text', encoding=unicode).strip()
-        except:
-            summary = 'Private bug'
-        print 'Working on bug:', summary
-        if summary:
-            msg = msg.replace('#%s'%bug, '#%s (%s)'%(bug, summary))
-            msg = msg.replace('Fixesed', 'Fixed')
-        return msg, bug, action
-
-    def run(self, message=None, file=None, verbose=False, selected_list=None,
-            unchanged=False, strict=False, local=False, fixes=None,
-            author=None, show_diff=False, exclude=None):
-        bug = action = None
-        if message:
-            message, bug, action = self.expand_bug(message)
-
-            if bug and not fixes:
-                fixes = ['lp:'+bug]
-
-        ret = _cmd_commit.run(self, message=message, file=file, verbose=verbose,
-                              selected_list=selected_list, unchanged=unchanged,
-                              strict=strict, local=local, fixes=fixes,
-                              author=author, show_diff=show_diff, exclude=exclude)
-        if message and bug and action:
-            self.close_bug(bug, action)
-        return ret
-
-    def close_bug(self, bug, action):
-        print 'Closing bug #%s'% bug
-        #nick = config.get_nickname()
-        suffix = ('The fix will be in the next release. '
-                'calibre is usually released every Friday.')
-        action = action+'ed'
-        msg = '%s in branch %s. %s'%(action, 'lp:calibre', suffix)
-        msg = msg.replace('Fixesed', 'Fixed')
-        msg += '\n\n status fixreleased'
-
-        sys.path.insert(0, SENDMAIL[0])
-
-        sendmail = importlib.import_module(SENDMAIL[1])
-
-        to = bug+'@bugs.launchpad.net'
-        sendmail.sendmail(msg, to, 'Fixed in lp:calibre')
-
-
-bzrlib.commands.register_command(cmd_commit)