GitSCM: raise PatchConflict from get_diff_from_patches and handle in LandingWorker (bug 2000268) #742 (lando@main)
| Warnings |
|
|---|---|
| Blockers |
|
| Branches | bug2001532/get_diff_from_patches_PatchConflict -> main |
| Repo | lando@main (git) (git://github.com/mozilla-conduit/lando.git) |
| Author | shtrom |
| State | closed |
| Commit Title | GitSCM: raise PatchConflict from get_diff_from_patches and handle in LandingWorker (bug 2000268) |
| Commit Body | 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 |