[PATCH 4 of 4] hgweb: add a link on node id in annotate hover-box

Denis Laxalde denis.laxalde at logilab.fr
Tue Jul 12 11:34:36 EDT 2016


# HG changeset patch
# User Denis Laxalde <denis.laxalde at logilab.fr>
# Date 1468328947 -7200
#      Tue Jul 12 15:09:07 2016 +0200
# Node ID 2e6ff938b3582ac412e15ce2a6643b4f98d48f81
# Parent  a8d07ecd0c12b14d4aabca514c7dbc574b699d31
hgweb: add a link on node id in annotate hover-box

The link pointing the annotate view at this revision, just like the one in the
left-column but accessible from anywhere.

diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map
--- a/mercurial/templates/gitweb/map
+++ b/mercurial/templates/gitweb/map
@@ -102,7 +102,11 @@ annotateline = '
              {rev}
            </a>')}
       <div class="annotate-info">
-        <div>{node|short}: {desc|escape|firstline}</div>
+        <div>
+          <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
+            {node|short}</a>
+          {desc|escape|firstline}
+        </div>
         <div><em>{author|obfuscate}</em></div>
         <div>parents: {parents%annotateparent}</div>
         <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
diff --git a/mercurial/templates/monoblue/map b/mercurial/templates/monoblue/map
--- a/mercurial/templates/monoblue/map
+++ b/mercurial/templates/monoblue/map
@@ -98,7 +98,11 @@ annotateline = '
              {rev}
            </a>')}
       <div class="annotate-info">
-        <div>{node|short}: {desc|escape|firstline}</div>
+        <div>
+          <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
+            {node|short}</a>
+          {desc|escape|firstline}
+        </div>
         <div><em>{author|obfuscate}</em></div>
         <div>parents: {parents%annotateparent}</div>
         <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map
--- a/mercurial/templates/paper/map
+++ b/mercurial/templates/paper/map
@@ -83,7 +83,11 @@ annotateline = '
              {rev}
            </a>')}
       <div class="annotate-info">
-        <div>{node|short}: {desc|escape|firstline}</div>
+        <div>
+          <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
+            {node|short}</a>
+          {desc|escape|firstline}
+        </div>
         <div><em>{author|obfuscate}</em></div>
         <div>parents: {parents%annotateparent}</div>
         <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
diff --git a/mercurial/templates/spartan/map b/mercurial/templates/spartan/map
--- a/mercurial/templates/spartan/map
+++ b/mercurial/templates/spartan/map
@@ -61,7 +61,11 @@ annotateline = '
              {rev}
            </a>')}
       <div class="annotate-info">
-        <div>{node|short}: {desc|escape|firstline}</div>
+        <div>
+          <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
+            {node|short}</a>
+          {desc|escape|firstline}
+        </div>
         <div><em>{author|obfuscate}</em></div>
         <div>parents: {parents%annotateparent}</div>
         <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
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
@@ -191,9 +191,11 @@ Set up the repo
    <td class="author"><a href="/file/43c799df6e75/foo?style=paper">43c799df6e75</a> </td>
    <td class="author"><a href="/file/9d8c40cba617/foo?style=paper">9d8c40cba617</a> </td>
   <a href="/annotate/43c799df6e75/foo?style=paper#l1">
+  <a href="/annotate/43c799df6e75/foo?style=paper#l1">
   <a href="/diff/43c799df6e75/foo?style=paper">diff</a>
   <a href="/rev/43c799df6e75?style=paper">changeset</a>
   <a href="/annotate/a7c1559b7bba/foo?style=paper#l2">
+  <a href="/annotate/a7c1559b7bba/foo?style=paper#l2">
   <a href="/annotate/43c799df6e75/foo?style=paper">0</a></div>
   <a href="/diff/a7c1559b7bba/foo?style=paper">diff</a>
   <a href="/rev/a7c1559b7bba?style=paper">changeset</a>
@@ -384,9 +386,11 @@ Set up the repo
    <td class="author"><a href="/file/43c799df6e75/foo?style=coal">43c799df6e75</a> </td>
    <td class="author"><a href="/file/9d8c40cba617/foo?style=coal">9d8c40cba617</a> </td>
   <a href="/annotate/43c799df6e75/foo?style=coal#l1">
+  <a href="/annotate/43c799df6e75/foo?style=coal#l1">
   <a href="/diff/43c799df6e75/foo?style=coal">diff</a>
   <a href="/rev/43c799df6e75?style=coal">changeset</a>
   <a href="/annotate/a7c1559b7bba/foo?style=coal#l2">
