Patchwork [3,of,3,V3] gitweb: add links to diff and changeset views from annotate view table

login
register
mail settings
Submitter Denis Laxalde
Date June 10, 2016, 9:41 a.m.
Message ID <c8232912971d81318e33.1465551715@sh77.tls.logilab.fr>
Download mbox | patch
Permalink /patch/15456/
State Superseded
Headers show

Comments

Denis Laxalde - June 10, 2016, 9:41 a.m.
# HG changeset patch
# User Denis Laxalde <denis.laxalde@logilab.fr>
# Date 1464883191 -7200
#      Thu Jun 02 17:59:51 2016 +0200
# Node ID c8232912971d81318e3389e3aede22287f92d91a
# Parent  12c869d7e71c5879de461cbf67eda5f7b33b0991
gitweb: add links to diff and changeset views from annotate view table

Patch

diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map
--- a/mercurial/templates/gitweb/map
+++ b/mercurial/templates/gitweb/map
@@ -102,6 +102,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>{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> |