~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2007-2010 Canonical Ltd
2376.4.4 by jml at canonical
Beginnings of generic bug-tracker plugin system.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2376.4.4 by jml at canonical
Beginnings of generic bug-tracker plugin system.
16
5121.2.4 by Jelmer Vernooij
Remove more unused imports.
17
from bzrlib import registry
2376.4.6 by jml at canonical
Basic docstrings for bugtracker.py
18
from bzrlib.lazy_import import lazy_import
19
lazy_import(globals(), """
2376.4.17 by Jonathan Lange
Use urlutils.join instead of ugly, buggy, string mashing
20
from bzrlib import errors, urlutils
2376.4.6 by jml at canonical
Basic docstrings for bugtracker.py
21
""")
2376.4.4 by jml at canonical
Beginnings of generic bug-tracker plugin system.
22
23
2376.4.7 by jml at canonical
- Add docstrings to tests.
24
"""Provides a shorthand for referring to bugs on a variety of bug trackers.
25
26
'commit --fixes' stores references to bugs as a <bug_url> -> <bug_status>
27
mapping in the properties for that revision.
28
29
However, it's inconvenient to type out full URLs for bugs on the command line,
30
particularly given that many users will be using only a single bug tracker per
31
branch.
32
33
Thus, this module provides a registry of types of bug tracker (e.g. Launchpad,
2376.4.23 by Jonathan Lange
Change 'tag' to 'abbreviated_tracker_name'
34
Trac). Given an abbreviated name (e.g. 'lp', 'twisted') and a branch with
2376.4.7 by jml at canonical
- Add docstrings to tests.
35
configuration information, these tracker types can return an instance capable
36
of converting bug IDs into URLs.
37
"""
38
39
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
40
_bugs_help = \
41
"""When making a commit, metadata about bugs fixed by that change can be
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
42
recorded by using the ``--fixes`` option. For each bug marked as fixed, an
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
43
entry is included in the 'bugs' revision property stating '<url> <status>'.
3154.1.1 by Ian Clatworthy
Minor tweaks to bug tracker integration documentation
44
(The only ``status`` value currently supported is ``fixed.``)
3535.10.2 by James Westby
Flesh out the bugs help topic and explain the simple things first.
45
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
46
The ``--fixes`` option allows you to specify a bug tracker and a bug identifier
47
rather than a full URL. This looks like::
3535.10.2 by James Westby
Flesh out the bugs help topic and explain the simple things first.
48
3535.10.3 by James Westby
Talk about "trackers" rather than "tags" as it may be less confusing.
49
    bzr commit --fixes <tracker>:<id>
3535.10.2 by James Westby
Flesh out the bugs help topic and explain the simple things first.
50
6120.1.2 by Jelmer Vernooij
Doc doc doc.
51
or::
52
53
    bzr commit --fixes <id>
54
3535.10.3 by James Westby
Talk about "trackers" rather than "tags" as it may be less confusing.
55
where "<tracker>" is an identifier for the bug tracker, and "<id>" is the
3535.10.2 by James Westby
Flesh out the bugs help topic and explain the simple things first.
56
identifier for that bug within the bugtracker, usually the bug number.
6120.1.2 by Jelmer Vernooij
Doc doc doc.
57
If "<tracker>" is not specified the ``bugtracker`` set in the branch
58
or global configuration is used.
3535.10.2 by James Westby
Flesh out the bugs help topic and explain the simple things first.
59
3535.10.5 by James Westby
Don't say "well-known" as suggested by Robert.
60
Bazaar knows about a few bug trackers that have many users. If
3535.10.2 by James Westby
Flesh out the bugs help topic and explain the simple things first.
61
you use one of these bug trackers then there is no setup required to
3535.10.3 by James Westby
Talk about "trackers" rather than "tags" as it may be less confusing.
62
use this feature, you just need to know the tracker identifier to use.
63
These are the bugtrackers that are built in:
64
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
65
  ============================ ============ ============
66
  URL                          Abbreviation Example
67
  ============================ ============ ============
68
  https://bugs.launchpad.net/  lp           lp:12345
69
  http://bugs.debian.org/      deb          deb:12345
70
  http://bugzilla.gnome.org/   gnome        gnome:12345
71
  ============================ ============ ============
3535.10.2 by James Westby
Flesh out the bugs help topic and explain the simple things first.
72
3535.10.5 by James Westby
Don't say "well-known" as suggested by Robert.
73
For the bug trackers not listed above configuration is required.
74
Support for generating the URLs for any project using Bugzilla or Trac
75
is built in, along with a template mechanism for other bugtrackers with
3535.10.6 by James Westby
Mention that the a plugin can support their tracker as the last resort.
76
simple URL schemes. If your bug tracker can't be described by one
77
of the schemes described below then you can write a plugin to support
78
it.
3535.10.2 by James Westby
Flesh out the bugs help topic and explain the simple things first.
79
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
80
If you use Bugzilla or Trac, then you only need to set a configuration
81
variable which contains the base URL of the bug tracker. These options
82
can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific
83
configuration section in ``locations.conf``.  You can set up these values
84
for each of the projects you work on.
85
86
Note: As you provide a short name for each tracker, you can specify one or
87
more bugs in one or more trackers at commit time if you wish.
88
3860.2.1 by Martin Pool
Mention in 'help bugs' the syntax for Launchpad
89
Launchpad
90
---------
91
92
Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2.
93
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
94
bugzilla_<tracker>_url
95
----------------------
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
96
97
If present, the location of the Bugzilla bug tracker referred to by
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
98
<tracker>. This option can then be used together with ``bzr commit
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
99
--fixes`` to mark bugs in that tracker as being fixed by that commit. For
100
example::
101
5444.1.1 by Martin Pool
Updated URL for Squid bugzilla
102
    bugzilla_squid_url = http://bugs.squid-cache.org
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
103
104
would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as
105
fixed.
106
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
107
trac_<tracker>_url
108
------------------
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
109
110
If present, the location of the Trac instance referred to by
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
111
<tracker>. This option can then be used together with ``bzr commit
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
112
--fixes`` to mark bugs in that tracker as being fixed by that commit. For
113
example::
114
115
    trac_twisted_url = http://www.twistedmatrix.com/trac
116
117
would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 as
118
fixed.
119
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
120
bugtracker_<tracker>_url
121
------------------------
3089.3.14 by Ian Clatworthy
follow-up tweaks to bzr.dev integration
122
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
123
If present, the location of a generic bug tracker instance referred to by
4927.2.6 by Ian Clatworthy
Nicer formatting of bug tracking topic
124
<tracker>. The location must contain an ``{id}`` placeholder,
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
125
which will be replaced by a specific bug ID. This option can then be used
126
together with ``bzr commit --fixes`` to mark bugs in that tracker as being
127
fixed by that commit. For example::
128
129
    bugtracker_python_url = http://bugs.python.org/issue{id}
130
131
would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's
132
Roundup bug tracker as fixed, or::
133
134
    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}
135
5409.3.1 by Alexandre Garnier
Allow using string bug ID with generic bug trackers.
136
would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's
137
RT bug tracker as fixed, or::
138
139
    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}
140
141
would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-1234
142
in Hudson's JIRA bug tracker as fixed.
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
143
"""
144
145
2376.4.23 by Jonathan Lange
Change 'tag' to 'abbreviated_tracker_name'
146
def get_bug_url(abbreviated_bugtracker_name, branch, bug_id):
147
    """Return a URL pointing to the canonical web page of the bug identified by
148
    'bug_id'.
149
    """
