comparison mercurial/hgweb/hgwebdir_mod.py @ 45378:dc9fe90bdbd5

hgweb: let staticfile() look up path from default location unless provided

This reduces duplication between the two callers.

Differential Revision: https://phab.mercurial-scm.org/D8934

45377:da3b7c80aa34

                if virtual.startswith(b'static/'):
                    fname = virtual[7:]
                else:
                    fname = req.qsparams[b'static']
                static = self.ui.config(b"web", b"static", untrusted=False)
                if not static:
                    tp = self.templatepath or templater.templatedir()
                    if tp is not None:
                        static = os.path.join(tp, b'static')

                staticfile(static, fname, res)
                return res.sendresponse()

            # top-level index

            repos = dict(self.repos)

45378:dc9fe90bdbd5

                if virtual.startswith(b'static/'):
                    fname = virtual[7:]
                else:
                    fname = req.qsparams[b'static']
                static = self.ui.config(b"web", b"static", untrusted=False)
                staticfile(self.templatepath, static, fname, res)
                return res.sendresponse()

            # top-level index

            repos = dict(self.repos)