mercurial: comparison hgext/bugzilla.py

equal deleted inserted replaced

-:7b554c6ad390
+:6c89dd0a7797
 host       Hostname of the MySQL server holding the Bugzilla database.
 db         Name of the Bugzilla database in MySQL. Default 'bugs'.
 user       Username to use to access MySQL server. Default 'bugs'.
 password   Password to use to access MySQL server.
 timeout    Database connection timeout (seconds). Default 5.
-version    Bugzilla version. Specify '3.0' for Bugzilla versions from
+version    Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and
-3.0 onwards, and '2.16' for versions prior to 3.0.
+later, '2.18' for Bugzilla versions from 2.18 and '2.16' for
+versions prior to 2.18.
 bzuser     Fallback Bugzilla user name to record comments with, if
 changeset committer cannot be found as a Bugzilla user.
+bzdir      Bugzilla install directory. Used by default notify.
+Default '/var/www/html/bugzilla'.
 notify     The command to run to get Bugzilla to send bug change
-notification emails. Substitutes one string parameter,
+notification emails. Substitutes from a map with 3 keys,
-the bug ID. Default 'cd /var/www/html/bugzilla && '
+'bzdir', 'id' (bug id) and 'user' (committer bugzilla email).
-'./processmail %s nobody@nowhere.com'.
+Default depends on version; from 2.18 it is
+"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s".
 regexp     Regular expression to match bug IDs in changeset commit message.
 Must contain one "()" group. The default expression matches
 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',
 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations thereof.
 Matching is case insensitive.
 [bugzilla]
 host=localhost
 password=XYZZY
 version=3.0
 bzuser=unknown@domain.com
-notify=cd /opt/bugzilla-3.2 && perl -T contrib/sendbugmail.pl %%s bugmail@domain.com
+bzdir=/opt/bugzilla-3.2
 template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/rev/{node|short}\\n\\n{desc}\\n
 strip=5
 [web]
 baseurl=http://dev.domain.com/hg
 self.conn = MySQLdb.connect(host=host, user=user, passwd=passwd,
 db=db, connect_timeout=timeout)
 self.cursor = self.conn.cursor()
 self.longdesc_id = self.get_longdesc_id()
 self.user_ids = {}
+self.default_notify = "cd %(bzdir)s && ./processmail %(id)s %(user)s"
 def run(self, *args, **kwargs):
 '''run a query.'''
 self.ui.note(_('query: %s %s\n') % (args, kwargs))
 try:
 self.ui.status(_('bug %d already knows about changeset %s\n') %
 (id, short(node)))
 unknown.pop(id, None)
 return util.sort(unknown.keys())
-def notify(self, ids):
+def notify(self, ids, committer):
 '''tell bugzilla to send mail.'''
 self.ui.status(_('telling bugzilla to send mail:\n'))
+(user, userid) = self.get_bugzilla_user(committer)
 for id in ids:
 self.ui.status(_('  bug %s\n') % id)
-cmd = self.ui.config('bugzilla', 'notify',
+cmdfmt = self.ui.config('bugzilla', 'notify', self.default_notify)
-'cd /var/www/html/bugzilla && '
+bzdir = self.ui.config('bugzilla', 'bzdir', '/var/www/html/bugzilla')
-'./processmail %s nobody@nowhere.com') % id
+try:
+# Backwards-compatible with old notify string, which
+# took one string. This will throw with a new format
+# string.
+cmd = cmdfmt % id
+except TypeError:
+cmd = cmdfmt % {'bzdir': bzdir, 'id': id, 'user': user}
+self.ui.note(_('running notify command %s\n') % cmd)
 fp = util.popen('(%s) 2>&1' % cmd)
 out = fp.read()
 ret = fp.close()
 if ret:
 self.ui.warn(out)
 for committer, bzuser in self.ui.configitems('usermap'):
 if committer.lower() == user.lower():
 return bzuser
 return user
-def add_comment(self, bugid, text, committer):
+def get_bugzilla_user(self, committer):
-'''add comment to bug. try adding comment as committer of
+'''see if committer is a registered bugzilla user. Return
-changeset, otherwise as default bugzilla user.'''
+bugzilla username and userid if so. If not, return default
+bugzilla username and userid.'''
 user = self.map_committer(committer)
 try:
 userid = self.get_user_id(user)
 except KeyError:
 try:
 defaultuser = self.ui.config('bugzilla', 'bzuser')
 if not defaultuser:
 raise util.Abort(_('cannot find bugzilla user id for %s') %
 user)
 userid = self.get_user_id(defaultuser)
+user = defaultuser
 except KeyError:
 raise util.Abort(_('cannot find bugzilla user id for %s or %s') %
 (user, defaultuser))
+return (user, userid)
+def add_comment(self, bugid, text, committer):
+'''add comment to bug. try adding comment as committer of
+changeset, otherwise as default bugzilla user.'''
+(user, userid) = self.get_bugzilla_user(committer)
 now = time.strftime('%Y-%m-%d %H:%M:%S')
 self.run('''insert into longdescs
 (bug_id, who, bug_when, thetext)
 values (%s, %s, %s, %s)''',
 (bugid, userid, now, text))
 self.run('''insert into bugs_activity (bug_id, who, bug_when, fieldid)
 values (%s, %s, %s, %s)''',
 (bugid, userid, now, self.longdesc_id))
 self.conn.commit()
-class bugzilla_3_0(bugzilla_2_16):
+class bugzilla_2_18(bugzilla_2_16):
-'''support for bugzilla 3.0 series.'''
+'''support for bugzilla 2.18 series.'''
 def __init__(self, ui):
 bugzilla_2_16.__init__(self, ui)
+self.default_notify = "cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s"
+class bugzilla_3_0(bugzilla_2_18):
+'''support for bugzilla 3.0 series.'''
+def __init__(self, ui):
+bugzilla_2_18.__init__(self, ui)
 def get_longdesc_id(self):
 '''get identity of longdesc field'''
 self.run('select id from fielddefs where name = "longdesc"')
 ids = self.cursor.fetchall()
 class bugzilla(object):
 # supported versions of bugzilla. different versions have
 # different schemas.
 _versions = {
 '2.16': bugzilla_2_16,
+'2.18': bugzilla_2_18,
 '3.0':  bugzilla_3_0
 }
 _default_bug_re = (r'bugs?\s*,?\s*(?:#|nos?\.?|num(?:ber)?s?)?\s*'
 r'((?:\d+\s*(?:,?\s*(?:and)?)?\s*)+)')
 ctx = repo[node]
 ids = bz.find_bug_ids(ctx)
 if ids:
 for id in ids:
 bz.update(id, ctx)
-bz.notify(ids)
+bz.notify(ids, util.email(ctx.user()))
 except MySQLdb.MySQLError, err:
 raise util.Abort(_('database error: %s') % err[1])

changeset 7618	6c89dd0a7797
parent 7504	d8cd79fbed3c
child 7762	fece056bf240