Improve error message when staging fails

Fixes: QTBI-1639
Change-Id: I26e57e67d57538d9d3a7a71ec32e36f05ca99c97
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

3 files changed, 12 insertions, 15 deletions

diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java
index 73eb7ce..a7ccba1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java
@@ -176,7 +176,7 @@ public class QtCherryPickPatch {
             logger.atInfo().log("qtcodereview: cherrypick done %s", changeData.getId());
             return cherryPickCommit;
         } catch (Exception e) {
-            throw new IntegrationException("Cherry pick failed: " + e.getMessage());
+            throw new IntegrationException("Reason: " + e.getMessage());
         }
     }
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java
index 4244686..11f6954 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtStage.java
@@ -144,16 +144,16 @@ public class QtStage implements RestModifyView<RevisionResource, SubmitInput>,
         if (change.getStatus() != Change.Status.NEW) {
             logger.atSevere().log("qtcodereview: stage: change %s status wrong: %s",
                                   change, change.getStatus());
-            throw new ResourceConflictException("change is " + change.getStatus());
+            throw new ResourceConflictException("Change is " + change.getStatus());
         } else if (!ProjectUtil.branchExists(repoManager, change.getDest())) {
             logger.atSevere().log("qtcodereview: stage: change %s destination branch \"%s\" not found",
                                   change, change.getDest().get());
-            throw new ResourceConflictException(String.format("destination branch \"%s\" not found.",
-                                                               change.getDest().get()));
+            throw new ResourceConflictException(String.format("Destination branch \"%s\" not found.",
+                                                              change.getDest().get()));
         } else if (!rsrc.getPatchSet().getId().equals(change.currentPatchSetId())) {
             logger.atSevere().log("qtcodereview: stage: change %s revision %s is not current revision",
                                   change, rsrc.getPatchSet().getRevision().get());
-            throw new ResourceConflictException(String.format("revision %s is not current revision",
+            throw new ResourceConflictException(String.format("Revision %s is not current.",
                                                               rsrc.getPatchSet().getRevision().get()));
         }
 
@@ -192,11 +192,11 @@ public class QtStage implements RestModifyView<RevisionResource, SubmitInput>,
             referenceUpdated.fire(projectKey, stagingBranchKey.get(), destId, commit.toObjectId(), submitter.state());
 
         } catch (IntegrationException e) {
-            logger.atInfo().log("qtcodereview: stage merge error  %s", e);
-            throw new ResourceConflictException("merge error " + e);
+            logger.atInfo().log("qtcodereview: stage merge error %s", e);
+            throw new ResourceConflictException(e.getMessage());
         } catch (NoSuchRefException e) {
-            logger.atSevere().log("qtcodereview: stage error  %s", e);
-            throw new ResourceConflictException("resource error " + e);
+            logger.atSevere().log("qtcodereview: stage error %s", e);
+            throw new ResourceConflictException(e.getMessage());
         } finally {
             if (git != null) {
                 git.close();
@@ -208,11 +208,8 @@ public class QtStage implements RestModifyView<RevisionResource, SubmitInput>,
           case STAGED:
               logger.atInfo().log("qtcodereview: changeToStaging %s added to %s", change, stagingBranchKey);
               return change; // this doesn't return data to client, if needed use ChangeJson to convert it
-          case NEW:
-              throw new RestApiException("change unexpectedly had status " + change.getStatus() + " after submit attempt");
-          case ABANDONED:
           default:
-              throw new ResourceConflictException("change is " + change.getStatus());
+              throw new ResourceConflictException("Change is unexpectedly " + change.getStatus());
         }
 
     }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtStageIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtStageIT.java
index 60be674..343de8d 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtStageIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtStageIT.java
@@ -152,7 +152,7 @@ public class QtStageIT extends QtCodeReviewIT {
         deny(project, "refs/heads/master", Permission.ABANDON, REGISTERED_USERS);
 
         RestResponse response = qtStageExpectFail(c, initialHead, initialHead, HttpStatus.SC_CONFLICT);
-        assertThat(response.getEntityContent()).contains("change is DEFERRED");
+        assertThat(response.getEntityContent()).contains("Change is DEFERRED");
     }
 
     @Test
@@ -180,7 +180,7 @@ public class QtStageIT extends QtCodeReviewIT {
 
         RestResponse response = call_REST_API_Stage(c1.getChangeId(), c1.getCommit().getName());
         response.assertStatus(HttpStatus.SC_CONFLICT);
-        assertThat(response.getEntityContent()).contains("is not current revision");
+        assertThat(response.getEntityContent()).contains("is not current");
     }
 
     @Test