150
    tracker = tracker_registry.get_tracker(abbreviated_bugtracker_name, branch)
151
    return tracker.get_bug_url(bug_id)
2376.4.4 by jml at canonical
Beginnings of generic bug-tracker plugin system.
152
153
154
class TrackerRegistry(registry.Registry):
155
    """Registry of bug tracker types."""
156
2376.4.23 by Jonathan Lange
Change 'tag' to 'abbreviated_tracker_name'
157
    def get_tracker(self, abbreviated_bugtracker_name, branch):
158
        """Return the first registered tracker that understands
159
        'abbreviated_bugtracker_name'.
2376.4.7 by jml at canonical
- Add docstrings to tests.
160
161
        If no such tracker is found, raise KeyError.
162
        """
2376.4.23 by Jonathan Lange
Change 'tag' to 'abbreviated_tracker_name'
163
        for tracker_name in self.keys():
164
            tracker_type = self.get(tracker_name)
165
            tracker = tracker_type.get(abbreviated_bugtracker_name, branch)
2376.4.4 by jml at canonical
Beginnings of generic bug-tracker plugin system.
166
            if tracker is not None:
167
                return tracker
2376.4.28 by Jonathan Lange
Focus the tests better and clean up some dodgy bits in UnknownBugTrackerAbbreviation
168
        raise errors.UnknownBugTrackerAbbreviation(abbreviated_bugtracker_name,
169
                                                   branch)
