Show More
@@ -464,7 +464,6 b' def annotate(web, req, tmpl):' | |||||
464 | lines = enumerate(fctx.annotate(follow=True, linenumber=True)) |
|
464 | lines = enumerate(fctx.annotate(follow=True, linenumber=True)) | |
465 | for lineno, ((f, targetline), l) in lines: |
|
465 | for lineno, ((f, targetline), l) in lines: | |
466 | fnode = f.filenode() |
|
466 | fnode = f.filenode() | |
467 | name = web.repo.ui.shortuser(f.user()) |
|
|||
468 |
|
467 | |||
469 | if last != fnode: |
|
468 | if last != fnode: | |
470 | last = fnode |
|
469 | last = fnode | |
@@ -472,7 +471,7 b' def annotate(web, req, tmpl):' | |||||
472 | yield {"parity": parity.next(), |
|
471 | yield {"parity": parity.next(), | |
473 | "node": hex(f.node()), |
|
472 | "node": hex(f.node()), | |
474 | "rev": f.rev(), |
|
473 | "rev": f.rev(), | |
475 |
"author": |
|
474 | "author": f.user(), | |
476 | "file": f.path(), |
|
475 | "file": f.path(), | |
477 | "targetline": targetline, |
|
476 | "targetline": targetline, | |
478 | "line": l, |
|
477 | "line": l, |
@@ -30,7 +30,7 b' filelog = filelog.tmpl' | |||||
30 | fileline = '<tr class="parity{parity}"><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>' |
|
30 | fileline = '<tr class="parity{parity}"><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>' | |
31 | filelogentry = filelogentry.tmpl |
|
31 | filelogentry = filelogentry.tmpl | |
32 |
|
32 | |||
33 |
annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}">{author| |
|
33 | 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>' | |
34 |
|
34 | |||
35 | diffblock = '<table class="bigtable parity{parity}">{lines}</table>' |
|
35 | diffblock = '<table class="bigtable parity{parity}">{lines}</table>' | |
36 | difflineplus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source plusline">{line|escape}</td></tr>' |
|
36 | difflineplus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source plusline">{line|escape}</td></tr>' |
@@ -24,7 +24,7 b' fileannotate = fileannotate.tmpl' | |||||
24 | filediff = filediff.tmpl |
|
24 | filediff = filediff.tmpl | |
25 | filelog = filelog.tmpl |
|
25 | filelog = filelog.tmpl | |
26 | fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</pre></div>' |
|
26 | fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</pre></div>' | |
27 |
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| |
|
27 | 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>' | |
28 | difflineplus = '<span style="color:#008800;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>' |
|
28 | difflineplus = '<span style="color:#008800;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>' | |
29 | difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>' |
|
29 | difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>' | |
30 | difflineat = '<span style="color:#990099;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>' |
|
30 | difflineat = '<span style="color:#990099;"><a class="linenr" href="##lineid#" id="#lineid#">#linenumber#</a> #line|escape#</span>' |
@@ -24,7 +24,7 b' filediff = filediff.tmpl' | |||||
24 | filelog = filelog.tmpl |
|
24 | filelog = filelog.tmpl | |
25 | fileline = '<div class="parity#parity#"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</div>' |
|
25 | fileline = '<div class="parity#parity#"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</div>' | |
26 | filelogentry = filelogentry.tmpl |
|
26 | filelogentry = filelogentry.tmpl | |
27 |
annotateline = '<tr class="parity#parity#"><td class="annotate"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}">#author| |
|
27 | 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>' | |
28 | difflineplus = '<span class="plusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>' |
|
28 | difflineplus = '<span class="plusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>' | |
29 | difflineminus = '<span class="minusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>' |
|
29 | difflineminus = '<span class="minusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>' | |
30 | difflineat = '<span class="atline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>' |
|
30 | difflineat = '<span class="atline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>' |
General Comments 0
You need to be logged in to leave comments.
Login now