# HG changeset patch # User Mads Kiilerich # Date 1371032600 -7200 # Node ID 7d09d136ea72db5d4c1863c8cc6c59b6e99f30c0 # Parent 52f69be09fe140d63f39f254cfdb1daf73ab96c2 pull requests: separate link to origin branch from suggested pull command diff -r 52f69be09fe1 -r 7d09d136ea72 kallithea/templates/pullrequests/pullrequest_show.html --- 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 @@
+ ${c.pull_request.org_repo.clone_url()} ## branch link is only valid if it is a branch ${c.pull_request.org_ref_parts[0]}: ${c.pull_request.org_ref_parts[1]} - +
+
+ +
+
+ +
+
+
+ ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases? %if h.is_hg(c.pull_request.org_repo): - | ${_('Pull changes')} hg pull -r ${h.short_id(c.cs_ranges[-1].raw_id)} ${c.pull_request.org_repo.clone_url()} + hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)} %elif h.is_git(c.pull_request.org_repo): - | ${_('Pull changes')} git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]} + git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]} %endif