2376.4.7 by jml at canonical
- Add docstrings to tests.
170
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
171
    def help_topic(self, topic):
3053.8.1 by Ian Clatworthy
Improve bug tracker integration documentation (Ian Clatworthy)
172
        return _bugs_help
2376.4.36 by Jonathan Lange
Provide really basic help topic for our bug tracker support.
173
2376.4.4 by jml at canonical
Beginnings of generic bug-tracker plugin system.
174
175
tracker_registry = TrackerRegistry()
2376.4.6 by jml at canonical
Basic docstrings for bugtracker.py
176
"""Registry of bug trackers."""
2376.4.4 by jml at canonical
Beginnings of generic bug-tracker plugin system.
177
2376.4.15 by Jonathan Lange
Whitespace cleanup
178
2376.4.40 by Jonathan Lange
Redo the hierarchy of bug trackers to reduce duplication.
179
class BugTracker(object):
180
    """Base class for bug trackers."""
181
182
    def check_bug_id(self, bug_id):
183
        """Check that the bug_id is valid.
184
185
        The base implementation assumes that all bug_ids are valid.
186
        """
187
188
    def get_bug_url(self, bug_id):
189
        """Return the URL for bug_id. Raise an error if bug ID is malformed."""
190
        self.check_bug_id(bug_id)
191
        return self._get_bug_url(bug_id)
192
193
    def _get_bug_url(self, bug_id):
194
        """Given a validated bug_id, return the bug's web page's URL."""
195
196
197
class IntegerBugTracker(BugTracker):
198
    """A bug tracker that only allows integer bug IDs."""
199
200
    def check_bug_id(self, bug_id):
201
        try:
202
            int(bug_id)
203
        except ValueError:
204
            raise errors.MalformedBugIdentifier(bug_id, "Must be an integer")
205
206
207
class UniqueIntegerBugTracker(IntegerBugTracker):
2376.4.19 by Jonathan Lange
Rename SimpleBugTracker to UniqueBugTracker
208
    """A style of bug tracker that exists in one place only, such as Launchpad.
2376.4.15 by Jonathan Lange
Whitespace cleanup
209
2376.4.41 by Jonathan Lange
Update UniqueIntegerBugTracker docstring for new API
210
    If you have one of these trackers then register an instance passing in an
3270.5.3 by James Westby
No longer add an extra class to accomoadate gnome.
211
    abbreviated name for the bug tracker and a base URL. The bug ids are
212
    appended directly to the URL.
2376.5.1 by James Westby
Add a superclass for easy bug trackers. Also add bugs.debian.org as deb:
213
    """
214
2376.4.25 by Jonathan Lange
Make singleton bug tracker thing work via instances.
215
    def __init__(self, abbreviated_bugtracker_name, base_url):
