# HG changeset patch # User Dirkjan Ochtman # Date 1212853920 -7200 # Node ID a51093361e1c76cf27124a76417fc118d8fa60c1 # Parent 2cbe0f72c37900fc9045657a3f06c11445ec334d hgweb: show cset node and description when hovering over annotate prefix diff -r 2cbe0f72c379 -r a51093361e1c mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Sat Jun 07 11:43:16 2008 +0200 +++ b/mercurial/hgweb/webcommands.py Sat Jun 07 17:52:00 2008 +0200 @@ -472,6 +472,7 @@ "node": hex(f.node()), "rev": f.rev(), "author": f.user(), + "desc": f.description(), "file": f.path(), "targetline": targetline, "line": l, diff -r 2cbe0f72c379 -r a51093361e1c templates/coal/map --- a/templates/coal/map Sat Jun 07 11:43:16 2008 +0200 +++ b/templates/coal/map Sat Jun 07 17:52:00 2008 +0200 @@ -30,7 +30,7 @@ fileline = '{linenumber}{line|escape}' filelogentry = filelogentry.tmpl -annotateline = '{author|user}@{rev}{linenumber}{line|escape}' +annotateline = '{author|user}@{rev}{linenumber}{line|escape}' diffblock = '{lines}
' difflineplus = '{linenumber}{line|escape}' diff -r 2cbe0f72c379 -r a51093361e1c templates/gitweb/map --- a/templates/gitweb/map Sat Jun 07 11:43:16 2008 +0200 +++ b/templates/gitweb/map Sat Jun 07 17:52:00 2008 +0200 @@ -24,7 +24,7 @@ filediff = filediff.tmpl filelog = filelog.tmpl fileline = '
#linenumber# #line|escape#
' -annotateline = '#author|user#@#rev#
#linenumber#
#line|escape#
' +annotateline = '#author|user#@#rev#
#linenumber#
#line|escape#
' difflineplus = '#linenumber# #line|escape#' difflineminus = '#linenumber# #line|escape#' difflineat = '#linenumber# #line|escape#' diff -r 2cbe0f72c379 -r a51093361e1c templates/map --- a/templates/map Sat Jun 07 11:43:16 2008 +0200 +++ b/templates/map Sat Jun 07 17:52:00 2008 +0200 @@ -24,7 +24,7 @@ filelog = filelog.tmpl fileline = '
#linenumber##line|escape#
' filelogentry = filelogentry.tmpl -annotateline = '#author|user#@#rev##linenumber#
#line|escape#
' +annotateline = '#author|user#@#rev##linenumber#
#line|escape#
' difflineplus = '#linenumber##line|escape#' difflineminus = '#linenumber##line|escape#' difflineat = '#linenumber##line|escape#' diff -r 2cbe0f72c379 -r a51093361e1c tests/test-highlight.out --- a/tests/test-highlight.out Sat Jun 07 11:43:16 2008 +0200 +++ b/tests/test-highlight.out Sat Jun 07 17:52:00 2008 +0200 @@ -114,7 +114,7 @@
- +
test@0 1
#!/usr/bin/env python
test@0 2
test@0     3
__doc__ = """This does HTTP get requests given a host:port and path and returns
test@0     4
a subset of the headers plus the body of the result."""
test@0     5
test@0     6
import httplib, sys
test@0     7
headers = [h.lower() for h in sys.argv[3:]]
test@0     8
conn = httplib.HTTPConnection(sys.argv[1])
test@0     9
conn.request("GET", sys.argv[2])
test@0    10
response = conn.getresponse()
test@0    11
print response.status, response.reason
test@0    12
for h in headers:
test@0    13
    if response.getheader(h, None) is not None:
test@0    14
        print "%s: %s" % (h, response.getheader(h))
test@0    15
print
test@0    16
sys.stdout.write(response.read())
test@0    17
test@0    18
if 200 <= response.status <= 299:
test@0    19
    sys.exit(0)
test@0    20
sys.exit(1)
test@0     1
#!/usr/bin/env python
test@0     2
test@0     3
__doc__ = """This does HTTP get requests given a host:port and path and returns
test@0     4
a subset of the headers plus the body of the result."""
test@0     5
test@0     6
import httplib, sys
test@0     7
headers = [h.lower() for h in sys.argv[3:]]
test@0     8
conn = httplib.HTTPConnection(sys.argv[1])
test@0     9
conn.request("GET", sys.argv[2])
test@0    10
response = conn.getresponse()
test@0    11
print response.status, response.reason
test@0    12
for h in headers:
test@0    13
    if response.getheader(h, None) is not None:
test@0    14
        print "%s: %s" % (h, response.getheader(h))
test@0    15
print
test@0    16
sys.stdout.write(response.read())
test@0    17
test@0    18
if 200 <= response.status <= 299:
test@0    19
    sys.exit(0)
test@0    20
sys.exit(1)