mercurial-scm/hg: hgext/bugzilla.py annotate

annotate hgext/bugzilla.py @ 16223:ac4fd3238ead

bugzilla: allow change comment to mark bugs fixed Add a second regular expression used when scanning change comments. Bugs matched by this new regular expression have the bug comments and optionally hours updated as with the first regular expression, but they are also marked as fixed. The bug status and resolution to set to mark a bug as fixed can be configured. By default status is set to RESOLVED and resolution to FIXED, the default Bugzilla settings. For example, a change comment containing 'Fixes 1234 h1.5' will be added to bug 1234, the bug will have its working time increased by 1.65 hours, and the bug will be marked RESOLVED/FIXED. Change comments may contain both bug update and fix instructions. If the same bug ID occurs in both, the last instruction found takes precedence. The patch adds new bug states 'bug_status' and 'resolution' and actions to update them to the XMLRPC and XMLRPC/email access methods. XMLRPC does not support marking bugs as fixed when used with Bugzilla versions prior to 4.0. When used with an earlier Bugzilla version, a warning is issued and only comment and hours updated.

author	Jim Hague <jim.hague@acm.org>
date	Thu, 01 Mar 2012 15:27:24 +0000
parents	d7b7b453c035
children	d52a6b542db1

rev	line source
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	1 # bugzilla.py - bugzilla integration for mercurial
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	2 #
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	3 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	4 # Copyright 2011-2 Jim Hague <jim.hague@acm.org>
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	5 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8209 diff changeset	6 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10112 diff changeset	7 # GNU General Public License version 2 or any later version.
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	8
8935 f4f0e902b750 extensions: change descriptions for hook-providing extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8894 diff changeset	9 '''hooks for integrating with the Bugzilla bug tracker
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	10
9252 b03aa86f4c10 bugzilla: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9204 diff changeset	11 This hook extension adds comments on bugs in Bugzilla when changesets
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	12 that refer to bugs by Bugzilla ID are seen. The comment is formatted using
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	13 the Mercurial template mechanism.
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	14
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	15 The bug references can optionally include an update for Bugzilla of the
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	16 hours spent working on the bug. Bugs can also be marked fixed.
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	17
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	18 Three basic modes of access to Bugzilla are provided:
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	19
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	20 1. Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	21
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	22 2. Check data via the Bugzilla XMLRPC interface and submit bug change
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	23 via email to Bugzilla email interface. Requires Bugzilla 3.4 or later.
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	24
13896 3b4025dcb223 bugzilla: more documentation formatting fixups Jim Hague <jim.hague@acm.org> parents: 13884 diff changeset	25 3. Writing directly to the Bugzilla database. Only Bugzilla installations
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	26 using MySQL are supported. Requires Python MySQLdb.
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	27
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	28 Writing directly to the database is susceptible to schema changes, and
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	29 relies on a Bugzilla contrib script to send out bug change
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	30 notification emails. This script runs as the user running Mercurial,
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	31 must be run on the host with the Bugzilla install, and requires
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	32 permission to read Bugzilla configuration details and the necessary
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	33 MySQL user and password to have full access rights to the Bugzilla
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	34 database. For these reasons this access mode is now considered
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	35 deprecated, and will not be updated for new Bugzilla versions going
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	36 forward. Only adding comments is supported in this access mode.
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	37
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	38 Access via XMLRPC needs a Bugzilla username and password to be specified
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	39 in the configuration. Comments are added under that username. Since the
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	40 configuration must be readable by all Mercurial users, it is recommended
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	41 that the rights of that user are restricted in Bugzilla to the minimum
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	42 necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and later.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	43
13871 22d200e49b10 bugzilla: more documentation fixes Jim Hague <jim.hague@acm.org> parents: 13870 diff changeset	44 Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	45 email to the Bugzilla email interface to submit comments to bugs.
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	46 The From: address in the email is set to the email address of the Mercurial
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	47 user, so the comment appears to come from the Mercurial user. In the event
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	48 that the Mercurial user email is not recognised by Bugzilla as a Bugzilla
13871 22d200e49b10 bugzilla: more documentation fixes Jim Hague <jim.hague@acm.org> parents: 13870 diff changeset	49 user, the email associated with the Bugzilla username used to log into
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	50 Bugzilla is used instead as the source of the comment. Marking bugs fixed
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	51 works on all supported Bugzilla versions.
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	52
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	53 Configuration items common to all access modes:
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	54
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	55 bugzilla.version
13883 fc83d2ca9cfb bugzilla: fix reST error introduced in 22d200e49b10 Martin Geisler <mg@aragost.com> parents: 13871 diff changeset	56 This access type to use. Values recognised are:
13871 22d200e49b10 bugzilla: more documentation fixes Jim Hague <jim.hague@acm.org> parents: 13870 diff changeset	57
13883 fc83d2ca9cfb bugzilla: fix reST error introduced in 22d200e49b10 Martin Geisler <mg@aragost.com> parents: 13871 diff changeset	58 :``xmlrpc``: Bugzilla XMLRPC interface.
fc83d2ca9cfb bugzilla: fix reST error introduced in 22d200e49b10 Martin Geisler <mg@aragost.com> parents: 13871 diff changeset	59 :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces.
fc83d2ca9cfb bugzilla: fix reST error introduced in 22d200e49b10 Martin Geisler <mg@aragost.com> parents: 13871 diff changeset	60 :``3.0``: MySQL access, Bugzilla 3.0 and later.
fc83d2ca9cfb bugzilla: fix reST error introduced in 22d200e49b10 Martin Geisler <mg@aragost.com> parents: 13871 diff changeset	61 :``2.18``: MySQL access, Bugzilla 2.18 and up to but not
fc83d2ca9cfb bugzilla: fix reST error introduced in 22d200e49b10 Martin Geisler <mg@aragost.com> parents: 13871 diff changeset	62 including 3.0.
fc83d2ca9cfb bugzilla: fix reST error introduced in 22d200e49b10 Martin Geisler <mg@aragost.com> parents: 13871 diff changeset	63 :``2.16``: MySQL access, Bugzilla 2.16 and up to but not
fc83d2ca9cfb bugzilla: fix reST error introduced in 22d200e49b10 Martin Geisler <mg@aragost.com> parents: 13871 diff changeset	64 including 2.18.
7985 0edca606c0f1 bugzilla: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7762 diff changeset	65
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	66 bugzilla.regexp
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	67 Regular expression to match bug IDs for update in changeset commit message.
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	68 It must contain one "()" named group ``<ids>`` containing the bug
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	69 IDs separated by non-digit characters. It may also contain
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	70 a named group ``<hours>`` with a floating-point number giving the
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	71 hours worked on the bug. If no named groups are present, the first
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	72 "()" group is assumed to contain the bug IDs, and work time is not
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	73 updated. The default expression matches ``Bug 1234``, ``Bug no. 1234``,
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	74 ``Bug number 1234``, ``Bugs 1234,5678``, ``Bug 1234 and 5678`` and
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	75 variations thereof, followed by an hours number prefixed by ``h`` or
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	76 ``hours``, e.g. ``hours 1.5``. Matching is case insensitive.
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	77
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	78 bugzilla.fixregexp
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	79 Regular expression to match bug IDs for marking fixed in changeset
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	80 commit message. This must contain a "()" named group ``<ids>` containing
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	81 the bug IDs separated by non-digit characters. It may also contain
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	82 a named group ``<hours>`` with a floating-point number giving the
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	83 hours worked on the bug. If no named groups are present, the first
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	84 "()" group is assumed to contain the bug IDs, and work time is not
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	85 updated. The default expression matches ``Fixes 1234``, ``Fixes bug 1234``,
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	86 ``Fixes bugs 1234,5678``, ``Fixes 1234 and 5678`` and
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	87 variations thereof, followed by an hours number prefixed by ``h`` or
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	88 ``hours``, e.g. ``hours 1.5``. Matching is case insensitive.
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	89
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	90 bugzilla.fixstatus
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	91 The status to set a bug to when marking fixed. Default ``RESOLVED``.
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	92
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	93 bugzilla.fixresolution
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	94 The resolution to set a bug to when marking fixed. Default ``FIXED``.
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	95
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	96 bugzilla.style
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	97 The style file to use when formatting comments.
e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	98
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	99 bugzilla.template
9252 b03aa86f4c10 bugzilla: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9204 diff changeset	100 Template to use when formatting comments. Overrides style if
b03aa86f4c10 bugzilla: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9204 diff changeset	101 specified. In addition to the usual Mercurial keywords, the
13884 773a833ddbc6 bugzilla: convert a verbatim block to a field list Martin Geisler <mg@aragost.com> parents: 13883 diff changeset	102 extension specifies:
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	103
13884 773a833ddbc6 bugzilla: convert a verbatim block to a field list Martin Geisler <mg@aragost.com> parents: 13883 diff changeset	104 :``{bug}``: The Bugzilla bug ID.
773a833ddbc6 bugzilla: convert a verbatim block to a field list Martin Geisler <mg@aragost.com> parents: 13883 diff changeset	105 :``{root}``: The full pathname of the Mercurial repository.
773a833ddbc6 bugzilla: convert a verbatim block to a field list Martin Geisler <mg@aragost.com> parents: 13883 diff changeset	106 :``{webroot}``: Stripped pathname of the Mercurial repository.
773a833ddbc6 bugzilla: convert a verbatim block to a field list Martin Geisler <mg@aragost.com> parents: 13883 diff changeset	107 :``{hgweb}``: Base URL for browsing Mercurial repositories.
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	108
13842 4cffce61bd92 bugzilla: fix bad reST markup Martin Geisler <mg@aragost.com> parents: 13841 diff changeset	109 Default ``changeset {node\|short} in repo {root} refers to bug
4cffce61bd92 bugzilla: fix bad reST markup Martin Geisler <mg@aragost.com> parents: 13841 diff changeset	110 {bug}.\\ndetails:\\n\\t{desc\|tabindent}``
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	111
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	112 bugzilla.strip
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	113 The number of path separator characters to strip from the front of
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	114 the Mercurial repository path (``{root}`` in templates) to produce
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	115 ``{webroot}``. For example, a repository with ``{root}``
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	116 ``/var/local/my-project`` with a strip of 2 gives a value for
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	117 ``{webroot}`` of ``my-project``. Default 0.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	118
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	119 web.baseurl
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	120 Base URL for browsing Mercurial repositories. Referenced from
13896 3b4025dcb223 bugzilla: more documentation formatting fixups Jim Hague <jim.hague@acm.org> parents: 13884 diff changeset	121 templates as ``{hgweb}``.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	122
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	123 Configuration items common to XMLRPC+email and MySQL access modes:
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	124
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	125 bugzilla.usermap
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	126 Path of file containing Mercurial committer email to Bugzilla user email
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	127 mappings. If specified, the file should contain one mapping per
13835 135bed43e20c bugzilla: show usermap syntax more clearly Martin Geisler <mg@aragost.com> parents: 13834 diff changeset	128 line::
135bed43e20c bugzilla: show usermap syntax more clearly Martin Geisler <mg@aragost.com> parents: 13834 diff changeset	129
135bed43e20c bugzilla: show usermap syntax more clearly Martin Geisler <mg@aragost.com> parents: 13834 diff changeset	130 committer = Bugzilla user
135bed43e20c bugzilla: show usermap syntax more clearly Martin Geisler <mg@aragost.com> parents: 13834 diff changeset	131
13896 3b4025dcb223 bugzilla: more documentation formatting fixups Jim Hague <jim.hague@acm.org> parents: 13884 diff changeset	132 See also the ``[usermap]`` section.
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	133
13836 ed15922af2f9 bugzilla: markup section names as literal text Martin Geisler <mg@aragost.com> parents: 13835 diff changeset	134 The ``[usermap]`` section is used to specify mappings of Mercurial
13834 0aa2cfd0b21a bugzilla: use standard section.name notation Martin Geisler <mg@aragost.com> parents: 13833 diff changeset	135 committer email to Bugzilla user email. See also ``bugzilla.usermap``.
13835 135bed43e20c bugzilla: show usermap syntax more clearly Martin Geisler <mg@aragost.com> parents: 13834 diff changeset	136 Contains entries of the form ``committer = Bugzilla user``.
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	137
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	138 XMLRPC access mode configuration:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	139
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	140 bugzilla.bzurl
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	141 The base URL for the Bugzilla installation.
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	142 Default ``http://localhost/bugzilla``.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	143
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	144 bugzilla.user
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	145 The username to use to log into Bugzilla via XMLRPC. Default
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	146 ``bugs``.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	147
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	148 bugzilla.password
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	149 The password for Bugzilla login.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	150
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	151 XMLRPC+email access mode uses the XMLRPC access mode configuration items,
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	152 and also:
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	153
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	154 bugzilla.bzemail
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	155 The Bugzilla email address.
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	156
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	157 In addition, the Mercurial email settings must be configured. See the
13837 22f20d0fe2d3 bugzilla: refer to hgrc(5) man page with normal notation Martin Geisler <mg@aragost.com> parents: 13836 diff changeset	158 documentation in hgrc(5), sections ``[email]`` and ``[smtp]``.
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	159
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	160 MySQL access mode configuration:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	161
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	162 bugzilla.host
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	163 Hostname of the MySQL server holding the Bugzilla database.
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	164 Default ``localhost``.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	165
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	166 bugzilla.db
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	167 Name of the Bugzilla database in MySQL. Default ``bugs``.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	168
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	169 bugzilla.user
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	170 Username to use to access MySQL server. Default ``bugs``.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	171
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	172 bugzilla.password
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	173 Password to use to access MySQL server.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	174
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	175 bugzilla.timeout
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	176 Database connection timeout (seconds). Default 5.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	177
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	178 bugzilla.bzuser
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	179 Fallback Bugzilla user name to record comments with, if changeset
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	180 committer cannot be found as a Bugzilla user.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	181
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	182 bugzilla.bzdir
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	183 Bugzilla install directory. Used by default notify. Default
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	184 ``/var/www/html/bugzilla``.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	185
13833 64ad07dff0a8 bugzilla: prefix each config option with section Martin Geisler <mg@aragost.com> parents: 13832 diff changeset	186 bugzilla.notify
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	187 The command to run to get Bugzilla to send bug change notification
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	188 emails. Substitutes from a map with 3 keys, ``bzdir``, ``id`` (bug
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	189 id) and ``user`` (committer bugzilla email). Default depends on
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	190 version; from 2.18 it is "cd %(bzdir)s && perl -T
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	191 contrib/sendbugmail.pl %(id)s %(user)s".
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	192
9203 e4dbd49b88a9 bugzilla: reformat list of configuration options Martin Geisler <mg@lazybytes.net> parents: 9054 diff changeset	193 Activating the extension::
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	194
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	195 [extensions]
10112 703db37d186b hgext: enable extensions without "hgext." prefix in help texts Martin Geisler <mg@lazybytes.net> parents: 9252 diff changeset	196 bugzilla =
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	197
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	198 [hooks]
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	199 # run bugzilla hook on every change pulled or pushed in here
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	200 incoming.bugzilla = python:hgext.bugzilla.hook
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	201
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	202 Example configurations:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	203
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	204 XMLRPC example configuration. This uses the Bugzilla at
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	205 ``http://my-project.org/bugzilla``, logging in as user
367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	206 ``bugmail@my-project.org`` with password ``plugh``. It is used with a
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	207 collection of Mercurial repositories in ``/var/local/hg/repos/``,
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	208 with a web interface at ``http://my-project.org/hg``. ::
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	209
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	210 [bugzilla]
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	211 bzurl=http://my-project.org/bugzilla
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	212 user=bugmail@my-project.org
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	213 password=plugh
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	214 version=xmlrpc
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	215 template=Changeset {node\|short} in {root\|basename}.
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	216 {hgweb}/{webroot}/rev/{node\|short}\\n
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	217 {desc}\\n
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	218 strip=5
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	219
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	220 [web]
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	221 baseurl=http://my-project.org/hg
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	222
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	223 XMLRPC+email example configuration. This uses the Bugzilla at
13841 367805c848e5 bugzilla: markup literal text as such Martin Geisler <mg@aragost.com> parents: 13837 diff changeset	224 ``http://my-project.org/bugzilla``, logging in as user
14619 29f55c0e39e7 bugzilla: fix typo in documentation Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14234 diff changeset	225 ``bugmail@my-project.org`` with password ``plugh``. It is used with a
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	226 collection of Mercurial repositories in ``/var/local/hg/repos/``,
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	227 with a web interface at ``http://my-project.org/hg``. Bug comments
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	228 are sent to the Bugzilla email address
13854 5ed036e42fd9 bugzilla: fix documentation typo Patrick Mezard <pmezard@gmail.com> parents: 13842 diff changeset	229 ``bugzilla@my-project.org``. ::
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	230
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	231 [bugzilla]
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	232 bzurl=http://my-project.org/bugzilla
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	233 user=bugmail@my-project.org
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	234 password=plugh
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	235 version=xmlrpc
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	236 bzemail=bugzilla@my-project.org
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	237 template=Changeset {node\|short} in {root\|basename}.
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	238 {hgweb}/{webroot}/rev/{node\|short}\\n
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	239 {desc}\\n
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	240 strip=5
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	241
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	242 [web]
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	243 baseurl=http://my-project.org/hg
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	244
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	245 [usermap]
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	246 user@emaildomain.com=user.name@bugzilladomain.com
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	247
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	248 MySQL example configuration. This has a local Bugzilla 3.2 installation
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	249 in ``/opt/bugzilla-3.2``. The MySQL database is on ``localhost``,
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	250 the Bugzilla database name is ``bugs`` and MySQL is
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	251 accessed with MySQL username ``bugs`` password ``XYZZY``. It is used
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	252 with a collection of Mercurial repositories in ``/var/local/hg/repos/``,
ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	253 with a web interface at ``http://my-project.org/hg``. ::
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	254
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	255 [bugzilla]
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	256 host=localhost
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	257 password=XYZZY
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	258 version=3.0
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	259 bzuser=unknown@domain.com
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	260 bzdir=/opt/bugzilla-3.2
9204 8d59e43854d9 bugzilla: wrap example template line Martin Geisler <mg@lazybytes.net> parents: 9203 diff changeset	261 template=Changeset {node\|short} in {root\|basename}.
8d59e43854d9 bugzilla: wrap example template line Martin Geisler <mg@lazybytes.net> parents: 9203 diff changeset	262 {hgweb}/{webroot}/rev/{node\|short}\\n
8d59e43854d9 bugzilla: wrap example template line Martin Geisler <mg@lazybytes.net> parents: 9203 diff changeset	263 {desc}\\n
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	264 strip=5
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	265
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	266 [web]
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	267 baseurl=http://my-project.org/hg
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	268
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	269 [usermap]
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	270 user@emaildomain.com=user.name@bugzilladomain.com
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	271
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	272 All the above add a comment to the Bugzilla bug record of the form::
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	273
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	274 Changeset 3b16791d6642 in repository-name.
13870 ce066d424bba bugzilla: correct sample configurations Jim Hague <jim.hague@acm.org> parents: 13854 diff changeset	275 http://my-project.org/hg/repository-name/rev/3b16791d6642
7504 d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	276
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	277 Changeset commit comment. Bug 1234.
d8cd79fbed3c Revise Bugzilla module comments into extension help. Jim Hague <jim.hague@acm.org> parents: 7493 diff changeset	278 '''
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	279
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	280 from mercurial.i18n import _
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 5975 diff changeset	281 from mercurial.node import short
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	282 from mercurial import cmdutil, mail, templater, util
15870 f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	283 import re, time, urlparse, xmlrpclib
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	284
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	285 class bzaccess(object):
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	286 '''Base class for access to Bugzilla.'''
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	287
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	288 def __init__(self, ui):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	289 self.ui = ui
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	290 usermap = self.ui.config('bugzilla', 'usermap')
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	291 if usermap:
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	292 self.ui.readconfig(usermap, sections=['usermap'])
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	293
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	294 def map_committer(self, user):
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	295 '''map name of committer to Bugzilla user name.'''
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	296 for committer, bzuser in self.ui.configitems('usermap'):
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	297 if committer.lower() == user.lower():
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	298 return bzuser
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	299 return user
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	300
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	301 # Methods to be implemented by access classes.
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	302 #
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	303 # 'bugs' is a dict keyed on bug id, where values are a dict holding
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	304 # updates to bug state. Recognised dict keys are:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	305 #
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	306 # 'hours': Value, float containing work hours to be updated.
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	307 # 'fix': If key present, bug is to be marked fixed. Value ignored.
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	308
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	309 def filter_real_bug_ids(self, bugs):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	310 '''remove bug IDs that do not exist in Bugzilla from bugs.'''
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	311 pass
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	312
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	313 def filter_cset_known_bug_ids(self, node, bugs):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	314 '''remove bug IDs where node occurs in comment text from bugs.'''
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	315 pass
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	316
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	317 def updatebug(self, bugid, newstate, text, committer):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	318 '''update the specified bug. Add comment text and set new states.
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	319
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	320 If possible add the comment as being from the committer of
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	321 the changeset. Otherwise use the default Bugzilla user.
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	322 '''
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	323 pass
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	324
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	325 def notify(self, bugs, committer):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	326 '''Force sending of Bugzilla notification emails.
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	327
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	328 Only required if the access method does not trigger notification
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	329 emails automatically.
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	330 '''
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	331 pass
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	332
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	333 # Bugzilla via direct access to MySQL database.
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	334 class bzmysql(bzaccess):
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	335 '''Support for direct MySQL access to Bugzilla.
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	336
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	337 The earliest Bugzilla version this is tested with is version 2.16.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	338
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	339 If your Bugzilla is version 3.2 or above, you are strongly
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	340 recommended to use the XMLRPC access method instead.
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	341 '''
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	342
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	343 @staticmethod
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	344 def sql_buglist(ids):
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	345 '''return SQL-friendly list of bug ids'''
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	346 return '(' + ','.join(map(str, ids)) + ')'
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	347
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	348 _MySQLdb = None
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	349
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	350 def __init__(self, ui):
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	351 try:
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	352 import MySQLdb as mysql
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	353 bzmysql._MySQLdb = mysql
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	354 except ImportError, err:
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	355 raise util.Abort(_('python mysql support not available: %s') % err)
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	356
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	357 bzaccess.__init__(self, ui)
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	358
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	359 host = self.ui.config('bugzilla', 'host', 'localhost')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	360 user = self.ui.config('bugzilla', 'user', 'bugs')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	361 passwd = self.ui.config('bugzilla', 'password')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	362 db = self.ui.config('bugzilla', 'db', 'bugs')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	363 timeout = int(self.ui.config('bugzilla', 'timeout', 5))
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	364 self.ui.note(_('connecting to %s:%s as %s, password %s\n') %
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	365 (host, db, user, '' len(passwd)))
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	366 self.conn = bzmysql._MySQLdb.connect(host=host,
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	367 user=user, passwd=passwd,
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	368 db=db,
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	369 connect_timeout=timeout)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	370 self.cursor = self.conn.cursor()
7019 6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	371 self.longdesc_id = self.get_longdesc_id()
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	372 self.user_ids = {}
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	373 self.default_notify = "cd %(bzdir)s && ./processmail %(id)s %(user)s"
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	374
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	375 def run(self, args, *kwargs):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	376 '''run a query.'''
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	377 self.ui.note(_('query: %s %s\n') % (args, kwargs))
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	378 try:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	379 self.cursor.execute(args, *kwargs)
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	380 except bzmysql._MySQLdb.MySQLError:
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	381 self.ui.note(_('failed query: %s %s\n') % (args, kwargs))
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	382 raise
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	383
7019 6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	384 def get_longdesc_id(self):
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	385 '''get identity of longdesc field'''
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	386 self.run('select fieldid from fielddefs where name = "longdesc"')
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	387 ids = self.cursor.fetchall()
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	388 if len(ids) != 1:
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	389 raise util.Abort(_('unknown database schema'))
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	390 return ids[0][0]
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	391
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	392 def filter_real_bug_ids(self, bugs):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	393 '''filter not-existing bugs from set.'''
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	394 self.run('select bug_id from bugs where bug_id in %s' %
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	395 bzmysql.sql_buglist(bugs.keys()))
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	396 existing = [id for (id,) in self.cursor.fetchall()]
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	397 for id in bugs.keys():
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	398 if id not in existing:
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	399 self.ui.status(_('bug %d does not exist\n') % id)
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	400 del bugs[id]
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	401
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	402 def filter_cset_known_bug_ids(self, node, bugs):
13799 d04fc5582772 bugzilla: keep bug IDs in set. Jim Hague <jim.hague@acm.org> parents: 13798 diff changeset	403 '''filter bug ids that already refer to this changeset from set.'''
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	404 self.run('''select bug_id from longdescs where
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	405 bug_id in %s and thetext like "%%%s%%"''' %
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	406 (bzmysql.sql_buglist(bugs.keys()), short(node)))
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	407 for (id,) in self.cursor.fetchall():
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	408 self.ui.status(_('bug %d already knows about changeset %s\n') %
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	409 (id, short(node)))
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	410 del bugs[id]
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	411
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	412 def notify(self, bugs, committer):
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	413 '''tell bugzilla to send mail.'''
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	414 self.ui.status(_('telling bugzilla to send mail:\n'))
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	415 (user, userid) = self.get_bugzilla_user(committer)
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	416 for id in bugs.keys():
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	417 self.ui.status(_(' bug %s\n') % id)
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	418 cmdfmt = self.ui.config('bugzilla', 'notify', self.default_notify)
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	419 bzdir = self.ui.config('bugzilla', 'bzdir', '/var/www/html/bugzilla')
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	420 try:
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	421 # Backwards-compatible with old notify string, which
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	422 # took one string. This will throw with a new format
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	423 # string.
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	424 cmd = cmdfmt % id
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	425 except TypeError:
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	426 cmd = cmdfmt % {'bzdir': bzdir, 'id': id, 'user': user}
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	427 self.ui.note(_('running notify command %s\n') % cmd)
6548 962eb403165b replace usage of os.popen() with util.popen() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6211 diff changeset	428 fp = util.popen('(%s) 2>&1' % cmd)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	429 out = fp.read()
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	430 ret = fp.close()
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	431 if ret:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	432 self.ui.warn(out)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	433 raise util.Abort(_('bugzilla notify command %s') %
14234 600e64004eb5 rename explain_exit to explainexit Adrian Buehlmann <adrian@cadifra.com> parents: 13896 diff changeset	434 util.explainexit(ret)[0])
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	435 self.ui.status(_('done\n'))
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	436
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	437 def get_user_id(self, user):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	438 '''look up numeric bugzilla user id.'''
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	439 try:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	440 return self.user_ids[user]
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	441 except KeyError:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	442 try:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	443 userid = int(user)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	444 except ValueError:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	445 self.ui.note(_('looking up user %s\n') % user)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	446 self.run('''select userid from profiles
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	447 where login_name like %s''', user)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	448 all = self.cursor.fetchall()
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	449 if len(all) != 1:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	450 raise KeyError(user)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	451 userid = int(all[0][0])
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	452 self.user_ids[user] = userid
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	453 return userid
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	454
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	455 def get_bugzilla_user(self, committer):
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	456 '''See if committer is a registered bugzilla user. Return
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	457 bugzilla username and userid if so. If not, return default
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	458 bugzilla username and userid.'''
2306 4c67ba93560b bugzilla: allow to map between committer email and bugzilla user name. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2239 diff changeset	459 user = self.map_committer(committer)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	460 try:
2306 4c67ba93560b bugzilla: allow to map between committer email and bugzilla user name. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2239 diff changeset	461 userid = self.get_user_id(user)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	462 except KeyError:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	463 try:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	464 defaultuser = self.ui.config('bugzilla', 'bzuser')
2306 4c67ba93560b bugzilla: allow to map between committer email and bugzilla user name. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2239 diff changeset	465 if not defaultuser:
4c67ba93560b bugzilla: allow to map between committer email and bugzilla user name. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2239 diff changeset	466 raise util.Abort(_('cannot find bugzilla user id for %s') %
4c67ba93560b bugzilla: allow to map between committer email and bugzilla user name. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2239 diff changeset	467 user)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	468 userid = self.get_user_id(defaultuser)
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	469 user = defaultuser
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	470 except KeyError:
2306 4c67ba93560b bugzilla: allow to map between committer email and bugzilla user name. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2239 diff changeset	471 raise util.Abort(_('cannot find bugzilla user id for %s or %s') %
4c67ba93560b bugzilla: allow to map between committer email and bugzilla user name. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2239 diff changeset	472 (user, defaultuser))
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	473 return (user, userid)
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	474
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	475 def updatebug(self, bugid, newstate, text, committer):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	476 '''update bug state with comment text.
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	477
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	478 Try adding comment as committer of changeset, otherwise as
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	479 default bugzilla user.'''
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	480 if len(newstate) > 0:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	481 self.ui.warn(_("Bugzilla/MySQL cannot update bug state\n"))
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	482
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	483 (user, userid) = self.get_bugzilla_user(committer)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	484 now = time.strftime('%Y-%m-%d %H:%M:%S')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	485 self.run('''insert into longdescs
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	486 (bug_id, who, bug_when, thetext)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	487 values (%s, %s, %s, %s)''',
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	488 (bugid, userid, now, text))
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	489 self.run('''insert into bugs_activity (bug_id, who, bug_when, fieldid)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	490 values (%s, %s, %s, %s)''',
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	491 (bugid, userid, now, self.longdesc_id))
7493 518afef5e350 Fix Bugzilla integration to work with new Bugzilla 3.2. Jim Hague <jim.hague@acm.org> parents: 7369 diff changeset	492 self.conn.commit()
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	493
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	494 class bzmysql_2_18(bzmysql):
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	495 '''support for bugzilla 2.18 series.'''
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	496
6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	497 def __init__(self, ui):
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	498 bzmysql.__init__(self, ui)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	499 self.default_notify = \
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	500 "cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s"
7618 6c89dd0a7797 Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. Jim Hague <jim.hague@acm.org> parents: 7504 diff changeset	501
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	502 class bzmysql_3_0(bzmysql_2_18):
7019 6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	503 '''support for bugzilla 3.0 series.'''
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	504
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	505 def __init__(self, ui):
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	506 bzmysql_2_18.__init__(self, ui)
7019 6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	507
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	508 def get_longdesc_id(self):
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	509 '''get identity of longdesc field'''
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	510 self.run('select id from fielddefs where name = "longdesc"')
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	511 ids = self.cursor.fetchall()
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	512 if len(ids) != 1:
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	513 raise util.Abort(_('unknown database schema'))
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	514 return ids[0][0]
6b1ece890f9a Add support for Bugzilla 3.0 series to bugzilla hook. Jim Hague <jim.hague@acm.org> parents: 6762 diff changeset	515
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	516 # Buzgilla via XMLRPC interface.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	517
15870 f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	518 class cookietransportrequest(object):
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	519 """A Transport request method that retains cookies over its lifetime.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	520
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	521 The regular xmlrpclib transports ignore cookies. Which causes
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	522 a bit of a problem when you need a cookie-based login, as with
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	523 the Bugzilla XMLRPC interface.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	524
15870 f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	525 So this is a helper for defining a Transport which looks for
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	526 cookies being set in responses and saves them to add to all future
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	527 requests.
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	528 """
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	529
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	530 # Inspiration drawn from
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	531 # http://blog.godson.in/2010/09/how-to-make-python-xmlrpclib-client.html
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	532 # http://www.itkovian.net/base/transport-class-for-pythons-xml-rpc-lib/
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	533
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	534 cookies = []
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	535 def send_cookies(self, connection):
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	536 if self.cookies:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	537 for cookie in self.cookies:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	538 connection.putheader("Cookie", cookie)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	539
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	540 def request(self, host, handler, request_body, verbose=0):
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	541 self.verbose = verbose
16193 b468cea3f29d bugzilla: stop XMLRPC requests from requesting gzipped responses Jim Hague <jim.hague@acm.org> parents: 15870 diff changeset	542 self.accept_gzip_encoding = False
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	543
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	544 # issue XML-RPC request
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	545 h = self.make_connection(host)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	546 if verbose:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	547 h.set_debuglevel(1)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	548
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	549 self.send_request(h, handler, request_body)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	550 self.send_host(h, host)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	551 self.send_cookies(h)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	552 self.send_user_agent(h)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	553 self.send_content(h, request_body)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	554
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	555 # Deal with differences between Python 2.4-2.6 and 2.7.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	556 # In the former h is a HTTP(S). In the latter it's a
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	557 # HTTP(S)Connection. Luckily, the 2.4-2.6 implementation of
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	558 # HTTP(S) has an underlying HTTP(S)Connection, so extract
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	559 # that and use it.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	560 try:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	561 response = h.getresponse()
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	562 except AttributeError:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	563 response = h._conn.getresponse()
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	564
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	565 # Add any cookie definitions to our list.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	566 for header in response.msg.getallmatchingheaders("Set-Cookie"):
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	567 val = header.split(": ", 1)[1]
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	568 cookie = val.split(";", 1)[0]
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	569 self.cookies.append(cookie)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	570
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	571 if response.status != 200:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	572 raise xmlrpclib.ProtocolError(host + handler, response.status,
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	573 response.reason, response.msg.headers)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	574
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	575 payload = response.read()
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	576 parser, unmarshaller = self.getparser()
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	577 parser.feed(payload)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	578 parser.close()
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	579
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	580 return unmarshaller.close()
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	581
15870 f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	582 # The explicit calls to the underlying xmlrpclib __init__() methods are
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	583 # necessary. The xmlrpclib.Transport classes are old-style classes, and
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	584 # it turns out their __init__() doesn't get called when doing multiple
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	585 # inheritance with a new-style class.
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	586 class cookietransport(cookietransportrequest, xmlrpclib.Transport):
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	587 def __init__(self, use_datetime=0):
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	588 xmlrpclib.Transport.__init__(self, use_datetime)
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	589
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	590 class cookiesafetransport(cookietransportrequest, xmlrpclib.SafeTransport):
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	591 def __init__(self, use_datetime=0):
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	592 xmlrpclib.SafeTransport.__init__(self, use_datetime)
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	593
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	594 class bzxmlrpc(bzaccess):
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	595 """Support for access to Bugzilla via the Bugzilla XMLRPC API.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	596
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	597 Requires a minimum Bugzilla version 3.4.
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	598 """
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	599
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	600 def __init__(self, ui):
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	601 bzaccess.__init__(self, ui)
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	602
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	603 bzweb = self.ui.config('bugzilla', 'bzurl',
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	604 'http://localhost/bugzilla/')
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	605 bzweb = bzweb.rstrip("/") + "/xmlrpc.cgi"
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	606
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	607 user = self.ui.config('bugzilla', 'user', 'bugs')
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	608 passwd = self.ui.config('bugzilla', 'password')
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	609
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	610 self.fixstatus = self.ui.config('bugzilla', 'fixstatus', 'RESOLVED')
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	611 self.fixresolution = self.ui.config('bugzilla', 'fixresolution',
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	612 'FIXED')
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	613
15870 f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	614 self.bzproxy = xmlrpclib.ServerProxy(bzweb, self.transport(bzweb))
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	615 self.bzproxy.User.login(dict(login=user, password=passwd))
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	616
15870 f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	617 def transport(self, uri):
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	618 if urlparse.urlparse(uri, "http")[0] == "https":
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	619 return cookiesafetransport()
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	620 else:
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	621 return cookietransport()
f4c859293ed4 bugzilla: make XMLRPC interface support http and https access Jim Hague <jim.hague@acm.org> parents: 14619 diff changeset	622
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	623 def get_bug_comments(self, id):
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	624 """Return a string with all comment text for a bug."""
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	625 c = self.bzproxy.Bug.comments(dict(ids=[id], include_fields=['text']))
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	626 return ''.join([t['text'] for t in c['bugs'][str(id)]['comments']])
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	627
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	628 def filter_real_bug_ids(self, bugs):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	629 probe = self.bzproxy.Bug.get(dict(ids=sorted(bugs.keys()),
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	630 include_fields=[],
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	631 permissive=True))
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	632 for badbug in probe['faults']:
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	633 id = badbug['id']
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	634 self.ui.status(_('bug %d does not exist\n') % id)
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	635 del bugs[id]
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	636
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	637 def filter_cset_known_bug_ids(self, node, bugs):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	638 for id in sorted(bugs.keys()):
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	639 if self.get_bug_comments(id).find(short(node)) != -1:
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	640 self.ui.status(_('bug %d already knows about changeset %s\n') %
60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	641 (id, short(node)))
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	642 del bugs[id]
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	643
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	644 def updatebug(self, bugid, newstate, text, committer):
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	645 args = {}
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	646 if 'hours' in newstate:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	647 args['work_time'] = newstate['hours']
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	648
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	649 if self.bzvermajor >= 4:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	650 args['ids'] = [bugid]
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	651 args['comment'] = {'body' : text}
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	652 args['status'] = self.fixstatus
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	653 args['resolution'] = self.fixresolution
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	654 self.bzproxy.Bug.update(args)
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	655 else:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	656 if 'fix' in newstate:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	657 self.ui.warn(_("Bugzilla/XMLRPC needs Bugzilla 4.0 or later "
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	658 "to mark bugs fixed\n"))
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	659 args['id'] = bugid
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	660 args['comment'] = text
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	661 self.bzproxy.Bug.add_comment(args)
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	662
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	663 class bzxmlrpcemail(bzxmlrpc):
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	664 """Read data from Bugzilla via XMLRPC, send updates via email.
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	665
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	666 Advantages of sending updates via email:
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	667 1. Comments can be added as any user, not just logged in user.
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	668 2. Bug statuses or other fields not accessible via XMLRPC can
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	669 potentially be updated.
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	670
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	671 There is no XMLRPC function to change bug status before Bugzilla
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	672 4.0, so bugs cannot be marked fixed via XMLRPC before Bugzilla 4.0.
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	673 But bugs can be marked fixed via email from 3.4 onwards.
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	674 """
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	675
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	676 def __init__(self, ui):
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	677 bzxmlrpc.__init__(self, ui)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	678
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	679 self.bzemail = self.ui.config('bugzilla', 'bzemail')
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	680 if not self.bzemail:
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	681 raise util.Abort(_("configuration 'bzemail' missing"))
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	682 mail.validateconfig(self.ui)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	683
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	684 def send_bug_modify_email(self, bugid, commands, comment, committer):
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	685 '''send modification message to Bugzilla bug via email.
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	686
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	687 The message format is documented in the Bugzilla email_in.pl
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	688 specification. commands is a list of command lines, comment is the
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	689 comment text.
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	690
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	691 To stop users from crafting commit comments with
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	692 Bugzilla commands, specify the bug ID via the message body, rather
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	693 than the subject line, and leave a blank line after it.
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	694 '''
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	695 user = self.map_committer(committer)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	696 matches = self.bzproxy.User.get(dict(match=[user]))
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	697 if not matches['users']:
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	698 user = self.ui.config('bugzilla', 'user', 'bugs')
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	699 matches = self.bzproxy.User.get(dict(match=[user]))
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	700 if not matches['users']:
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	701 raise util.Abort(_("default bugzilla user %s email not found") %
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	702 user)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	703 user = matches['users'][0]['email']
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	704
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	705 text = "\n".join(commands) + "\n@bug_id = %d\n\n" % bugid + comment
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	706
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	707 _charsets = mail._charsets(self.ui)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	708 user = mail.addressencode(self.ui, user, _charsets)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	709 bzemail = mail.addressencode(self.ui, self.bzemail, _charsets)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	710 msg = mail.mimeencode(self.ui, text, _charsets)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	711 msg['From'] = user
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	712 msg['To'] = bzemail
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	713 msg['Subject'] = mail.headencode(self.ui, "Bug modification", _charsets)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	714 sendmail = mail.connect(self.ui)
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	715 sendmail(user, bzemail, msg.as_string())
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	716
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	717 def updatebug(self, bugid, newstate, text, committer):
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	718 cmds = []
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	719 if 'hours' in newstate:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	720 cmds.append(self.makecommandline("work_time", newstate['hours']))
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	721 if 'fix' in newstate:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	722 cmds.append(self.makecommandline("bug_status", self.fixstatus))
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	723 cmds.append(self.makecommandline("resolution", self.fixresolution))
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	724 self.send_bug_modify_email(bugid, cmds, text, committer)
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	725
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	726 class bugzilla(object):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	727 # supported versions of bugzilla. different versions have
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	728 # different schemas.
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	729 _versions = {
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	730 '2.16': bzmysql,
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	731 '2.18': bzmysql_2_18,
13801 60256f7f30c1 bugzilla: add XMLRPC interface. Jim Hague <jim.hague@acm.org> parents: 13800 diff changeset	732 '3.0': bzmysql_3_0,
13802 49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	733 'xmlrpc': bzxmlrpc,
49b5a1aaf726 bugzilla: add modified XMLRPC mode that uses email to send bug comments. Jim Hague <jim.hague@acm.org> parents: 13801 diff changeset	734 'xmlrpc+email': bzxmlrpcemail
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	735 }
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	736
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	737 _default_bug_re = (r'bugs?\s,?\s(?:#\|nos?\.?\|num(?:ber)?s?)?\s*'
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	738 r'(?P<ids>(?:\d+\s(?:,?\s(?:and)?)?\s*)+)'
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	739 r'\.?\s(?:h(?:ours?)?\s(?P<hours>\d*(?:\.\d+)?))?')
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	740
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	741 _default_fix_re = (r'fix(?:es)?\s(?:bugs?\s)?,?\s*'
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	742 r'(?:nos?\.?\|num(?:ber)?s?)?\s*'
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	743 r'(?P<ids>(?:#?\d+\s(?:,?\s(?:and)?)?\s*)+)'
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	744 r'\.?\s(?:h(?:ours?)?\s(?P<hours>\d*(?:\.\d+)?))?')
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	745
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	746 _bz = None
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	747
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	748 def __init__(self, ui, repo):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	749 self.ui = ui
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	750 self.repo = repo
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	751
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	752 def bz(self):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	753 '''return object that knows how to talk to bugzilla version in
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	754 use.'''
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	755
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	756 if bugzilla._bz is None:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	757 bzversion = self.ui.config('bugzilla', 'version')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	758 try:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	759 bzclass = bugzilla._versions[bzversion]
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	760 except KeyError:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	761 raise util.Abort(_('bugzilla version %s not supported') %
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	762 bzversion)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	763 bugzilla._bz = bzclass(self.ui)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	764 return bugzilla._bz
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	765
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	766 def __getattr__(self, key):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	767 return getattr(self.bz(), key)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	768
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	769 _bug_re = None
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	770 _fix_re = None
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	771 _split_re = None
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	772
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	773 def find_bugs(self, ctx):
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	774 '''return bugs dictionary created from commit comment.
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	775
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	776 Extract bug info from changeset comments. Filter out any that are
13799 d04fc5582772 bugzilla: keep bug IDs in set. Jim Hague <jim.hague@acm.org> parents: 13798 diff changeset	777 not known to Bugzilla, and any that already have a reference to
d04fc5582772 bugzilla: keep bug IDs in set. Jim Hague <jim.hague@acm.org> parents: 13798 diff changeset	778 the given changeset in their comments.
d04fc5582772 bugzilla: keep bug IDs in set. Jim Hague <jim.hague@acm.org> parents: 13798 diff changeset	779 '''
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	780 if bugzilla._bug_re is None:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	781 bugzilla._bug_re = re.compile(
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	782 self.ui.config('bugzilla', 'regexp',
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	783 bugzilla._default_bug_re), re.IGNORECASE)
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	784 bugzilla._fix_re = re.compile(
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	785 self.ui.config('bugzilla', 'fixregexp',
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	786 bugzilla._default_fix_re), re.IGNORECASE)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	787 bugzilla._split_re = re.compile(r'\D+')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	788 start = 0
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	789 hours = 0.0
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	790 bugs = {}
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	791 bugmatch = bugzilla._bug_re.search(ctx.description(), start)
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	792 fixmatch = bugzilla._fix_re.search(ctx.description(), start)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	793 while True:
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	794 bugattribs = {}
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	795 if not bugmatch and not fixmatch:
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	796 break
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	797 if not bugmatch:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	798 m = fixmatch
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	799 elif not fixmatch:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	800 m = bugmatch
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	801 else:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	802 if bugmatch.start() < fixmatch.start():
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	803 m = bugmatch
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	804 else:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	805 m = fixmatch
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	806 start = m.end()
16223 ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	807 if m is bugmatch:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	808 bugmatch = bugzilla._bug_re.search(ctx.description(), start)
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	809 if 'fix' in bugattribs:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	810 del bugattribs['fix']
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	811 else:
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	812 fixmatch = bugzilla._fix_re.search(ctx.description(), start)
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	813 bugattribs['fix'] = None
ac4fd3238ead bugzilla: allow change comment to mark bugs fixed Jim Hague <jim.hague@acm.org> parents: 16222 diff changeset	814
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	815 try:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	816 ids = m.group('ids')
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	817 except IndexError:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	818 ids = m.group(1)
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	819 try:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	820 hours = float(m.group('hours'))
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	821 bugattribs['hours'] = hours
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	822 except IndexError:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	823 pass
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	824 except TypeError:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	825 pass
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	826 except ValueError:
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	827 self.ui.status(_("%s: invalid hours\n") % m.group('hours'))
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	828
d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	829 for id in bugzilla._split_re.split(ids):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	830 if not id:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	831 continue
16222 d7b7b453c035 bugzilla: extract optional hours from commit message and update bug time Jim Hague <jim.hague@acm.org> parents: 16221 diff changeset	832 bugs[int(id)] = bugattribs
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	833 if bugs:
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	834 self.filter_real_bug_ids(bugs)
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	835 if bugs:
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	836 self.filter_cset_known_bug_ids(ctx.node(), bugs)
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	837 return bugs
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	838
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	839 def update(self, bugid, newstate, ctx):
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	840 '''update bugzilla bug with reference to changeset.'''
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	841
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	842 def webroot(root):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	843 '''strip leading prefix of repo root and turn into
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	844 url-safe path.'''
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	845 count = int(self.ui.config('bugzilla', 'strip', 0))
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	846 root = util.pconvert(root)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	847 while count > 0:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	848 c = root.find('/')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	849 if c == -1:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	850 break
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	851 root = root[c + 1:]
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	852 count -= 1
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	853 return root
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	854
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	855 mapfile = self.ui.config('bugzilla', 'style')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	856 tmpl = self.ui.config('bugzilla', 'template')
3741 0897bf8d54c7 update bugzilla extension to use ui buffers Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	857 t = cmdutil.changeset_templater(self.ui, self.repo,
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7618 diff changeset	858 False, None, mapfile, False)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	859 if not mapfile and not tmpl:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	860 tmpl = _('changeset {node\|short} in repo {root} refers '
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	861 'to bug {bug}.\ndetails:\n\t{desc\|tabindent}')
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	862 if tmpl:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	863 tmpl = templater.parsestring(tmpl, quoted=False)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	864 t.use_template(tmpl)
3741 0897bf8d54c7 update bugzilla extension to use ui buffers Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	865 self.ui.pushbuffer()
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7280 diff changeset	866 t.show(ctx, changes=ctx.changeset(),
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	867 bug=str(bugid),
2197 5de8b44f0446 define standard name for base url to use when printing hgweb urls. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2192 diff changeset	868 hgweb=self.ui.config('web', 'baseurl'),
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	869 root=self.repo.root,
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	870 webroot=webroot(self.repo.root))
3741 0897bf8d54c7 update bugzilla extension to use ui buffers Matt Mackall <mpm@selenic.com> parents: 3643 diff changeset	871 data = self.ui.popbuffer()
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	872 self.updatebug(bugid, newstate, data, util.email(ctx.user()))
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	873
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	874 def hook(ui, repo, hooktype, node=None, **kwargs):
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	875 '''add comment to bugzilla for each changeset that refers to a
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	876 bugzilla bug id. only add a comment once per bug, so same change
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	877 seen multiple times does not fill bug with duplicate data.'''
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	878 if node is None:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	879 raise util.Abort(_('hook type %s does not pass a changeset id') %
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	880 hooktype)
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	881 try:
2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	882 bz = bugzilla(ui, repo)
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6548 diff changeset	883 ctx = repo[node]
16221 4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	884 bugs = bz.find_bugs(ctx)
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	885 if bugs:
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	886 for bug in bugs:
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	887 bz.update(bug, bugs[bug], ctx)
4fc9fcd991c1 bugzilla: modify access interface to include new bug states Jim Hague <jim.hague@acm.org> parents: 16193 diff changeset	888 bz.notify(bugs, util.email(ctx.user()))
13800 c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	889 except Exception, e:
c2ef8159dabe bugzilla: localise all MySQL direct access inside access class. Jim Hague <jim.hague@acm.org> parents: 13799 diff changeset	890 raise util.Abort(_('Bugzilla error: %s') % e)
2192 2be3ac7abc21 add bugzilla integration hook. example of writing hook in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	891

Mercurial > public > mercurial-scm > hg

annotate hgext/bugzilla.py @ 16223:ac4fd3238ead