Mercurial > hg-stable
changeset 155:083c38bdfa64
Merge from hgweb
| author | mpm@selenic.com |
|---|---|
| date | Wed, 25 May 2005 08:54:54 -0800 |
| parents | 1f6c61a60586 (current diff) 1d5f799ebe1e (diff) |
| children | 32ce2c5d4d25 |
| files | hg mercurial/hg.py mercurial/hgweb.py mercurial/revlog.py setup.py templates/changelogentry.tmpl templates/changeset.tmpl templates/fileannotate.tmpl templates/filediff.tmpl templates/filelog.tmpl templates/filelogentry.tmpl templates/filerevision.tmpl templates/header.tmpl templates/manifest.tmpl templates/map |
| diffstat | 12 files changed, 75 insertions(+), 78 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb.py Wed May 25 08:53:34 2005 -0800 +++ b/mercurial/hgweb.py Wed May 25 08:54:54 2005 -0800 @@ -516,8 +516,8 @@ if not args.has_key('cmd') or args['cmd'][0] == 'changelog': hi = self.repo.changelog.count() - if args.has_key('pos'): - hi = int(args['pos'][0]) + if args.has_key('rev'): + hi = int(args['rev'][0]) write(self.changelog(hi))
--- a/setup.py Wed May 25 08:53:34 2005 -0800 +++ b/setup.py Wed May 25 08:54:54 2005 -0800 @@ -16,4 +16,4 @@ license='GNU GPL', packages=['mercurial'], ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c'])], - scripts=['hg', 'hgweb.py']) + scripts=['hg'])
--- a/templates/changelogentry.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/changelogentry.tmpl Wed May 25 08:54:54 2005 -0800 @@ -1,24 +1,24 @@ -<div class=parity#parity#> -<table width=100% cellpadding=0 cellspacing=0> +<div class="parity#parity#"> +<table width="100%" cellpadding="0" cellspacing="0"> <tr> - <td align=right width="15%"><b>#age# ago: </b></td> + <td align="right" width="15%"><b>#age# ago: </b></td> <td><b>#shortdesc#</b></td</tr> <tr> - <td align=right>revision: </td> + <td align="right">revision: </td> <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr> #parent1# #parent2# <tr> - <td align=right>manifest: </td> + <td align="right">manifest: </td> <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr> <tr> - <td align=right>author: </td> + <td align="right">author: </td> <td>#author#</td></tr> <tr> - <td align=right>date: </td> + <td align="right">date: </td> <td>#date#</td></tr> <tr> - <td align=right valign=top>files: </td> + <td align="right" valign="top">files: </td> <td>#files#</td></tr> </table> </div>
--- a/templates/changeset.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/changeset.tmpl Wed May 25 08:54:54 2005 -0800 @@ -3,8 +3,8 @@ </head> <body> -<div class=buttons> -<a href="?cmd=changelog&pos=#rev#">changelog</a> +<div class="buttons"> +<a href="?cmd=changelog;rev=#rev#">changelog</a> <a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a> </div> @@ -12,28 +12,28 @@ <table> <tr> - <td class=metatag>revision:</td> + <td class="metatag">revision:</td> <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr> #parent1# #parent2# <tr> - <td class=metatag>manifest:</td> + <td class="metatag">manifest:</td> <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr> <tr> - <td class=metatag>author:</td> + <td class="metatag">author:</td> <td>#author#</td></tr> <tr> - <td class=metatag>date:</td> + <td class="metatag">date:</td> <td>#date#</td></tr> <tr> - <td class=metatag valign=top>files:</td> + <td class="metatag" valign="top">files:</td> <td>#files#</td></tr> <tr> - <td class=metatag valign=top>description:</td> + <td class="metatag" valign="top">description:</td> <td>#desc#</td></tr> </table> -<pre class=parity0> +<pre class="parity0"> #diff# </pre>
--- a/templates/fileannotate.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/fileannotate.tmpl Wed May 25 08:54:54 2005 -0800 @@ -3,36 +3,36 @@ </head> <body> -<div class=buttons> -<a href="?cmd=changelog&rev=#rev#">changelog</a> -<a href="?cmd=changeset&node=#node#">changeset</a> -<a href="?cmd=manifest&manifest=#manifest#;path=#path#">manifest</a> -<a href="?cmd=file&file=#file#&filenode=#filenode#">file</a> -<a href="?cmd=filelog&file=#file#;filenode=#filenode#">revisions</a> +<div class="buttons"> +<a href="?cmd=changelog;rev=#rev#">changelog</a> +<a href="?cmd=changeset;node=#node#">changeset</a> +<a href="?cmd=manifest;manifest=#manifest#;path=#path#">manifest</a> +<a href="?cmd=file;file=#file#;filenode=#filenode#">file</a> +<a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a> </div> <h2>Annotate #file# (#filenode#)</h2> <table> <tr> - <td class=metatag>changeset:</td> + <td class="metatag">changeset:</td> <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr> #parent1# #parent2# <tr> - <td class=metatag>manifest:</td> + <td class="metatag">manifest:</td> <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr> <tr> - <td class=metatag>author:</td> + <td class="metatag">author:</td> <td>#author#</td></tr> <tr> - <td class=metatag>date:</td> + <td class="metatag">date:</td> <td>#date#</td></tr> </table> <br/> -<table cellspacing=0 cellpadding=0> +<table cellspacing="0" cellpadding="0"> #annotate# </table>
--- a/templates/filediff.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/filediff.tmpl Wed May 25 08:54:54 2005 -0800 @@ -3,26 +3,26 @@ </head> <body> -<div class=buttons> -<a href="?cmd=changelog&rev=#rev#">changelog</a> -<a href="?cmd=changeset&node=#node#">changeset</a> -<a href="?cmd=file&file=#file#&filenode=#filenode#">file</a> -<a href="?cmd=filelog&file=#file#&filenode=#filenode#">revisions</a> -<a href="?cmd=annotate&file=#file#&filenode=#filenode#">annotate</a> +<div class="buttons"> +<a href="?cmd=changelog;rev=#rev#">changelog</a> +<a href="?cmd=changeset;node=#node#">changeset</a> +<a href="?cmd=file;file=#file#;filenode=#filenode#">file</a> +<a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a> +<a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a> </div> <h2>#file#</h2> <table> <tr> - <td class=metatag>revision:</td> + <td class="metatag">revision:</td> <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr> <tr> - <td class=metatag>parent:</td> + <td class="metatag">parent:</td> <td><a href="?cmd=changeset;node=#p1#">#p1rev#:#p1#</a></td></tr> </table> -<pre class=parity0> +<pre class="parity0"> #diff# </pre>
--- a/templates/filelog.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/filelog.tmpl Wed May 25 08:54:54 2005 -0800 @@ -3,10 +3,10 @@ </head> <body> -<div class=buttons> +<div class="buttons"> <a href="?cmd=changelog">changelog</a> -<a href="?cmd=file&file=#file#&filenode=#filenode#">file</a> -<a href="?cmd=annotate&file=#file#&filenode=#filenode#">annotate</a> +<a href="?cmd=file;file=#file#;filenode=#filenode#">file</a> +<a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a> </div> <h2>#file# revision history</h2>
--- a/templates/filelogentry.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/filelogentry.tmpl Wed May 25 08:54:54 2005 -0800 @@ -1,18 +1,18 @@ -<table class=parity#parity# width=100% cellspacing=0 cellpadding=0> +<table class="parity#parity#" width="100%" cellspacing="0" cellpadding="0"> <tr> - <td align=right width="15%"><b>#age# ago: </b></td> + <td align="right" width="15%"><b>#age# ago: </b></td> <td><b><a href="?cmd=changeset;node=#node#">#shortdesc#</a></b></td</tr> <tr> - <td align=right>revision: </td> + <td align="right">revision: </td> <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filerev#:#filenode#</a> <a href="?cmd=filediff;file=#file#;node=#node#">(diff)</a> <a href="?cmd=annotate;file=#file#;filenode=#filenode#">(annotate)</a> </td></tr> <tr> - <td align=right>author: </td> + <td align="right">author: </td> <td>#author#</td></tr> <tr> - <td align=right>date: </td> + <td align="right">date: </td> <td>#date#</td></tr> </table>
--- a/templates/filerevision.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/filerevision.tmpl Wed May 25 08:54:54 2005 -0800 @@ -3,30 +3,30 @@ </head> <body> -<div class=buttons> -<a href="?cmd=changelog&rev=#rev#">changelog</a> -<a href="?cmd=changeset&node=#node#">changeset</a> -<a href="?cmd=manifest&manifest=#manifest#;path=#path#">manifest</a> -<a href="?cmd=filelog&file=#file#;filenode=#filenode#">revisions</a> -<a href="?cmd=annotate&file=#file#&filenode=#filenode#">annotate</a> +<div class="buttons"> +<a href="?cmd=changelog;rev=#rev#">changelog</a> +<a href="?cmd=changeset;node=#node#">changeset</a> +<a href="?cmd=manifest;manifest=#manifest#;path=#path#">manifest</a> +<a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a> +<a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a> </div> <h2>#file# (revision #filenode#)</h2> <table> <tr> - <td class=metatag>changeset:</td> + <td class="metatag">changeset:</td> <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr> #parent1# #parent2# <tr> - <td class=metatag>manifest:</td> + <td class="metatag">manifest:</td> <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr> <tr> - <td class=metatag>author:</td> + <td class="metatag">author:</td> <td>#author#</td></tr> <tr> - <td class=metatag>date:</td> + <td class="metatag">date:</td> <td>#date#</td></tr> </table>
--- a/templates/header.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/header.tmpl Wed May 25 08:54:54 2005 -0800 @@ -1,8 +1,8 @@ Content-type: text/html +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -</head> <style type="text/css"> a { text-decoration:none; } .parity0 { background-color: #eeeeee; } @@ -26,6 +26,3 @@ } </style> -</head> -<body> -
--- a/templates/manifest.tmpl Wed May 25 08:53:34 2005 -0800 +++ b/templates/manifest.tmpl Wed May 25 08:54:54 2005 -0800 @@ -3,14 +3,14 @@ </head> <body> -<div class=buttons> -<a href="?cmd=changelog&rev=#rev#">changelog</a> -<a href="?cmd=changeset&node=#node#">changeset</a> +<div class="buttons"> +<a href="?cmd=changelog;rev=#rev#">changelog</a> +<a href="?cmd=changeset;node=#node#">changeset</a> </div> <h2>manifest: #path#</h2> -<div class=parity1><a href="?cmd=manifest;manifest=#manifest#;path=#up#">[up]</a><br /></div> +<div class="parity1"><a href="?cmd=manifest;manifest=#manifest#;path=#up#">[up]</a><br /></div> #entries# -#footer# \ No newline at end of file +#footer#
--- a/templates/map Wed May 25 08:53:34 2005 -0800 +++ b/templates/map Wed May 25 08:54:54 2005 -0800 @@ -8,20 +8,20 @@ changelogentry = changelogentry.tmpl changeset = changeset.tmpl manifest = manifest.tmpl -manifestdirentry = "<div class=parity#parity#><a href="?cmd=manifest;manifest=#manifest#;path=#path#">#basename#/</a><br /></div>" -manifestfileentry = "<div class=parity#parity#><a href="?cmd=file;filenode=#filenode#;file=#file#">#basename#</a><br /></div>" +manifestdirentry = "<div class="parity#parity#"><a href="?cmd=manifest;manifest=#manifest#;path=#path#">#basename#/</a><br /></div>" +manifestfileentry = "<div class="parity#parity#"><a href="?cmd=file;filenode=#filenode#;file=#file#">#basename#</a><br /></div>" filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl filediff = filediff.tmpl filelog = filelog.tmpl -fileline = "<div class=parity#parity#><span class=lineno>#linenumber# </span>#line#</div>" +fileline = "<div class="parity#parity#"><span class="lineno">#linenumber# </span>#line#</div>" filelogentry = filelogentry.tmpl -annotateline = "<tr class=parity#parity#><td class=annotate><a href="?cmd=changeset;node=#node#">#author#@#rev#</a></td><td><pre>#line#</pre></td></tr>" -difflineplus = "<span class=plusline>#line#</span>" -difflineminus = "<span class=minusline>#line#</span>" -difflineat = "<span class=atline>#line#</span>" +annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author#@#rev#</a></td><td><pre>#line#</pre></td></tr>" +difflineplus = "<span class="plusline">#line#</span>" +difflineminus = "<span class="minusline">#line#</span>" +difflineat = "<span class="atline">#line#</span>" diffline = "#line#" -changelogparent = "<tr><td align=right>parent: </td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" -changesetparent = "<tr><td class=metatag>parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" -filerevparent = "<tr><td class=metatag>parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" -fileannotateparent = "<tr><td class=metatag>parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" +changelogparent = "<tr><td align="right">parent: </td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" +changesetparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" +filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>" +fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>"