216
        self.abbreviation = abbreviated_bugtracker_name
217
        self.base_url = base_url
218
219
    def get(self, abbreviated_bugtracker_name, branch):
2376.4.23 by Jonathan Lange
Change 'tag' to 'abbreviated_tracker_name'
220
        """Returns the tracker if the abbreviation matches. Returns None
221
        otherwise."""
2376.4.25 by Jonathan Lange
Make singleton bug tracker thing work via instances.
222
        if abbreviated_bugtracker_name != self.abbreviation:
2376.5.1 by James Westby
Add a superclass for easy bug trackers. Also add bugs.debian.org as deb:
223
            return None
2376.4.25 by Jonathan Lange
Make singleton bug tracker thing work via instances.
224
        return self
2376.5.1 by James Westby
Add a superclass for easy bug trackers. Also add bugs.debian.org as deb:
225
2376.4.40 by Jonathan Lange
Redo the hierarchy of bug trackers to reduce duplication.
226
    def _get_bug_url(self, bug_id):
2376.5.1 by James Westby
Add a superclass for easy bug trackers. Also add bugs.debian.org as deb:
227
        """Return the URL for bug_id."""
3270.5.3 by James Westby
No longer add an extra class to accomoadate gnome.
228
        return self.base_url + bug_id
2376.5.1 by James Westby
Add a superclass for easy bug trackers. Also add bugs.debian.org as deb:
229
230
2376.4.25 by Jonathan Lange
Make singleton bug tracker thing work via instances.
231
tracker_registry.register(
232
    'launchpad', UniqueIntegerBugTracker('lp', 'https://launchpad.net/bugs/'))
233
234
235
tracker_registry.register(
2376.4.29 by Jonathan Lange
Tests for builtin trackers.
236
    'debian', UniqueIntegerBugTracker('deb', 'http://bugs.debian.org/'))
2376.4.4 by jml at canonical
Beginnings of generic bug-tracker plugin system.
237
2376.4.15 by Jonathan Lange
Whitespace cleanup
238
3270.5.3 by James Westby
No longer add an extra class to accomoadate gnome.
239
tracker_registry.register('gnome',
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
240
    UniqueIntegerBugTracker('gnome',
241
                            'http://bugzilla.gnome.org/show_bug.cgi?id='))
3270.5.3 by James Westby
No longer add an extra class to accomoadate gnome.
242
243
5409.3.1 by Alexandre Garnier
Allow using string bug ID with generic bug trackers.
244
class URLParametrizedBugTracker(BugTracker):
2376.4.40 by Jonathan Lange
Redo the hierarchy of bug trackers to reduce duplication.
245
    """A type of bug tracker that can be found on a variety of different sites,
246
    and thus needs to have the base URL configured.
247
248
    Looks for a config setting in the form '<type_name>_<abbreviation>_url'.
5409.3.1 by Alexandre Garnier
Allow using string bug ID with generic bug trackers.
249
    `type_name` is the name of the type of tracker and `abbreviation`
250
    is a short name for the particular instance.
2376.4.40 by Jonathan Lange
Redo the hierarchy of bug trackers to reduce duplication.
251
    """
252
2376.4.42 by Jonathan Lange
Parametrize URLParametrizedIntegerBugTracker even further so we don't need to
253
    def get(self, abbreviation, branch):
2376.4.40 by Jonathan Lange
Redo the hierarchy of bug trackers to reduce duplication.
254
        config = branch.get_config()
255
        url = config.get_user_option(
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
256
            "%s_%s_url" % (self.type_name, abbreviation), expand=False)
2376.4.40 by Jonathan Lange
Redo the hierarchy of bug trackers to reduce duplication.
257
        if url is None:
258
            return None
259
        self._base_url = url
2376.4.42 by Jonathan Lange
Parametrize URLParametrizedIntegerBugTracker even further so we don't need to
260
        return self
261
262
    def __init__(self, type_name, bug_area):
