# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1208983553 -7200
# Node ID ccc2481e3954543bfe169d381409f9232a04173b
# Parent  3b6f18851d874ad03ad343079f87498197aa22fc
webcommands: pass full author to annotate, fix templates (issue 1054)

diff -r 3b6f18851d87 -r ccc2481e3954 mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py	Wed Apr 23 11:40:33 2008 +0200
+++ b/mercurial/hgweb/webcommands.py	Wed Apr 23 22:45:53 2008 +0200
@@ -464,7 +464,6 @@
             lines = enumerate(fctx.annotate(follow=True, linenumber=True))
         for lineno, ((f, targetline), l) in lines:
             fnode = f.filenode()
-            name = web.repo.ui.shortuser(f.user())
 
             if last != fnode:
                 last = fnode
@@ -472,7 +471,7 @@
             yield {"parity": parity.next(),
                    "node": hex(f.node()),
                    "rev": f.rev(),
-                   "author": name,
+                   "author": f.user(),
                    "file": f.path(),
                    "targetline": targetline,
                    "line": l,
diff -r 3b6f18851d87 -r ccc2481e3954 templates/coal/map
--- a/templates/coal/map	Wed Apr 23 11:40:33 2008 +0200
+++ b/templates/coal/map	Wed Apr 23 22:45:53 2008 +0200
@@ -30,7 +30,7 @@
 fileline = '<tr class="parity{parity}"><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
 filelogentry = filelogentry.tmpl
 
-annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}">{author|obfuscate}@{rev}</a></td><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
+annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}">{author|user}@{rev}</a></td><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
 
 diffblock = '<table class="bigtable parity{parity}">{lines}</table>'
 difflineplus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source plusline">{line|escape}</td></tr>'
diff -r 3b6f18851d87 -r ccc2481e3954 templates/gitweb/map
--- a/templates/gitweb/map	Wed Apr 23 11:40:33 2008 +0200
+++ b/templates/gitweb/map	Wed Apr 23 22:45:53 2008 +0200
@@ -24,7 +24,7 @@
 filediff = filediff.tmpl
 filelog = filelog.tmpl
 fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</pre></div>'
-annotateline = '<tr style="font-family:monospace" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}">#author|obfuscate#@#rev#</a></td><td><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a></pre></td><td><pre>#line|escape#</pre></td></tr>'
+annotateline = '<tr style="font-family:monospace" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}">#author|user#@#rev#</a></td><td><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a></pre></td><td><pre>#line|escape#</pre></td></tr>'
 difflineplus = '<span style="color:#008800;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
 difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
 difflineat = '<span style="color:#990099;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>'
diff -r 3b6f18851d87 -r ccc2481e3954 templates/map
--- a/templates/map	Wed Apr 23 11:40:33 2008 +0200
+++ b/templates/map	Wed Apr 23 22:45:53 2008 +0200
@@ -24,7 +24,7 @@
 filelog = filelog.tmpl
 fileline = '<div class="parity#parity#"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</div>'
 filelogentry = filelogentry.tmpl
-annotateline = '<tr class="parity#parity#"><td class="annotate"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}">#author|obfuscate#@#rev#</a></td><td><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a></td><td><pre>#line|escape#</pre></td></tr>'
+annotateline = '<tr class="parity#parity#"><td class="annotate"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}">#author|user#@#rev#</a></td><td><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a></td><td><pre>#line|escape#</pre></td></tr>'
 difflineplus = '<span class="plusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
 difflineminus = '<span class="minusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
 difflineat = '<span class="atline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'