Mercurial > hg > gitweb

changeset 3205:48395d2692de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: kill #manifest#
author Brendan Cully <brendan@kublai.com>
date Fri, 29 Sep 2006 16:26:09 -0700
parents 367a009c2acb
children 79fd7a92f3e2
files mercurial/hgweb/hgweb_mod.py templates/changelog-gitweb.tmpl templates/changelog.tmpl templates/changelogentry.tmpl templates/changeset-gitweb.tmpl templates/changeset.tmpl templates/error-gitweb.tmpl templates/fileannotate-gitweb.tmpl templates/fileannotate.tmpl templates/filerevision-gitweb.tmpl templates/filerevision.tmpl templates/manifest-gitweb.tmpl templates/manifest.tmpl templates/map templates/map-gitweb templates/search-gitweb.tmpl templates/search.tmpl templates/shortlog-gitweb.tmpl templates/shortlog.tmpl templates/summary-gitweb.tmpl templates/tags-gitweb.tmpl templates/tags.tmpl templates/template-vars.txt
diffstat 23 files changed, 46 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py	Thu Sep 28 21:00:01 2006 +0100
+++ b/mercurial/hgweb/hgweb_mod.py	Fri Sep 29 16:26:09 2006 -0700
@@ -202,7 +202,6 @@
                              "child": self.siblings(cl.children(n), cl.rev,
                                                     cl.rev(n) + 1),
                              "changelogtag": self.showtag("changelogtag",n),
-                             "manifest": hex(changes[0]),
                              "desc": changes[4],
                              "date": changes[2],
                              "files": self.listfilediffs(changes[3], n),
@@ -223,7 +222,7 @@
 
         yield self.t(shortlog and 'shortlog' or 'changelog',
                      changenav=changenav,
-                     manifest=hex(mf),
+                     node=hex(cl.tip()),
                      rev=pos, changesets=count, entries=changelist,
                      archives=self.archivelist("tip"))
 
@@ -265,7 +264,6 @@
                              parent=self.siblings(cl.parents(n), cl.rev),
                              child=self.siblings(cl.children(n), cl.rev),
                              changelogtag=self.showtag("changelogtag",n),
-                             manifest=hex(changes[0]),
                              desc=changes[4],
                              date=changes[2],
                              files=self.listfilediffs(changes[3], n),
@@ -280,7 +278,7 @@
 
         yield self.t('search',
                      query=query,
-                     manifest=hex(mf),
+                     node=hex(cl.tip()),
                      entries=changelist)
 
     def changeset(self, nodeid):
@@ -309,7 +307,6 @@
                      parent=self.siblings(cl.parents(n), cl.rev),
                      child=self.siblings(cl.children(n), cl.rev),
                      changesettag=self.showtag("changesettag",n),
-                     manifest=hex(changes[0]),
                      author=changes[1],
                      desc=changes[4],
                      date=changes[2],
@@ -385,7 +382,6 @@
                      mimetype=mt,
                      rev=changerev,
                      node=hex(cn),
-                     manifest=hex(mfn),
                      author=cs[1],
                      date=cs[2],
                      parent=self.siblings(fl.parents(n), fl.rev, file=f),
@@ -424,7 +420,6 @@
                      path=_up(f),
                      rev=fctx.rev(),
                      node=hex(fctx.node()),
-                     manifest=hex(fctx.changectx().changeset()[0]),
                      author=fctx.user(),
                      date=fctx.date(),
                      rename=self.renamelink(fl, n),
@@ -432,14 +427,9 @@
                      child=self.siblings(fl.children(n), fl.rev, file=f),
                      permissions=fctx.manifest().execf(f))
 
-    def manifest(self, mnode, path):
-        man = self.repo.manifest
-        mn = man.lookup(mnode)
-        mnode = hex(mn)
-        mf = man.read(mn)
-        rev = man.rev(mn)
-        changerev = man.linkrev(mn)
-        node = self.repo.changelog.node(changerev)
+    def manifest(self, ctx, path):
+        mf = ctx.manifest()
+        node = ctx.node()
 
         files = {}
 
