[PATCH 3 of 3 V2] gitweb: add links to diff and changeset views from annotate view table
Denis Laxalde
denis.laxalde at logilab.fr
Thu Jun 9 08:34:58 EDT 2016
# HG changeset patch
# User Denis Laxalde <denis.laxalde at logilab.fr>
# Date 1464883191 -7200
# Thu Jun 02 17:59:51 2016 +0200
# Node ID d93cced29417347ea359c9011005e3ce099baf40
# Parent 04658d400e7f667f70a639f919f6ff45dcccb52a
gitweb: add links to diff and changeset views from annotate view table
diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map
--- a/mercurial/templates/gitweb/map
+++ b/mercurial/templates/gitweb/map
@@ -103,6 +103,12 @@ annotateline = '
title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>',
'')}
</td>
+ <td>
+ <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}"
+ title="diff {file|urlescape}@{node|short}">diff</a>
+ <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"
+ title="{node|short}: {desc|escape|firstline}">rev</a>
+ </td>
<td><pre><a class="linenr" href="#{lineid}">{linenumber}</a></pre></td>
<td><pre{ifeq(rev, blamedrev, ' class="blamedrev"', '')}>{line|escape}</pre></td>
</tr>'
diff --git a/tests/test-hgweb-symrev.t b/tests/test-hgweb-symrev.t
--- a/tests/test-hgweb-symrev.t
+++ b/tests/test-hgweb-symrev.t
@@ -617,7 +617,11 @@ Set up the repo
<a class="list" href="/annotate/43c799df6e75/foo?style=gitweb">
<a class="list" href="/annotate/9d8c40cba617/foo?style=gitweb">9d8c40cba617</a></td>
<a href="/annotate/43c799df6e75/foo?style=gitweb#l1"
+ <a href="/diff/43c799df6e75/foo?style=gitweb"
+ <a href="/rev/43c799df6e75?style=gitweb"
<a href="/annotate/a7c1559b7bba/foo?style=gitweb#l2"
+ <a href="/diff/a7c1559b7bba/foo?style=gitweb"
+ <a href="/rev/a7c1559b7bba?style=gitweb"
$ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'diff/xyzzy/foo?style=gitweb' | egrep $REVLINKS
<a href="/file/xyzzy?style=gitweb">files</a> |
More information about the Mercurial-devel
mailing list