263
        self.type_name = type_name
264
        self._bug_area = bug_area
2376.4.40 by Jonathan Lange
Redo the hierarchy of bug trackers to reduce duplication.
265
266
    def _get_bug_url(self, bug_id):
2376.4.6 by jml at canonical
Basic docstrings for bugtracker.py
267
        """Return a URL for a bug on this Trac instance."""
2376.4.42 by Jonathan Lange
Parametrize URLParametrizedIntegerBugTracker even further so we don't need to
268
        return urlutils.join(self._base_url, self._bug_area) + str(bug_id)
269
270
5676.1.4 by Jelmer Vernooij
merge bzr.dev.
271
class URLParametrizedIntegerBugTracker(IntegerBugTracker,
272
                                       URLParametrizedBugTracker):
273
    """A type of bug tracker that  only allows integer bug IDs.
274
275
    This can be found on a variety of different sites, and thus needs to have
276
    the base URL configured.
5409.3.1 by Alexandre Garnier
Allow using string bug ID with generic bug trackers.
277
278
    Looks for a config setting in the form '<type_name>_<abbreviation>_url'.
279
    `type_name` is the name of the type of tracker (e.g. 'bugzilla' or 'trac')
280
    and `abbreviation` is a short name for the particular instance (e.g.
281
    'squid' or 'apache').
282
    """
283
2376.4.42 by Jonathan Lange
Parametrize URLParametrizedIntegerBugTracker even further so we don't need to
284
tracker_registry.register(
285
    'trac', URLParametrizedIntegerBugTracker('trac', 'ticket/'))
286
287
tracker_registry.register(
288
    'bugzilla',
289
    URLParametrizedIntegerBugTracker('bugzilla', 'show_bug.cgi?id='))
3035.3.1 by Lukáš Lalinský
Generic bug tracker configuration.
290
291
5409.3.1 by Alexandre Garnier
Allow using string bug ID with generic bug trackers.
292
class GenericBugTracker(URLParametrizedBugTracker):
3035.3.1 by Lukáš Lalinský
Generic bug tracker configuration.
293
    """Generic bug tracker specified by an URL template."""
294
295
    def __init__(self):
3035.3.2 by Lukáš Lalinský
Add tests for InvalidBugTrackerURL.
296
        super(GenericBugTracker, self).__init__('bugtracker', None)
297
298
    def get(self, abbreviation, branch):
299
        self._abbreviation = abbreviation
300
        return super(GenericBugTracker, self).get(abbreviation, branch)
3035.3.1 by Lukáš Lalinský
Generic bug tracker configuration.
301
302
    def _get_bug_url(self, bug_id):
303
        """Given a validated bug_id, return the bug's web page's URL."""
304
        if '{id}' not in self._base_url:
305
            raise errors.InvalidBugTrackerURL(self._abbreviation,
306
                                              self._base_url)
307
        return self._base_url.replace('{id}', str(bug_id))
308
309
310
tracker_registry.register('generic', GenericBugTracker())
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
311
312
4119.4.2 by Jonathan Lange
Some refactoring, some unit tests.
313
FIXED = 'fixed'
314
4119.4.3 by Jonathan Lange
Add Revision.iter_bugs.
315
ALLOWED_BUG_STATUSES = set([FIXED])
316
4119.4.2 by Jonathan Lange
Some refactoring, some unit tests.
317
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
318
def encode_fixes_bug_urls(bug_urls):
4119.4.5 by Jonathan Lange
Fix the docstring.
319
    """Get the revision property value for a commit that fixes bugs.
320
321
    :param bug_urls: An iterable of escaped URLs to bugs. These normally
322
        come from `get_bug_url`.
323
    :return: A string that will be set as the 'bugs' property of a revision
324
        as part of a commit.
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
325
    """
4119.4.2 by Jonathan Lange
Some refactoring, some unit tests.
326
    return '\n'.join(('%s %s' % (url, FIXED)) for url in bug_urls)