changeset 4047:3608f15f51ed

pull requests: show pull url with revision to merge the pull request
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 27 Jun 2013 22:45:56 +0200
parents 38ab60c1fb2b
children 1e7befa639cc
files rhodecode/templates/pullrequests/pullrequest_show.html
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/templates/pullrequests/pullrequest_show.html	Thu Jun 27 00:52:58 2013 +0200
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html	Thu Jun 27 22:45:56 2013 +0200
@@ -72,7 +72,12 @@
              ##  <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
              ##%endif
               <span class="spantag">${c.pull_request.org_ref_parts[0]}: ${c.pull_request.org_ref_parts[1]}</span>
-              <span><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a></span>
+              <span>
+               %if h.is_hg(c.pull_request.org_repo):
+                 | ${_('Pull changes')} <span style="font-family: monospace">hg pull -r ${h.short_id(c.cs_ranges[-1].raw_id)} <a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a></span>
+               %elif h.is_git(c.pull_request.org_repo):
+                 | ${_('Pull changes')}
+               %endif
               </div>
           </div>
          </div>