Issue 7334 - Remove handling of "Fixes XXXX - ..." commit messages

sitescripts/hg/bin/update_issues.py

 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
 
 """A changegroup (or pretxnchangegroup) hook for Trac integration.

[mathias, 2019/05/14 09:32:02]

Why do you insist on naming the type(s) of hook?

[Vasily Kuznetsov, 2019/05/14 10:28:59]

This is the intended use and I haven't checked if it can work in other contexts,
so it seems like a useful bit of information here.

 
 Checks commit messages for issue references and posts comments linking to the
 commits into referenced issues.
 """
 
 import collections
 import posixpath
 import re
 import xmlrpclib
 
 from sitescripts.utils import get_config, get_template
 
 
 ISSUE_NUMBER_REGEX = re.compile(r'\bissue\s+(\d+)\b', re.I)

[mathias, 2019/05/13 12:23:43]

Shouldn't this one include the separating dash? I.e. `Issue 1337 - Foo bar baz`?
Same goes for the NOISSUE_REGEX below, though that is not part of this patch-set
(yet).

[Vasily Kuznetsov, 2019/05/13 15:14:15]

Yeah I see what you mean, but I'd rather leave it as it was for now because:

- This commit is supposed to undo the change that added "fixes xxx" notation,
making "issue xxx" more precise is a bit out of scope.
- If we add the space and the dash to the regex, it will break the processing of
multiple references: "Issue 1, Issue 2 - foobar". We could fix it, of course, 
but that's extra work that doesn't seem justified at this point.

[mathias, 2019/05/14 09:32:01]

Acknowledged.

 NOISSUE_REGEX = re.compile(r'^noissue\b', re.I)
 
 
 def _format_description(change):
     lines = change.description().splitlines()
     message = lines[0].rstrip()
     if len(lines) == 1 or lines[1].strip() == '':
         return message
     return message.rstrip('.') + '...'
 
@@ skipping 42 matching lines @@
         elif not NOISSUE_REGEX.search(description):
             ui.warn('warning: invalid commit message format in changeset {}\n'
                     .format(commit))
 
     repository_name = posixpath.split(repo.url())[1]
     comments = _generate_comments(repository_name, changes_by_issue)
 
     issue_url_template = get_config().get('hg', 'issue_url_template')
     for issue_id, comment in comments.items():
         issue_url = issue_url_template.format(id=issue_id)
+        ui.status('updating {}\n'.format(issue_url))
         try:
             _post_comment(issue_id, comment)
-            ui.status('updating {}\n'.format(issue_url))

[mathias, 2019/05/14 09:32:02]

This should not be in the `try` block. It should either come before the `try`
and the call to `_post_comment` OR use past tense and be in an `else` block. 

[Vasily Kuznetsov, 2019/05/14 10:28:59]

Makes sense. Done.

         except Exception as exc:
             ui.warn('warning: failed to update {}\n'.format(issue_url))
             ui.warn('error message: {}\n'.format(exc))
-
-# Alias for smooth migration.
-changegroup_hook = hook

[mathias, 2019/05/14 09:32:01]

This should not be necessary at all:

    hg@hg-2:~$ grep changegroup_hook web/*/.hg/hgrc | wc -l
    0

[Vasily Kuznetsov, 2019/05/14 10:29:00]

👍
Done!