Xavier Morel af8c62e4ad [FIX] runbot_merge: better handle targets being branch-protected ... If a staging covers multiple repositories and there's a fast-forward issue on any but the first repo/target, runbot_merge attempted to revert the commits it had fast-forwarded on the previous repos. This doesn't work when branch-protection is active, unless runbot_merge is a repository administrator (and branch protection is not configured to apply to those): reverting is done by push-forcing the original head back onto the ref, which branch-protection unconditionally precludes. This commit does not entirely fix the race condition (it does not look like github provides any way to do that), but it should significantly reduce the race-condition window as it performs a semi-wet run of the fast-forward process on the tmp branches before actually updating the targets. That way the only remaining breakage should be when somebody pushes on repositories 1.. between the test-FF on tmp branches and the actual fast forward. While at it, updated the github API thing to *always* dump the JSON body on an error response, if the content-type is json.		2018-10-10 10:50:21 +02:00
..
__init__.py	[ADD] runbot_merge: a merge bot	2018-09-03 13:16:36 +02:00
pull_requests.py	[FIX] runbot_merge: better handle targets being branch-protected	2018-10-10 10:50:21 +02:00
res_partner.py	[ADD] runbot_merge: a merge bot	2018-09-03 13:16:36 +02:00