From 053382901e7842500a67990fb4149d08def900c8 Mon Sep 17 00:00:00 2001
From: Martin Bornhold <martin@rhodecode.com>
Date: Thu, 27 Oct 2016 13:55:58 +0200
Subject: [PATCH] pr: Refactor PR update error message handling.

---
 rhodecode/controllers/pullrequests.py | 19 ++++++++-----------
 rhodecode/model/pull_request.py       |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 24873627..f4c2cf3b 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -519,14 +519,8 @@ class PullrequestsController(BaseRepoController):
 
     def _update_commits(self, pull_request):
         resp = PullRequestModel().update_commits(pull_request)
-        msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
 
-        # Abort if pull request update failed.
-        if not resp.success:
-            h.flash(msg, category='error')
-            return
-
-        if resp.reason == UpdateFailureReason.NONE:
+        if resp.success:
             msg = _(
                 u'Pull request updated to "{source_commit_id}" with '
                 u'{count_added} added, {count_removed} removed commits.')
@@ -561,11 +555,14 @@ class PullrequestsController(BaseRepoController):
                 channelstream_request(
                     channelstream_config, [payload], '/message',
                     raise_exc=False)
-        elif resp.reason == UpdateFailureReason.NO_CHANGE:
-            # Display a warning if no update is needed.
-            h.flash(msg, category='warning')
         else:
-            h.flash(msg, category='error')
+            msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
+            warning_reasons = [
+                UpdateFailureReason.NO_CHANGE,
+                UpdateFailureReason.WRONG_REF_TPYE,
+            ]
+            category = 'warning' if resp.reason in warning_reasons else 'error'
+            h.flash(msg, category=category)
 
     @auth.CSRFRequired()
     @LoginRequired()
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 9829c92e..77eccf81 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -537,7 +537,7 @@ class PullRequestModel(BaseModel):
         if source_ref_id == source_commit.raw_id:
             log.debug("Nothing changed in pull request %s", pull_request)
             return UpdateResponse(
-                success=True,
+                success=False,
                 reason=UpdateFailureReason.NO_CHANGE,
                 old=pull_request, new=None, changes=None)