mercurial/hgweb/hgweb_mod.py
changeset 3423 a2179e78d18b
parent 3422 0eba7e76cd02
child 3424 9b1c126b74cd
equal deleted inserted replaced
3422:0eba7e76cd02 3423:a2179e78d18b
   742         style = self.repo.ui.config("web", "style", "")
   742         style = self.repo.ui.config("web", "style", "")
   743         if req.form.has_key('style'):
   743         if req.form.has_key('style'):
   744             style = req.form['style'][0]
   744             style = req.form['style'][0]
   745         mapfile = style_map(self.templatepath, style)
   745         mapfile = style_map(self.templatepath, style)
   746 
   746 
   747         if not req.url:
   747         port = req.env["SERVER_PORT"]
   748             port = req.env["SERVER_PORT"]
   748         port = port != "80" and (":" + port) or ""
   749             port = port != "80" and (":" + port) or ""
   749         urlbase = 'http://%s%s' % (req.env['SERVER_NAME'], port)
   750             uri = req.env["REQUEST_URI"]
       
   751             if "?" in uri:
       
   752                 uri = uri.split("?")[0]
       
   753             req.url = "http://%s%s%s" % (req.env["SERVER_NAME"], port, uri)
       
   754 
   750 
   755         if not self.reponame:
   751         if not self.reponame:
   756             self.reponame = (self.repo.ui.config("web", "name")
   752             self.reponame = (self.repo.ui.config("web", "name")
   757                              or req.env.get('REPO_NAME')
   753                              or req.env.get('REPO_NAME')
   758                              or req.url.strip('/') or self.repo.root)
   754                              or req.url.strip('/') or self.repo.root)
   759 
   755 
   760         self.t = templater.templater(mapfile, templater.common_filters,
   756         self.t = templater.templater(mapfile, templater.common_filters,
   761                                      defaults={"url": req.url,
   757                                      defaults={"url": req.url,
       
   758                                                "urlbase": urlbase,
   762                                                "repo": self.reponame,
   759                                                "repo": self.reponame,
   763                                                "header": header,
   760                                                "header": header,
   764                                                "footer": footer,
   761                                                "footer": footer,
   765                                                "rawfileheader": rawfileheader,
   762                                                "rawfileheader": rawfileheader,
   766                                                "sessionvars": sessionvars
   763                                                "sessionvars": sessionvars