Mercurial > hg

changeset 1173:bc9695f1f872

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 31 Aug 2005 08:40:55 +0200
parents 3f30a5e7e15b (diff) a425bb927ede (current diff)
children 9d9f4973c76a
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb.py	Tue Aug 30 23:16:15 2005 -0700
+++ b/mercurial/hgweb.py	Wed Aug 31 08:40:55 2005 +0200
@@ -178,8 +178,7 @@
             self.repo = repo
 
         self.mtime = -1
-        self.reponame = name or self.repo.ui.config("web", "name",
-                                                    self.repo.root)
+        self.reponame = name
         self.archives = 'zip', 'gz', 'bz2'
 
     def refresh(self):
@@ -730,6 +729,9 @@
         if "?" in uri:
             uri = uri.split("?")[0]
         url = "http://%s%s%s" % (req.env["SERVER_NAME"], port, uri)
+        if not self.reponame:
+            self.reponame = (self.repo.ui.config("web", "name")
+                             or uri.strip('/') or self.repo.root)
 
         self.t = templater(m, common_filters,
                            {"url": url,