Mercurial > kallithea
changeset 4288:7d09d136ea72
pull requests: separate link to origin branch from suggested pull command
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Jun 2013 12:23:20 +0200 |
parents | 52f69be09fe1 |
children | 6e65b53a03a7 |
files | kallithea/templates/pullrequests/pullrequest_show.html |
diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/pullrequests/pullrequest_show.html Wed Jun 12 12:23:20 2013 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Wed Jun 12 12:23:20 2013 +0200 @@ -69,14 +69,24 @@ </div> <div class="input"> <div> + <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> ## branch link is only valid if it is a branch <span class="spantag"><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name, anchor=c.pull_request.org_ref_parts[1])}">${c.pull_request.org_ref_parts[0]}: ${c.pull_request.org_ref_parts[1]}</a></span> - <span> + </div> + </div> + </div> + <div class="field"> + <div class="label-summary"> + <label>${_('Pull changes')}:</label> + </div> + <div class="input"> + <div> + ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases? %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> + <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span> %elif h.is_git(c.pull_request.org_repo): - | ${_('Pull changes')} <span style="font-family: monospace">git pull <a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a> ${c.pull_request.org_ref_parts[1]} </span> + <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span> %endif </div> </div>