copy the pre-commit-hook into this repository and convert it to py3 #23
Conversation
This file contains hidden or 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
Signed-off-by: Sebastian Wagner <[email protected]>
Signed-off-by: Sebastian Wagner <[email protected]>
Signed-off-by: Sebastian Wagner <[email protected]>
epuertat
reviewed
Oct 13, 2021
Comment on lines
+29
to
+44
| def which(executable): | ||
| locations = ( | ||
| '/usr/local/bin', | ||
| '/bin', | ||
| '/usr/bin', | ||
| '/usr/local/sbin', | ||
| '/usr/sbin', | ||
| '/sbin', | ||
| ) | ||
|
|
||
| for location in locations: | ||
| executable_path = os.path.join(location, executable) | ||
| if os.path.exists(executable_path): | ||
| return executable_path | ||
|
|
||
| GIT = which('git') |
Comment on lines
+67
to
+96
| def prepend_commit_msg(branch): | ||
| """Prepend the commit message with `text`""" | ||
| msgfile = sys.argv[1] | ||
| with open(msgfile) as f: | ||
| contents = f.read() | ||
|
|
||
| if not branch: | ||
| return contents | ||
|
|
||
| try: | ||
| prefix, ticket_id = branch.split('-') | ||
| ticket_id = int(ticket_id) | ||
| except ValueError: | ||
| # We used to raise here, but if cherry-picking to a different branch | ||
| # that doesn't comply it would break preventing the cherry-pick. So we | ||
| # print out the warning, but end up returning the contents. | ||
| print('skipping commit msg change: Branch name "%s" does not follow required format: {tracker}-{ID}' % branch) # NOQA | ||
| return contents | ||
|
|
||
| if prefix == 'wip': | ||
| # Skip "wip" branches, ie "work in progress" | ||
| return contents | ||
|
|
||
| resolves_line = "\nResolves: %s#%s" % (prefix.lower(), ticket_id) | ||
|
|
||
| with open(msgfile, 'a') as f: | ||
| # Don't append if it's already there | ||
| if resolves_line not in contents: | ||
| f.write(resolves_line) | ||
|
|
There was a problem hiding this comment.
As we're invoking the git command, this could be easily done with git interpret-trailers command:
subprocess.run(['git', 'interpret-trailers', f'--trailer Resolves: rhbz#{ticket_id}', '--in-place', sys.argv[1]], shell=True, check=True)That said, a pre-commit hook is not needed for this, and IMHO it should rather be done with interepreter trailers:
- git('-c', 'core.editor=/bin/true', 'cherry-pick', '-x', '%s~..%s' % (first, last))
+ git('-c', 'core.editor=/bin/true', 'cherry-pick', '-x', '--no-commit', '%s~..%s' % (first, last))
+ git('commit', '--trailer "Resolves: rhbz#{$bz}"', '--no-edit')
# Merge this rhbz branch back into our starting branch.
git('checkout', starting_branch)
git('merge', '--ff-only', 'rhbz-' + bz)
git('branch', '-d', 'rhbz-' + bz)
|
also the hook fails: |
|
Are we ok with using #24 instead? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #22