Merge from hgweb

2024-10-04 22:07:44 +03:00 · 2005-05-25 08:54:54 -08:00 · 2005-05-25 08:54:54 -08:00 · 7400685c33
commit 7400685c33
parent 34f1196e86 579f538a2d
12 changed files with 75 additions and 78 deletions
--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb.py
@ -516,8 +516,8 @@ class hgweb:

        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
+++ b/setup.py
@ -16,4 +16,4 @@ setup(name='mercurial',
      license='GNU GPL',
      packages=['mercurial'],
      ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c'])],
-      scripts=['hg', 'hgweb.py'])
+      scripts=['hg'])
--- a/templates/changelogentry.tmpl
+++ b/templates/changelogentry.tmpl
@ -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:&nbsp;</b></td>
+ <td align="right" width="15%"><b>#age# ago:&nbsp;</b></td>
 <td><b>#shortdesc#</b></td</tr>
 <tr>
- <td align=right>revision:&nbsp;</td>
+ <td align="right">revision:&nbsp;</td>
 <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>
 #parent1#
 #parent2#
 <tr>
- <td align=right>manifest:&nbsp;</td>
+ <td align="right">manifest:&nbsp;</td>
 <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr>
 <tr>
- <td align=right>author:&nbsp;</td>
+ <td align="right">author:&nbsp;</td>
 <td>#author#</td></tr>
 <tr>
- <td align=right>date:&nbsp;</td>
+ <td align="right">date:&nbsp;</td>
 <td>#date#</td></tr>
 <tr>
- <td align=right valign=top>files:&nbsp;</td>
+ <td align="right" valign="top">files:&nbsp;</td>
 <td>#files#</td></tr>
 </table>
 </div>
--- a/templates/changeset.tmpl
+++ b/templates/changeset.tmpl
@ -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
+++ b/templates/fileannotate.tmpl
@ -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
+++ b/templates/filediff.tmpl
@ -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
+++ b/templates/filelog.tmpl
@ -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
+++ b/templates/filelogentry.tmpl
@ -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:&nbsp;</b></td>
+ <td align="right" width="15%"><b>#age# ago:&nbsp;</b></td>
 <td><b><a href="?cmd=changeset;node=#node#">#shortdesc#</a></b></td</tr>
 <tr>
- <td align=right>revision:&nbsp;</td>
+ <td align="right">revision:&nbsp;</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:&nbsp;</td>
+ <td align="right">author:&nbsp;</td>
 <td>#author#</td></tr>
 <tr>
- <td align=right>date:&nbsp;</td>
+ <td align="right">date:&nbsp;</td>
 <td>#date#</td></tr>
 </table>

--- a/templates/filerevision.tmpl
+++ b/templates/filerevision.tmpl
@ -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
+++ b/templates/header.tmpl
@ -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 @@ a { text-decoration:none; }
 }

 </style>
-</head>
-<body>
-
--- a/templates/manifest.tmpl
+++ b/templates/manifest.tmpl
@ -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#
+#footer#
--- a/templates/map
+++ b/templates/map
@ -8,20 +8,20 @@ fileellipses = "..."
 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:&nbsp;</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:&nbsp;</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>"