Mercurial > hg-stable

changeset 29524:19f96077c61b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: move author information from left-column to hover-box in annotate view And display the full author information since there is enough space there.
author Denis Laxalde <denis.laxalde@logilab.fr>
date Tue, 12 Jul 2016 15:07:37 +0200
parents 4b6afd1b445a
children d8f2c718deec
files mercurial/templates/gitweb/map mercurial/templates/monoblue/map mercurial/templates/paper/map mercurial/templates/spartan/map tests/test-highlight.t
diffstat 5 files changed, 42 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templates/gitweb/map	Tue Jun 14 11:01:30 2016 +0200
+++ b/mercurial/templates/gitweb/map	Tue Jul 12 15:07:37 2016 +0200
@@ -99,10 +99,11 @@
     <td class="annotate linenr" style="text-align: right;">
       {if(blockhead,
           '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
-             {author|user}@{rev}
+             {rev}
            </a>')}
       <div class="annotate-info">
         <div>{node|short}: {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>
         <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
--- a/mercurial/templates/monoblue/map	Tue Jun 14 11:01:30 2016 +0200
+++ b/mercurial/templates/monoblue/map	Tue Jul 12 15:07:37 2016 +0200
@@ -95,10 +95,11 @@
     <td class="annotate linenr">
       {if(blockhead,
           '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
-             {author|user}@{rev}
+             {rev}
            </a>')}
       <div class="annotate-info">
         <div>{node|short}: {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>
         <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
--- a/mercurial/templates/paper/map	Tue Jun 14 11:01:30 2016 +0200
+++ b/mercurial/templates/paper/map	Tue Jul 12 15:07:37 2016 +0200
@@ -80,10 +80,11 @@
     <td class="annotate">
       {if(blockhead,
           '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
-             {author|user}@{rev}
+             {rev}
            </a>')}
       <div class="annotate-info">
         <div>{node|short}: {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>
         <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
--- a/mercurial/templates/spartan/map	Tue Jun 14 11:01:30 2016 +0200
+++ b/mercurial/templates/spartan/map	Tue Jul 12 15:07:37 2016 +0200
@@ -58,10 +58,11 @@
     <td class="annotate">
       {if(blockhead,
           '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
-             {author|user}@{rev}
+             {rev}
            </a>')}
       <div class="annotate-info">
         <div>{node|short}: {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>
         <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
--- a/tests/test-highlight.t	Tue Jun 14 11:01:30 2016 +0200
+++ b/tests/test-highlight.t	Tue Jul 12 15:07:37 2016 +0200
@@ -291,10 +291,11 @@
   <tr id="l1" class="thisrev">
   <td class="annotate">
   <a href="/annotate/06824edf55d0/primes.py#l1">
-  test@0
+  0
   </a>
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -307,6 +308,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -319,6 +321,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -331,6 +334,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -343,6 +347,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -355,6 +360,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -367,6 +373,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -379,6 +386,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -391,6 +399,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -403,6 +412,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -415,6 +425,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -427,6 +438,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -439,6 +451,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -451,6 +464,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -463,6 +477,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -475,6 +490,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -487,6 +503,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -499,6 +516,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -511,6 +529,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -523,6 +542,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -535,6 +555,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -547,6 +568,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -559,6 +581,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -571,6 +594,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -583,6 +607,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -595,6 +620,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -607,6 +633,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -619,6 +646,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -631,6 +659,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -643,6 +672,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -655,6 +685,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -667,6 +698,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>
@@ -679,6 +711,7 @@
   
   <div class="annotate-info">
   <div>06824edf55d0: a</div>
+  <div><em>&#116;&#101;&#115;&#116;</em></div>
   <div>parents: </div>
   <a href="/diff/06824edf55d0/primes.py">diff</a>
   <a href="/rev/06824edf55d0">changeset</a>