Show More
@@ -398,16 +398,16 b' class hgweb(object):' | |||||
398 | def annotate(**map): |
|
398 | def annotate(**map): | |
399 | parity = 0 |
|
399 | parity = 0 | |
400 | last = None |
|
400 | last = None | |
401 | for f, l in fctx.annotate(): |
|
401 | for f, l in fctx.annotate(follow=True): | |
402 |
|
|
402 | fnode = f.filenode() | |
403 | name = self.repo.ui.shortuser(f.user()) |
|
403 | name = self.repo.ui.shortuser(f.user()) | |
404 |
|
404 | |||
405 |
if last != |
|
405 | if last != fnode: | |
406 | parity = 1 - parity |
|
406 | parity = 1 - parity | |
407 |
last = |
|
407 | last = fnode | |
408 |
|
408 | |||
409 | yield {"parity": parity, |
|
409 | yield {"parity": parity, | |
410 |
"node": hex( |
|
410 | "node": hex(fnode), | |
411 | "rev": f.rev(), |
|
411 | "rev": f.rev(), | |
412 | "author": name, |
|
412 | "author": name, | |
413 | "file": f.path(), |
|
413 | "file": f.path(), |
@@ -22,7 +22,7 b' filediff = filediff.tmpl' | |||||
22 | filelog = filelog.tmpl |
|
22 | filelog = filelog.tmpl | |
23 | fileline = '<div class="parity#parity#"><span class="lineno">#linenumber#</span>#line|escape#</div>' |
|
23 | fileline = '<div class="parity#parity#"><span class="lineno">#linenumber#</span>#line|escape#</div>' | |
24 | filelogentry = filelogentry.tmpl |
|
24 | filelogentry = filelogentry.tmpl | |
25 |
annotateline = '<tr class="parity#parity#"><td class="annotate"><a href="? |
|
25 | annotateline = '<tr class="parity#parity#"><td class="annotate"><a href="?fa=#node|short#;file=#file|urlescape#">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>' | |
26 | difflineplus = '<span class="plusline">#line|escape#</span>' |
|
26 | difflineplus = '<span class="plusline">#line|escape#</span>' | |
27 | difflineminus = '<span class="minusline">#line|escape#</span>' |
|
27 | difflineminus = '<span class="minusline">#line|escape#</span>' | |
28 | difflineat = '<span class="atline">#line|escape#</span>' |
|
28 | difflineat = '<span class="atline">#line|escape#</span>' |
@@ -20,7 +20,7 b' filerevision = filerevision-gitweb.tmpl' | |||||
20 | fileannotate = fileannotate-gitweb.tmpl |
|
20 | fileannotate = fileannotate-gitweb.tmpl | |
21 | filelog = filelog-gitweb.tmpl |
|
21 | filelog = filelog-gitweb.tmpl | |
22 | fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><span class="linenr"> #linenumber#</span> #line|escape#</pre></div>' |
|
22 | fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><span class="linenr"> #linenumber#</span> #line|escape#</pre></div>' | |
23 |
annotateline = '<tr style="font-family:monospace" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="? |
|
23 | annotateline = '<tr style="font-family:monospace" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="?fa=#node|short#;file=#file|urlescape#;style=gitweb">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>' | |
24 | difflineplus = '<div style="color:#008800;">#line|escape#</div>' |
|
24 | difflineplus = '<div style="color:#008800;">#line|escape#</div>' | |
25 | difflineminus = '<div style="color:#cc0000;">#line|escape#</div>' |
|
25 | difflineminus = '<div style="color:#cc0000;">#line|escape#</div>' | |
26 | difflineat = '<div style="color:#990099;">#line|escape#</div>' |
|
26 | difflineat = '<div style="color:#990099;">#line|escape#</div>' |
General Comments 0
You need to be logged in to leave comments.
Login now