GitSCM: raise PatchConflict from get_diff_from_patches and handle in LandingWorker (bug 2000268)#742
Closed
GitSCM: raise PatchConflict from get_diff_from_patches and handle in LandingWorker (bug 2000268)#742
Conversation
|
View this pull request in Lando to land it once approved. |
zzzeid
previously approved these changes
Dec 4, 2025
Contributor
zzzeid
left a comment
zzzeid
left a comment
There was a problem hiding this comment.
I think it would be better to handle this in the same way we handle other apply failures if possible (e.g., handle_new_commit_failures). I won't block the PR on this though and it would only apply to the portion of the code in the landing_worker.
zzzeid
reviewed
Dec 4, 2025
…atches (bug 2001532) using handle_new_commit_failures
Member
Author
|
I added a decorator to deduplicate the PatchConflict detection logic, and rejigged |
shtrom
changed the title
shtrom
changed the title
zzzeid
approved these changes
Dec 8, 2025
Contributor
zzzeid
left a comment
zzzeid
left a comment
There was a problem hiding this comment.
lgtm, maybe add a comment describing the changes to handle_new_commit_failures.
|
Pull request closed by commit d09e7a8 |
lando-prod-mozilla bot
pushed a commit
that referenced
this pull request
Dec 10, 2025
…LandingWorker (bug 2000268) r=zeid Includes the following changes: * GitSCM: add @detect_patch_conflict to transform SCMExceptions as needed * GitSCM: raise PatchConflict as needed in get_diff_from_patches * BaseWorker: allow handle_new_commit_failures to return something * landing_worker: handle PatchConflict from scm.get_diff_from_patches Pull request: #742
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Includes the following changes: