From 7dfbea504159b59b9323b8fc9f7fb9c5a88b376d Mon Sep 17 00:00:00 2001
From: Martin Bornhold <martin@rhodecode.com>
Date: Sun, 23 Oct 2016 14:38:52 +0200
Subject: [PATCH] pr-shadow: Display link to last merge revision in shadow
 repository if merge was successful. #1055

---
 .../pullrequests/pullrequest_show.html        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html
index e832d980..ad208cf5 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html
@@ -101,23 +101,23 @@
             </div>
            </div>
 
-           ## Clone link of the shadow repository.
-           %if not c.pull_request.is_closed():
-               <div class="field">
-                   <div class="label-summary">
-                       <label>${_('Shadow')}:</label>
-                   </div>
-                   <div class="input">
-                       <div class="pr-shadowinfo">
-                           %if h.is_hg(c.pull_request.target_repo):
-                               <input type="text"  value="hg clone ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
-                           %elif h.is_git(c.pull_request.target_repo):
-                               <input type="text"  value="git clone ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
-                           %endif
-                       </div>
-                   </div>
-               </div>
-           %endif
+            ## Link to the shadow repository.
+            %if not c.pull_request.is_closed() and c.pull_request.last_merge_rev:
+                <div class="field">
+                    <div class="label-summary">
+                        <label>Merge:</label>
+                    </div>
+                    <div class="input">
+                        <div class="pr-mergeinfo">
+                            %if h.is_hg(c.pull_request.target_repo):
+                                <input type="text"  value="hg clone -u pr-merge ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
+                            %elif h.is_git(c.pull_request.target_repo):
+                                <input type="text"  value="git clone --branch pr-merge ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
+                            %endif
+                        </div>
+                    </div>
+                </div>
+            %endif
 
            <div class="field">
             <div class="label-summary">