+  <a href="/annotate/a7c1559b7bba/foo?style=coal#l2">
   <a href="/annotate/43c799df6e75/foo?style=coal">0</a></div>
   <a href="/diff/a7c1559b7bba/foo?style=coal">diff</a>
   <a href="/rev/a7c1559b7bba?style=coal">changeset</a>
@@ -627,9 +631,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="/annotate/43c799df6e75/foo?style=gitweb#l1">
   <a href="/diff/43c799df6e75/foo?style=gitweb">diff</a>
   <a href="/rev/43c799df6e75?style=gitweb">changeset</a>
   <a href="/annotate/a7c1559b7bba/foo?style=gitweb#l2">
+  <a href="/annotate/a7c1559b7bba/foo?style=gitweb#l2">
   <a href="/annotate/43c799df6e75/foo?style=gitweb">0</a></div>
   <a href="/diff/a7c1559b7bba/foo?style=gitweb">diff</a>
   <a href="/rev/a7c1559b7bba?style=gitweb">changeset</a>
@@ -848,9 +854,11 @@ Set up the repo
   <a href="/annotate/43c799df6e75/foo?style=monoblue">
   <a href="/annotate/9d8c40cba617/foo?style=monoblue">9d8c40cba617</a>
   <a href="/annotate/43c799df6e75/foo?style=monoblue#l1">
+  <a href="/annotate/43c799df6e75/foo?style=monoblue#l1">
   <a href="/diff/43c799df6e75/foo?style=monoblue">diff</a>
   <a href="/rev/43c799df6e75?style=monoblue">changeset</a>
   <a href="/annotate/a7c1559b7bba/foo?style=monoblue#l2">
+  <a href="/annotate/a7c1559b7bba/foo?style=monoblue#l2">
   <a href="/annotate/43c799df6e75/foo?style=monoblue">0</a></div>
   <a href="/diff/a7c1559b7bba/foo?style=monoblue">diff</a>
   <a href="/rev/a7c1559b7bba?style=monoblue">changeset</a>
@@ -1050,9 +1058,11 @@ Set up the repo
   <a href="/annotate/43c799df6e75/foo?style=spartan">
   <td><a href="/annotate/9d8c40cba617/foo?style=spartan">9d8c40cba617</a></td>
   <a href="/annotate/43c799df6e75/foo?style=spartan#l1">
+  <a href="/annotate/43c799df6e75/foo?style=spartan#l1">
   <a href="/diff/43c799df6e75/foo?style=spartan">diff</a>
   <a href="/rev/43c799df6e75?style=spartan">changeset</a>
   <a href="/annotate/a7c1559b7bba/foo?style=spartan#l2">
+  <a href="/annotate/a7c1559b7bba/foo?style=spartan#l2">
   <a href="/annotate/43c799df6e75/foo?style=spartan">0</a></div>
   <a href="/diff/a7c1559b7bba/foo?style=spartan">diff</a>
   <a href="/rev/a7c1559b7bba?style=spartan">changeset</a>
diff --git a/tests/test-highlight.t b/tests/test-highlight.t
--- a/tests/test-highlight.t
+++ b/tests/test-highlight.t
@@ -294,7 +294,11 @@ hgweb fileannotate, html
   0
   </a>
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l1">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -307,7 +311,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l2">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -320,7 +328,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l3">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -333,7 +345,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l4">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -346,7 +362,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l5">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -359,7 +379,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l6">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -372,7 +396,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l7">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -385,7 +413,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l8">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -398,7 +430,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l9">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -411,7 +447,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l10">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -424,7 +464,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l11">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -437,7 +481,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l12">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -450,7 +498,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l13">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -463,7 +515,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l14">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -476,7 +532,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l15">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -489,7 +549,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l16">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -502,7 +566,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l17">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -515,7 +583,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l18">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -528,7 +600,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l19">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -541,7 +617,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l20">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -554,7 +634,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l21">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -567,7 +651,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l22">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -580,7 +668,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l23">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -593,7 +685,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l24">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -606,7 +702,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l25">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -619,7 +719,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l26">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -632,7 +736,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l27">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -645,7 +753,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l28">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -658,7 +770,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l29">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -671,7 +787,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l30">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -684,7 +804,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l31">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -697,7 +821,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l32">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
@@ -710,7 +838,11 @@ hgweb fileannotate, html
   <td class="annotate">
   
   <div class="annotate-info">
-  <div>06824edf55d0: a</div>
+  <div>
+  <a href="/annotate/06824edf55d0/primes.py#l33">
+  06824edf55d0</a>
+  a
+  </div>
   <div><em>test</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>


More information about the Mercurial-devel mailing list