improve error handling so that the bot is able to post comments about…

… errors

src/cmd.rs

@@ -148,7 +148,7 @@ fn handle_cmd_result<'a>(
 									err_output.replace(secret, "${SECRET}");
 							}
 						}
-						log::error!(
+						log::info!(
 							"handle_cmd_result: {} failed with error: {}",
 							cmd_display,
 							err_output

src/error.rs

@@ -50,11 +50,6 @@ pub enum Error {
 		actual: String,
 	},
 
-	#[snafu(display("Error getting process info: {}", source))]
-	ProcessFile {
-		source: Box<Error>,
-	},
-
 	#[snafu(display("Missing process info."))]
 	ProcessInfo {
 		errors: Option<Vec<String>>,
@@ -207,6 +202,15 @@ impl Error {
 			},
 		}
 	}
+	pub fn stops_merge_attempt(&self) -> bool {
+		match self {
+			Self::WithIssue { source, .. } | Self::Merge { source, .. } => {
+				source.stops_merge_attempt()
+			}
+			Self::MergeFailureWillBeSolvedLater { .. } => false,
+			_ => true,
+		}
+	}
 }
 
 impl From<curl::Error> for Error {

src/github.rs

@@ -1,5 +1,6 @@
 use crate::{
-	error::*, utils::parse_bot_comment_from_text, Result, PR_HTML_URL_REGEX,
+	error::*, utils::parse_bot_comment_from_text,
+	PlaceholderDeserializationItem, Result, PR_HTML_URL_REGEX,
 };
 use regex::Regex;
 use serde::{Deserialize, Serialize};
@@ -73,7 +74,7 @@ pub struct Issue {
 	// User might be missing when it has been deleted
 	pub user: Option<User>,
 	pub body: Option<String>,
-	pub pull_request: Option<IssuePullRequest>,
+	pub pull_request: Option<PlaceholderDeserializationItem>,
 	pub repository: Option<Repository>,
 	pub repository_url: Option<String>,
 }
@@ -172,9 +173,6 @@ pub struct Team {
 	pub id: i64,
 }
 
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct IssuePullRequest {}
-
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Head {
 	pub label: Option<String>,
@@ -354,7 +352,7 @@ pub struct WebhookIssueComment {
 	pub number: i64,
 	pub html_url: String,
 	pub repository_url: Option<String>,
-	pub pull_request: Option<IssuePullRequest>,
+	pub pull_request: Option<PlaceholderDeserializationItem>,
 }
 
 impl HasIssueDetails for WebhookIssueComment {

src/lib.rs

@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 mod auth;
 pub mod bamboo;
 pub mod cmd;
@@ -43,3 +45,12 @@ pub enum CommentCommand {
 	BurninRequest,
 	CompareReleaseRequest,
 }
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct PlaceholderDeserializationItem {}
+
+pub enum MergeCancelOutcome {
+	ShaDidNotExist,
+	WasCancelled,
+	WasNotCancelled,
+}