Add support for Closes tags with custom Bugzilla resolution #190
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arthurzam
requested changes
Jun 25, 2024
src/pkgdev/const.py
Outdated
| @@ -40,3 +40,8 @@ def _GET_CONST(attr, default_value): | |||
| USER_CONF_FILE = os.path.join(getattr(_module, "USER_CONFIG_PATH"), "pkgdev.conf") | |||
| SYSTEM_CONF_FILE = "/etc/pkgdev/pkgdev.conf" | |||
| BUNDLED_CONF_FILE = os.path.join(DATA_PATH, "pkgdev.conf") | |||
|
|
|||
| BZ_FIXED = "fixed" | |||
There was a problem hiding this comment.
please define it using python's enum.Enum, you can get all the know values from it
src/pkgdev/scripts/pkgdev_commit.py
Outdated
| raise ValueError("URL-like value without resolution") | ||
| res = res.lower() if res else const.BZ_FIXED | ||
| if not (bug and res in const.BZ_RESOLUTIONS): | ||
| raise argparse.ArgumentError(self, f"invalid commit tag: {values}") |
There was a problem hiding this comment.
Suggested change
| raise argparse.ArgumentError(self, f"invalid commit tag: {values}") | |
| raise argparse.ArgumentError(self, f"invalid commit tag {res!r}, should be one of: {values}") |
src/pkgdev/scripts/pkgdev_commit.py
Outdated
| return | ||
|
|
||
| url = self.parse_url(bug) | ||
| is_bgo = url.split("//", 1)[1].startswith("bugs.gentoo.org") |
There was a problem hiding this comment.
Suggested change
| is_bgo = url.split("//", 1)[1].startswith("bugs.gentoo.org") | |
| is_bgo = "bugs.gentoo.org" in url |
We can be simpler, even if not 100% quality check
|
Thanks for the feedback! I've been busy all week and I'll be implementing it on Sunday. Sorry for the delay! |
Support resolutions FIXED, OBSOLETE and PKGREMOVED, provided that the bug belongs to b.g.o. The default and fallback resolution is FIXED. Together with server-side changes to https://gitweb.gentoo.org/infra/githooks.git/, this patch allows Gentoo contributors to generate commit tags that cause bugs to be closed automatically with the indicated resolution. Currently, only the string after the last colon in the argument is significant for the resolution. Therefore, one could theoretically craft invalid tags such as 'Closes: https://bugs.gentoo.org/123:foo (obsolete)' Signed-off-by: Lucio Sauer <[email protected]>
Signed-off-by: Lucio Sauer <[email protected]>
_comp_ltrim_colon_completions was introduced with >=bash-completion-2.12 Signed-off-by: Lucio Sauer <[email protected]>
Signed-off-by: Lucio Sauer <[email protected]>
arthurzam
approved these changes
Jul 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is part of a larger effort[1] to automate resolving bugs on Gentoo's Bugzilla with the correct resolutions.
The command line syntax would be:
<bug>:<resolution>for a given bgo bug with an explicit resolution<bug>:or<bug>for any bug without a resolution (implicitlyFIXEDfor a bgo bug)Apart from
FIXED, I chose to support:OBSOLETEe.g. for when older versions of a package get dropped which implicitly fixes a bugPKGREMOVEDto encourage its adoption for the removal of packagesIf you think any resolutions are missing here, please tell me!
I wasn't sure how to handle malformed URL-like input with multiple colons like
https://foo:bar:obsolete. Currently, it gets converted into aCloses: https://foo:bar (obsolete)tag, similar to how-T/--tagdoes it.[1]: Patch for infra's githooks: https://bugs.gentoo.org/934825