Skip to content

If patch fails to apply, warn it is likely to fail to land and provide instructions how to resolve (#3222) #3223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Archaeopteryx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

If patch fails to apply, warn it is likely to fail to land and provide instructions how to resolve (#3222) #3223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions bot/code_review_bot/analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,22 @@ def publish_analysis_phabricator(payload, phabricator_api):

elif mode == "fail:mercurial":
extra_content = ""
developer_instructions = ""
if build.missing_base_revision:
extra_content = f" because the parent revision ({build.base_revision}) does not exist on mozilla-unified. If possible, you should publish that revision"
if "abort: uncommitted changes" in extras["message"]:
developer_instructions = "The patch will likely fail to land. Possible causes:" \
"* A parent revision has been set in Phabricator after the patch had been submitted." \
"Rebase the patch onto the new parent revision to resolve the issue."

if developer_instructions != "":
developer_instructions += "\n\n"
failure = UnitResult(
namespace="code-review",
name="mercurial",
result=UnitResultState.Fail,
details="WARNING: The code review bot failed to apply your patch{}.\n\n```{}```".format(
extra_content, extras["message"]
details="WARNING: The code review bot failed to apply your patch{}.\n\n{}```{}```".format(
extra_content, developer_instructions, extras["message"]
),
format="remarkup",
duration=extras.get("duration", 0),
Expand Down