When sync-typeshed fails to apply CP allow manual user merges #15591
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
|
@JukkaL or @AlexWaygood any opinions about something like this? |
AlexWaygood
approved these changes
Jul 4, 2023
misc/sync-typeshed.py
Outdated
| f"Commit {commit} failed to cherry pick." | ||
| " In a separate shell, please manually merge and continue cherry pick." | ||
| ) | ||
| input("Did you finish the cherry pick?") |
There was a problem hiding this comment.
Trying the script out locally, my naive expectation was that I was required to either type "y" or "n" to continue. I typed in "y", which meant that the line on the terminal was
Did you finish the cherry pick?y
Looking at the script again, you obviously don't need to type anything at all. But it still might be nice to have a space at the end here so that it doesn't look so weird if a user does input something 😆
Suggested change
| input("Did you finish the cherry pick?") | |
| input("Did you finish the cherry pick? ") |
There was a problem hiding this comment.
Yeah, It was a quick change on my part to get feedback if it's useful. I'll actually check the return of input 😄
for more information, see https://pre-commit.ci
AlexWaygood
reviewed
Jul 4, 2023
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
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.
If misc/sync-typeshed.py fails to apply a cherry pick, it just fails. Let's try to give the user a chance to manually merge the CP and continue with the script.
This should block for user input only in cases where stdin is a tty. So automation should continue failing. (but the only way to test is by running it)