@@ -469,7 +459,6 @@
                     continue
 
                 yield {"file": full,
-                       "manifest": mnode,
                        "filenode": hex(fnode),
                        "parity": self.stripes(parity),
                        "basename": f,
@@ -487,13 +476,11 @@
 
                 yield {"parity": self.stripes(parity),
                        "path": os.path.join(path, f),
-                       "manifest": mnode,
                        "basename": f[:-1]}
                 parity += 1
 
         yield self.t("manifest",
-                     manifest=mnode,
-                     rev=rev,
+                     rev=ctx.rev(),
                      node=hex(node),
                      path=path,
                      up=_up(path),
@@ -503,7 +490,6 @@
 
     def tags(self):
         cl = self.repo.changelog
-        mf = cl.read(cl.tip())[0]
 
         i = self.repo.tagslist()
         i.reverse()
@@ -514,19 +500,17 @@
                 if notip and k == "tip": continue
                 yield {"parity": self.stripes(parity),
                        "tag": k,
-                       "tagmanifest": hex(cl.read(n)[0]),
                        "date": cl.read(n)[2],
                        "node": hex(n)}
                 parity += 1
 
         yield self.t("tags",
-                     manifest=hex(mf),
+                     node=hex(self.repo.changelog.tip()),
                      entries=lambda **x: entries(False, **x),
                      entriesnotip=lambda **x: entries(True, **x))
 
     def summary(self):
         cl = self.repo.changelog
-        mf = cl.read(cl.tip())[0]
 
         i = self.repo.tagslist()
         i.reverse()
@@ -550,8 +534,7 @@
                              parity = self.stripes(parity),
                              tag = k,
                              node = hex(n),
-                             date = t,
-                             tagmanifest = hex(m))
+                             date = t)
                 parity += 1
 
         def changelist(**map):
@@ -568,7 +551,6 @@
                     'shortlogentry',
                     parity = parity,
                     author = changes[1],
-                    manifest = hex(changes[0]),
                     desc = changes[4],
                     date = t,
                     rev = i,
@@ -577,8 +559,6 @@
 
             yield l
 
-        cl = self.repo.changelog
-        mf = cl.read(cl.tip())[0]
         count = cl.count()
         start = max(0, count - self.maxchanges)
         end = min(count, start + self.maxchanges)
@@ -589,9 +569,9 @@
                           self.repo.ui.config("web", "contact") or # deprecated
                           self.repo.ui.config("web", "author", "unknown")), # also
                  lastchange = (0, 0), # FIXME
-                 manifest = hex(mf),
                  tags = tagentries,
                  shortlog = changelist,
+                 node = hex(self.repo.changelog.tip()),
                  archives=self.archivelist("tip"))
 
     def filediff(self, file, changeset):
@@ -693,6 +673,15 @@
                         form[name] = value
                     del form[k]
 
+            if form.has_key('manifest'):
+                changeid = req.form['manifest'][0]
+                try:
+                    req.changectx = self.repo.changectx(changeid)
+                except hg.RepoError:
+                    man = self.repo.manifest
+                    mn = man.lookup(changeid)
+                    req.changectx = self.repo.changectx(man.linkrev(mn))
+
         self.refresh()
 
         expand_form(req.form)
@@ -771,7 +760,7 @@
         req.write(self.changeset(req.form['node'][0]))
 
     def do_manifest(self, req):
