Patchset source remote cherry-pick error handling #257
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
If a PatchSet cherry-pick source_remote step fails after a new remote is added, attempt to cleanup the added remote before raising exception. Signed-off-by: Nathaniel Haller <[email protected]>
In some cases where filter settings are enabled on the repo, the git fetch from a remote repo step will fail while the remote repo branch does exist. Running the git fetch step again with --refetch resolved one git fetch error case with --filter=tree:0 enabled, but adds additional time and resources to the PatchSet creation when it is required to run. Signed-off-by: Nathaniel Haller <[email protected]>
This was referenced Jul 3, 2024
nate-desimone
requested changes
Feb 18, 2025
| repo.git.execute(['git', 'fetch', operation.source_remote, operation.source_branch, '--refetch']) | ||
| except: | ||
| try: | ||
| repo.git.execute(['git', 'remote', 'remove', operation.source_remote]) |
Member
There was a problem hiding this comment.
Instead of adding an except here to remove the remote. Let's use a finally: across the whole block.
| if is_merge_conflict(repo): | ||
| repo.git.execute(['git', 'cherry-pick', '--abort']) | ||
| try: | ||
| repo.git.execute(['git', 'remote', 'remove', operation.source_remote]) |
Member
There was a problem hiding this comment.
Instead of adding an except here to remove the remote. Let's use a finally: across the whole block.
Contributor
ashedesimone
left a comment
ashedesimone
left a comment
There was a problem hiding this comment.
Please split this into two PRs
Contributor
Author
|
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.
Two commits for additional error handling and clean up during the PatchSet cherry-pick from a remote source operation.