Delta Between Two Patch Sets: sitescripts/hg/bin/update_issues.py
Issue 29336790:
Issue 3674 - Add a hg hook that references commits in issues (Closed)
Left Patch Set: Address comments
Created Feb. 23, 2016, 4:22 p.m.
Right Patch Set: Don't use RegexObject.match
Created Feb. 23, 2016, 9:39 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« .sitescripts.example ('k')
|
sitescripts/hg/template/issue_commit_comment.tmpl » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 | 2 |
| 3 # This file is part of Adblock Plus <https://adblockplus.org/>, | 3 # This file is part of Adblock Plus <https://adblockplus.org/>, |
| 4 # Copyright (C) 2006-2016 Eyeo GmbH | 4 # Copyright (C) 2006-2016 Eyeo GmbH |
| 5 # | 5 # |
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | 6 # Adblock Plus is free software: you can redistribute it and/or modify |
| 7 # it under the terms of the GNU General Public License version 3 as | 7 # it under the terms of the GNU General Public License version 3 as |
| 8 # published by the Free Software Foundation. | 8 # published by the Free Software Foundation. |
| 9 # | 9 # |
| 10 # Adblock Plus is distributed in the hope that it will be useful, | 10 # Adblock Plus is distributed in the hope that it will be useful, |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 issue_id = int(issue_id) | 41 issue_id = int(issue_id) |
| 42 url = get_config().get("hg", "trac_xmlrpc_url") | 42 url = get_config().get("hg", "trac_xmlrpc_url") |
| 43 server = xmlrpclib.ServerProxy(url) | 43 server = xmlrpclib.ServerProxy(url) |
| 44 attributes = server.ticket.get(issue_id)[3] | 44 attributes = server.ticket.get(issue_id)[3] |
| 45 server.ticket.update(issue_id, comment, | 45 server.ticket.update(issue_id, comment, |
| 46 {"_ts": attributes["_ts"], "action": "leave"}, True) | 46 {"_ts": attributes["_ts"], "action": "leave"}, True) |
| 47 | 47 |
| 48 def hook(ui, repo, node, **kwargs): | 48 def hook(ui, repo, node, **kwargs): |
| 49 first_change = repo[node] | 49 first_change = repo[node] |
| 50 issue_number_regex = re.compile(r"\bissue\s+(\d+)\b", re.I) | 50 issue_number_regex = re.compile(r"\bissue\s+(\d+)\b", re.I) |
| 51 noissue_regex = re.compile(r"noissue\b", re.I) | 51 noissue_regex = re.compile(r"^noissue\b", re.I) |
| 52 changes_by_issue = {} | 52 changes_by_issue = {} |
| 53 for revision in xrange(first_change.rev(), len(repo)): | 53 for revision in xrange(first_change.rev(), len(repo)): |
| 54 change = repo[revision] | 54 change = repo[revision] |
| 55 description = change.description() | 55 description = change.description() |
| 56 issue_ids = issue_number_regex.findall(description) | 56 issue_ids = issue_number_regex.findall(description) |
| 57 if issue_ids: | 57 if issue_ids: |
| 58 for issue_id in issue_ids: | 58 for issue_id in issue_ids: |
| 59 changes_by_issue.setdefault(issue_id, []).append(change) | 59 changes_by_issue.setdefault(issue_id, []).append(change) |
| 60 elif not noissue_regex.match(description): | 60 elif not noissue_regex.search(description): |
| 61 # We should just reject all changes when one of them has an invalid | 61 # We should just reject all changes when one of them has an invalid |
| 62 # commit message format, see: https://issues.adblockplus.org/ticket/3679 | 62 # commit message format, see: https://issues.adblockplus.org/ticket/3679 |
| 63 ui.warn("warning: invalid commit message format in changeset %s\n" % | 63 ui.warn("warning: invalid commit message format in changeset %s\n" % |
| 64 change) | 64 change) |
| 65 | 65 |
| 66 repository_name = posixpath.split(repo.url())[1] | 66 repository_name = posixpath.split(repo.url())[1] |
| 67 comments = _generate_comments(repository_name, changes_by_issue) | 67 comments = _generate_comments(repository_name, changes_by_issue) |
| 68 | 68 |
| 69 issue_url_template = get_config().get("hg", "issue_url_template") | 69 issue_url_template = get_config().get("hg", "issue_url_template") |
| 70 for issue_id, comment in comments.iteritems(): | 70 for issue_id, comment in comments.iteritems(): |
| 71 try: | 71 try: |
| 72 _post_comment(issue_id, comment) | 72 _post_comment(issue_id, comment) |
| 73 ui.status("updating %s\n" % issue_url_template.format(id=issue_id)) | 73 ui.status("updating %s\n" % issue_url_template.format(id=issue_id)) |
| 74 except: | 74 except: |
| 75 ui.warn("warning: failed to update %s\n" % | 75 ui.warn("warning: failed to update %s\n" % |
| 76 issue_url_template.format(id=issue_id)) | 76 issue_url_template.format(id=issue_id)) |
| LEFT | RIGHT |
« .sitescripts.example ('k')
|
sitescripts/hg/template/issue_commit_comment.tmpl » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
