Merge lp:~jelmer/bzr-commitfromnews/extractbugnumbers into lp:bzr-commitfromnews

[Jelmer Vernooij]

Initial work on setting revision properties based on information in NEWS.

Now updated to use "lp:BUGNO" rather than "#BUGNO"

[Robert Collins (lifeless)]

 review: needsfixing

This is looking pretty good. Uhm, I don't like #1234 being picked up -
lets look for lp:1234 - that way we don't have any confusion about what
bug tracker. And yes, I think that that will matter a great deal.

You can introspect bzr's bugs module to get a list of prefixes that can
be looked for sensibly, pretty easily.

Cheers,
Rob

review: Needs Fixing

[Jelmer Vernooij (jelmer)]

Updated. This now uses lp:1234 to talk about Launchpad bug numbers. It wasn't quite as easy to handle other bug trackers too, so I've kept it Launchpad-specific for now, but adding support for the other bug trackers should be possible without changing the behaviour for lp-specific bugs.

=== modified file 'committemplate.py'
--- committemplate.py	2010-02-27 12:38:57 +0000
+++ committemplate.py	2011-12-08 13:57:23 +0000
@@ -18,8 +18,11 @@
 
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
-from bzrlib import osutils, patiencediff
+from bzrlib import bugtracker, errors, osutils, patiencediff
 """)
+import re
+
+_BUG_MATCH = re.compile(r'lp:(\d+)')
 
 class CommitTemplate(object):
 
@@ -85,6 +88,16 @@
                 if tag == 'delete':
                     continue
                 new_lines.extend(new[j1:j2])
+            if not self.commit.revprops.get('bugs'):
+                # TODO: Allow the user to configure the bug tracker to use
+                # rather than hardcoding Launchpad.
+                bt = bugtracker.tracker_registry.get('launchpad')
+                bugids = []
+                for line in new_lines:
+                    bugids.extend(_BUG_MATCH.findall(line))
+                self.commit.revprops['bugs'] = \
+                    bugtracker.encode_fixes_bug_urls(
+                        [bt.get_bug_url(bugid) for bugid in bugids])
             return self.merge_message(''.join(new_lines))
 
     def merge_message(self, new_message):
 
=== modified file 'tests/test_committemplate.py'
--- tests/test_committemplate.py	2010-02-27 12:17:25 +0000
+++ tests/test_committemplate.py	2011-12-08 13:57:23 +0000
@@ -20,9 +20,25 @@
 from bzrlib import msgeditor
 from bzrlib.tests import TestCaseWithTransport
 
+INITIAL_NEWS_CONTENT = """----------------------------
+commitfromnews release notes
+----------------------------
+
+NEXT (In development)
+---------------------
+
+IMPROVEMENTS
+~~~~~~~~~~~~
+
+* Created plugin, basic functionality of looking for NEWS and including the
+  NEWS diff.
+"""
+
+
 class TestCommitTemplate(TestCaseWithTransport):
 
     def capture_template(self, commit, message):
+        self.commits.append(commit)
         self.messages.append(message)
         if message is None:
             message = 'let this commit succeed I command thee.'
@@ -33,6 +49,7 @@
         msgeditor.hooks.install_named_hook('commit_message_template',
             self.capture_template, 'commitfromnews test template')
         self.messages = []
+        self.commits = []
 
     def test_initial(self):
         self.setup_capture()
@@ -50,19 +67,7 @@
         self.setup_capture()
         builder = self.make_branch_builder('test')
         builder.start_series()
-        content = """----------------------------
-commitfromnews release notes
-----------------------------
-
-NEXT (In development)
----------------------
-
-IMPROVEMENTS
-~~~~~~~~~~~~
-
-* Created plugin, basic functionality of looking for NEWS and including the
-  NEWS diff.
-"""
+        content = INITIAL_NEWS_CONTENT
         builder.build_snapshot('BASE-id', None,
             [('add', ('', None, 'directory', None)),
              ('add', ('NEWS', 'foo-id', 'file', content)),
@@ -75,19 +80,7 @@
         self.setup_capture()
         builder = self.make_branch_builder('test')
         builder.start_series()
-        orig_content = """----------------------------
-commitfromnews release notes
-----------------------------
-
-NEXT (In development)
----------------------
-
-IMPROVEMENTS
-~~~~~~~~~~~~
-
-* Created plugin, basic functionality of looking for NEWS and including the
-  NEWS diff.
-"""
+        orig_content = INITIAL_NEWS_CONTENT
         mod_content = """----------------------------
 commitfromnews release notes
 ----------------------------
@@ -117,5 +110,44 @@
         builder.finish_series()
         self.assertEqual([change_content], self.messages)
 
+    def test_fix_bug(self):
+        self.setup_capture()
+        builder = self.make_branch_builder('test')
+        builder.start_series()
+        orig_content = INITIAL_NEWS_CONTENT
+        mod_content = """----------------------------
+commitfromnews release notes
+----------------------------
+
+NEXT (In development)
+---------------------
+
+IMPROVEMENTS
+~~~~~~~~~~~~
+
+* Created plugin, basic functionality of looking for NEWS and including the
+  NEWS diff.
+
+* Fixed a horrible bug. (lp:523423)
+
+"""
+        change_content = """
+* Fixed a horrible bug. (lp:523423)
+
+"""
+        builder.build_snapshot('BASE-id', None,
+            [('add', ('', None, 'directory', None)),
+             ('add', ('NEWS', 'foo-id', 'file', orig_content)),
+             ])
+        builder.build_snapshot(None, None,
+            [('modify', ('foo-id', mod_content)),
+             ],
+            message_callback=msgeditor.generate_commit_message_template)
+        builder.finish_series()
+        self.assertEqual([change_content], self.messages)
+        self.assertEqual(1, len(self.commits))
+        self.assertEquals('https://launchpad.net/bugs/523423 fixed',
+                          self.commits[0].revprops['bugs'])
+
     def _todo_test_passes_messages_through(self):
         pass