-        req.write(self.manifest(req.form['manifest'][0],
+        req.write(self.manifest(req.changectx,
                                 self.cleanpath(req.form['path'][0])))
 
     def do_tags(self, req):
--- a/templates/changelog-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/changelog-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -20,7 +20,7 @@
 </div>
 
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;rev=#rev#;style=gitweb">shortlog</a> | changelog | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>#archives%archiveentry#<br/>
+<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;rev=#rev#;style=gitweb">shortlog</a> | changelog | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=/;style=gitweb">manifest</a>#archives%archiveentry#<br/>
 <br/>
 #changenav%naventry#<br/>
 </div>
--- a/templates/changelog.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/changelog.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -8,7 +8,7 @@
 <div class="buttons">
 <a href="?sl=#rev#">shortlog</a>
 <a href="?cmd=tags">tags</a>
-<a href="?mf=#manifest|short#;path=/">manifest</a>
+<a href="?mf=#node|short#;path=/">manifest</a>
 #archives%archiveentry#
 <a type="application/rss+xml" href="?style=rss">rss</a>
 </div>
--- a/templates/changelogentry.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/changelogentry.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -19,7 +19,7 @@
   <td class="date">#date|date#</td>
  </tr>
  <tr>
-  <th class="files"><a href="?mf=#manifest|short#;path=/">files</a>:</th>
+  <th class="files"><a href="?mf=#node|short#;path=/">files</a>:</th>
   <td class="files">#files#</td>
  </tr>
 </table>
--- a/templates/changeset-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/changeset-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -10,7 +10,7 @@
 </div>
 
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;rev=#rev#;style=gitweb">shortlog</a> | <a href="?cmd=changelog;rev=#rev#;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a> | changeset | <a href="?cmd=changeset;node=#node#;style=raw">raw</a> #archives%archiveentry#<br/>
+<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;rev=#rev#;style=gitweb">shortlog</a> | <a href="?cmd=changelog;rev=#rev#;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=/;style=gitweb">manifest</a> | changeset | <a href="?cmd=changeset;node=#node#;style=raw">raw</a> #archives%archiveentry#<br/>
 </div>
 
 <div>
@@ -21,7 +21,7 @@
 <tr><td>author</td><td>#author|obfuscate#</td></tr>
 <tr><td></td><td>#date|date# (#date|age# ago)</td></tr>
 <tr><td>changeset</td><td style="font-family:monospace">#node|short#</td></tr>
-<tr><td>manifest</td><td style="font-family:monospace"><a class="list" href="?cmd=manifest;manifest=#manifest|short#;path=/;style=gitweb">#manifest|short#</a></td></tr>
+<tr><td>manifest</td><td style="font-family:monospace"><a class="list" href="?mf=#node|short#;path=/;style=gitweb">#node|short#</a></td></tr>
 #parent%changesetparent#
 #child%changesetchild#
 #changesettag#
--- a/templates/changeset.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/changeset.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -7,7 +7,7 @@
 <a href="?cl=#rev#">changelog</a>
 <a href="?sl=#rev#">shortlog</a>
 <a href="?cmd=tags">tags</a>
-<a href="?mf=#manifest|short#;path=/">manifest</a>
+<a href="?mf=#node|short#;path=/">manifest</a>
 <a href="?cs=#node|short#;style=raw">raw</a>
 #archives%archiveentry#
 </div>
--- a/templates/error-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/error-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -10,7 +10,7 @@
 </div>
 
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a><br/>
+<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=/;style=gitweb">manifest</a><br/>
 </div>
 
 <div>
--- a/templates/fileannotate-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/fileannotate-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -10,7 +10,7 @@
 </div>
 
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | annotate | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
+<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | annotate | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
 </div>
 
 <div class="title">#file|escape#</div>
@@ -24,7 +24,7 @@
 #child%fileannotatechild#
 <tr>
  <td class="metatag">manifest:</td>
- <td><a href="?mf=#manifest|short#;path=/;style=gitweb">#manifest|short#</a></td></tr>
+ <td><a href="?mf=#node|short#;path=/;style=gitweb">#node|short#</a></td></tr>
 <tr>
  <td class="metatag">author:</td>
  <td>#author|obfuscate#</td></tr>
--- a/templates/fileannotate.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/fileannotate.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -8,7 +8,7 @@
 <a href="?sl=#rev#">shortlog</a>
 <a href="?tags=">tags</a>
 <a href="?cs=#node|short#">changeset</a>
-<a href="?mf=#manifest|short#;path=#path|urlescape#">manifest</a>
+<a href="?mf=#node|short#;path=#path|urlescape#">manifest</a>
 <a href="?f=#filenode|short#;file=#file|urlescape#">file</a>
 <a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a>
 <a href="?fa=#filenode|short#;file=#file|urlescape#;style=raw">raw</a>
--- a/templates/filerevision-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/filerevision-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -10,7 +10,7 @@
 </div>
 
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#manifest|short#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | file | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
+<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | file | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#filenode#;style=gitweb">revisions</a> | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=raw">raw</a><br/>
 </div>
 
 <div class="title">#file|escape#</div>
@@ -24,7 +24,7 @@
 #child%fileannotatechild#
 <tr>
  <td class="metatag">manifest:</td>
- <td><a href="?mf=#manifest|short#;path=/;style=gitweb">#manifest|short#</a></td></tr>
+ <td><a href="?mf=#node|short#;path=/;style=gitweb">#node|short#</a></td></tr>
 <tr>
  <td class="metatag">author:</td>
  <td>#author|obfuscate#</td></tr>
--- a/templates/filerevision.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/filerevision.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -8,7 +8,7 @@
 <a href="?sl=#rev#">shortlog</a>
 <a href="?tags=">tags</a>
 <a href="?cs=#node|short#">changeset</a>
-<a href="?mf=#manifest|short#;path=#path|urlescape#">manifest</a>
+<a href="?mf=#node|short#;path=#path|urlescape#">manifest</a>
 <a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a>
 <a href="?fa=#filenode|short#;file=#file|urlescape#">annotate</a>
 <a href="?f=#filenode|short#;file=#file|urlescape#;style=raw">raw</a>
--- a/templates/manifest-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/manifest-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -18,7 +18,7 @@
 <table cellspacing="0">
 <tr class="light">
 <td style="font-family:monospace">drwxr-xr-x</td>
-<td><a href="?cmd=manifest;manifest=#manifest#;path=#up|urlescape#;style=gitweb">[up]</a></td>
+<td><a href="?mf=#node|short#;path=#up|urlescape#;style=gitweb">[up]</a></td>
 <td class="link">&nbsp;</td>
 </tr>
 #dentries%manifestdirentry#
--- a/templates/manifest.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/manifest.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -1,5 +1,5 @@
 #header#
-<title>#repo|escape#: manifest #manifest|short#</title>
+<title>#repo|escape#: manifest for changeset #node|short#</title>
 </head>
 <body>
 
@@ -16,7 +16,7 @@
 <table cellpadding="0" cellspacing="0">
 <tr class="parity1">
   <td><tt>drwxr-xr-x</tt>&nbsp;
-  <td><a href="?mf=#manifest|short#;path=#up|urlescape#">[up]</a>
+  <td><a href="?mf=#node|short#;path=#up|urlescape#">[up]</a>
 #dentries%manifestdirentry#
 #fentries%manifestfileentry#
 </table>
--- a/templates/map	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/map	Fri Sep 29 16:26:09 2006 -0700
@@ -14,7 +14,7 @@
 searchentry = changelogentry.tmpl
 changeset = changeset.tmpl
 manifest = manifest.tmpl
-manifestdirentry = '<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td><a href="?cmd=manifest;manifest=#manifest#;path=#path|urlescape#">#basename|escape#/</a>'
+manifestdirentry = '<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td><a href="?mf=#node|short#;path=#path|urlescape#">#basename|escape#/</a>'
 manifestfileentry = '<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt>&nbsp;<td><a href="?f=#filenode|short#;file=#file|urlescape#">#basename|escape#</a>'
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
--- a/templates/map-gitweb	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/map-gitweb	Fri Sep 29 16:26:09 2006 -0700
@@ -14,7 +14,7 @@
 searchentry = changelogentry-gitweb.tmpl
 changeset = changeset-gitweb.tmpl
 manifest = manifest-gitweb.tmpl
-manifestdirentry = '<tr class="parity#parity#"><td style="font-family:monospace">drwxr-xr-x</td><td><a href="?mf=#manifest|short#;path=#path|urlescape#;style=gitweb">#basename|escape#/</a></td><td class="link"><a href="?mf=#manifest|short#;path=#path|urlescape#;style=gitweb">manifest</a></td></tr>'
+manifestdirentry = '<tr class="parity#parity#"><td style="font-family:monospace">drwxr-xr-x</td><td><a href="?mf=#node|short#;path=#path|urlescape#;style=gitweb">#basename|escape#/</a></td><td class="link"><a href="?mf=#node|short#;path=#path|urlescape#;style=gitweb">manifest</a></td></tr>'
 manifestfileentry = '<tr class="parity#parity#"><td style="font-family:monospace">#permissions|permissions#</td><td class="list"><a class="list" href="?f=#filenode|short#;file=#file|urlescape#;style=gitweb">#basename|escape#</a></td><td class="link"><a href="?f=#filenode|short#;file=#file|urlescape#;style=gitweb">file</a> | <a href="?fl=#filenode|short#;file=#file|urlescape#;style=gitweb">revisions</a> | <a href="?fa=#filenode|short#;file=#file|urlescape#;style=gitweb">annotate</a></td></tr>'
 filerevision = filerevision-gitweb.tmpl
 fileannotate = fileannotate-gitweb.tmpl
@@ -36,7 +36,7 @@
 filerevchild = '<tr><td class="metatag">child:</td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>'
 fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="?cmd=annotate;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>'
 tags = tags-gitweb.tmpl
-tagentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#tag|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> | <a href="?cmd=changelog;rev=#node|short#;style=gitweb">changelog</a> |  <a href="?mf=#tagmanifest|short#;path=/;style=gitweb">manifest</a></td></tr>'
+tagentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#tag|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> | <a href="?cmd=changelog;rev=#node|short#;style=gitweb">changelog</a> |  <a href="?mf=#node|short#;path=/;style=gitweb">manifest</a></td></tr>'
 diffblock = '<pre>#lines#</pre>'
 changelogtag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>'
 changesettag = '<tr><td>tag</td><td>#tag|escape#</td></tr>'
@@ -45,6 +45,6 @@
 filediffchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="?cmd=changeset;node=#node#;style=gitweb">#node|short#</a></td></tr>'
 filelogchild = '<tr><td align="right">child #rev#:&nbsp;</td><td><a href="?cmd=file;file=#file|urlescape#;filenode=#node#;style=gitweb">#node|short#</a></td></tr>'
 shortlog = shortlog-gitweb.tmpl
-shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> |  <a href="?cmd=manifest;manifest=#manifest|short#;path=/;style=gitweb">manifest</a></td></tr>'
+shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="?cmd=changeset;node=#node|short#;style=gitweb">changeset</a> |  <a href="?cmd=manifest;manifest=#node|short#;path=/;style=gitweb">manifest</a></td></tr>'
 filelogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="?cmd=changeset;node=#node|short#;style=gitweb"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="?f=#node|short#;file=#file|urlescape#;style=gitweb">file</a> | <!-- FIXME: <a href="?fd=#node|short#;file=#file|urlescape#;style=gitweb">diff</a> | --> <a href="?fa=#filenode|short#;file=#file|urlescape#;style=gitweb">annotate</a> #rename%filelogrename#</td></tr>'
 archiveentry = ' | <a href="?ca=#node|short#;type=#type|urlescape#">#type|escape#</a> '
--- a/templates/search-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/search-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -1,6 +1,6 @@
 #header#
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a><br/>
+<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=/;style=gitweb">manifest</a><br/>
 </div>
 
 <h2>searching for #query|escape#</h2>
--- a/templates/search.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/search.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -7,7 +7,7 @@
 <a href="?cl=tip">changelog</a>
 <a href="?sl=tip">shortlog</a>
 <a href="?tags=">tags</a>
-<a href="?mf=#manifest|short#;path=/">manifest</a>
+<a href="?mf=#node|short#;path=/">manifest</a>
 </div>
 
 <h2>searching for #query|escape#</h2>
--- a/templates/shortlog-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/shortlog-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -19,7 +19,7 @@
 </form>
 </div>
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | shortlog | <a href="?cmd=changelog;rev=#rev#;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>#archives%archiveentry#<br/>
+<a href="?cmd=summary;style=gitweb">summary</a> | shortlog | <a href="?cmd=changelog;rev=#rev#;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=/;style=gitweb">manifest</a>#archives%archiveentry#<br/>
 <br/>
 
 #changenav%navshortentry#<br/>
--- a/templates/shortlog.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/shortlog.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -8,7 +8,7 @@
 <div class="buttons">
 <a href="?cl=#rev#">changelog</a>
 <a href="?cmd=tags">tags</a>
-<a href="?mf=#manifest|short#;path=/">manifest</a>
+<a href="?mf=#node|short#;path=/">manifest</a>
 #archives%archiveentry#
 <a type="application/rss+xml" href="?style=rss">rss</a>
 </div>
--- a/templates/summary-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/summary-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -9,7 +9,7 @@
 <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo|escape#</a> / summary
 </div>
 <div class="page_nav">
-summary | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>#archives%archiveentry#
+summary | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=mf=#node|short#;path=/;style=gitweb">manifest</a>#archives%archiveentry#
 <br/>
 </div>
 
--- a/templates/tags-gitweb.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/tags-gitweb.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -10,7 +10,7 @@
 </div>
 
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | tags | <a href="?cmd=manifest;manifest=#manifest#;path=/;style=gitweb">manifest</a>
+<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | tags | <a href="?cmd=manifest;manifest=#node|short#;path=/;style=gitweb">manifest</a>
 <br/>
 </div>
 
--- a/templates/tags.tmpl	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/tags.tmpl	Fri Sep 29 16:26:09 2006 -0700
@@ -8,7 +8,7 @@
 <div class="buttons">
 <a href="?cl=tip">changelog</a>
 <a href="?sl=tip">shortlog</a>
-<a href="?mf=#manifest|short#;path=/">manifest</a>
+<a href="?mf=#node|short#;path=/">manifest</a>
 <a type="application/rss+xml" href="?cmd=tags;style=rss">rss</a>
 </div>
 
--- a/templates/template-vars.txt	Thu Sep 28 21:00:01 2006 +0100
+++ b/templates/template-vars.txt	Fri Sep 29 16:26:09 2006 -0700
@@ -3,14 +3,11 @@
 node          a changeset node
 changesets    total number of changesets
 file          a filename
-filenode      a file node
 filerev       a file revision
 filerevs      total number of file revisions
 up            the directory of the relevant file
 path          a path in the manifest, starting with "/"
 basename      a short pathname
-manifest      a manifest node
-manifestrev   a manifest revision
 date          a date string
 age           age in hours, days, etc
 line          a line of text (escaped)