# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1125470455 -7200
# Node ID bc9695f1f872e906ec3af77785639d2aa90be05f
# Parent  3f30a5e7e15baaa00702f00e20a85f456d0567d3# Parent  a425bb927ede0088f895f51f3ef001edd8f44722
Merged changes.


diff -r a425bb927ede -r bc9695f1f872 mercurial/hgweb.py
--- 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,