1444840 - Detect when a patch fails to apply and prefix the pingback error_msg with a user-friendly message

Status: RESOLVED FIXED

(Conduit Graveyard :: Transplant, enhancement)

Description

[Israel Madueme [:imadueme]]

When transplant fails to rebase commits (in the mozreview world) it detects this and provides a little helpful message in addition to the full error: https://hg.mozilla.org/hgcustom/version-control-tools/file/tip/autoland/autoland/autoland.py#l191

This check works for rebases but doesn't work for `hg import` which is used for all lando patches. When `hg import` fails the error message normally includes "hunks FAILED" or something to that extent.

It would be nice if transplant detects this and does the same thing as the rebase failure.

The user would first see:
"We're sorry, Autoland could not apply your changes...."

Instead of:
"applying /tmp/tmpJccXwZ
unable to find 'client.py' for patching
(use ''--prefix'' to apply patch relative to the current directory)
1 out of 1 hunks FAILED"

Comment 1

[:glob ✱]

this wasn't caused by the changes in bug 1436803, removing dependency.

Comment 2

[Israel Madueme [:imadueme]]

I set it to block bug 1436803 because for that story to be complete we will most likely need this bug to be resolved first. Do you know a better way to signal that another bug is depending on this one?

Comment 3

[:glob ✱]

following on from a discussion about tracking in another bug, i'll mark this as blocking bug 1441728.

Comment 4

[:glob ✱]

Attachment: ansible: don't run server-only changes in docker (bug 1444840)

fix for following issue while running autoland tests:

ERROR hgweb> TASK: [hg-web | delete ignored files from version-control-tools
repo (server only)] ***
ERROR hgweb> failed: [localhost] => {"changed": true, "cmd":
["/var/hg/venv_hgweb/bin/hg", "--config", "extensions.purge=", "-R",
"/var/hg/version-control-tools", "purge", "--all"], "delta": "0:00:00.764525",
"end": "2018-03-13 05:44:37.569622", "rc": 255, "start": "2018-03-13
05:44:36.805097", "warnings": ["Consider using hg module rather than running
hg"]}
ERROR hgweb> stderr: abort: repository /var/hg/version-control-tools not found!

Review commit: https://reviewboard.mozilla.org/r/227300/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/227300/

Comment 5

[:glob ✱]

Attachment: autoland: use a friendlier error message for patch-based merge conflicts (bug 1444840)

Review commit: https://reviewboard.mozilla.org/r/227302/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/227302/

Comment 6

[Steven MacLeod [:smacleod]]

Comment on attachment 8958364 [details]
autoland: use a friendlier error message for patch-based merge conflicts (bug 1444840)

https://reviewboard.mozilla.org/r/227302/#review233250

Comment 7

[Gregory Szorc [:gps]]

Comment on attachment 8958363 [details]
ansible: don't run server-only changes in docker (bug 1444840)

https://reviewboard.mozilla.org/r/227300/#review233304

Eek - unwanted data loss!

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/f115bc96c7b7
ansible: don't run server-only changes in docker r=gps
https://hg.mozilla.org/hgcustom/version-control-tools/rev/946206f145d6
autoland: use a friendlier error message for patch-based merge conflicts r=smacleod