comparison mercurial/hgweb/hgwebdir_mod.py @ 8215:227707c90548

hgweb: some cleanups in hgwebdir, remove double defaults

Removed obsolete command, expose useful cleannames function.

8214:a2af1d92b913

from common import ErrorResponse, get_mtime, staticfile, paritygen,\
                   get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
from hgweb_mod import hgweb
from request import wsgirequest

# This is a stopgap
class hgwebdir(object):
    def __init__(self, conf, baseui=None):
        def cleannames(items):
            return [(util.pconvert(name).strip('/'), path)
                    for name, path in items]

        if baseui:
           self.ui = baseui.copy()
        else:
            self.ui = ui.ui()
            self.ui.setconfig('ui', 'report_untrusted', 'off')
            self.ui.setconfig('ui', 'interactive', 'off')

        self.motd = None
        self.style = 'paper'
        self.stripecount = None
        self.repos_sorted = ('name', False)
        self._baseurl = None
        if isinstance(conf, (list, tuple)):
            self.repos = cleannames(conf)
            self.repos_sorted = ('', False)
        elif isinstance(conf, dict):
            self.repos = sorted(cleannames(conf.items()))

                cp = config.config()
                cp.read(conf)
            self.repos = []
            self.motd = cp.get('web', 'motd')
            self.style = cp.get('web', 'style', 'paper')
            self.stripecount = cp.get('web', 'stripes')
            self._baseurl = cp.get('web', 'baseurl')
            if 'paths' in cp:
                paths = cleannames(cp.items('paths'))
                for prefix, root in paths:
                    roothead, roottail = os.path.split(root)

        staticurl = config('web', 'staticurl') or url + 'static/'
        if not staticurl.endswith('/'):
            staticurl += '/'

        style = self.style
        if style is None:
            style = config('web', 'style', '')
        if 'style' in req.form:
            style = req.form['style'][0]
        self.stripecount = int(self.stripecount or config('web', 'stripes', 1))
        mapfile = templater.stylemap(style)
        tmpl = templater.templater(mapfile, templatefilters.filters,
                                   defaults={"header": header,
                                             "footer": footer,
                                             "motd": motd,

8215:227707c90548

from common import ErrorResponse, get_mtime, staticfile, paritygen,\
                   get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
from hgweb_mod import hgweb
from request import wsgirequest

def cleannames(items):
    return [(util.pconvert(name).strip('/'), path) for name, path in items]

class hgwebdir(object):

    def __init__(self, conf, baseui=None):

        if baseui:
            self.ui = baseui.copy()
        else:
            self.ui = ui.ui()
            self.ui.setconfig('ui', 'report_untrusted', 'off')
            self.ui.setconfig('ui', 'interactive', 'off')

        self.motd = None
        self.style = 'paper'
        self.stripecount = 1
        self.repos_sorted = ('name', False)
        self._baseurl = None

        if isinstance(conf, (list, tuple)):
            self.repos = cleannames(conf)
            self.repos_sorted = ('', False)
        elif isinstance(conf, dict):
            self.repos = sorted(cleannames(conf.items()))

                cp = config.config()
                cp.read(conf)
            self.repos = []
            self.motd = cp.get('web', 'motd')
            self.style = cp.get('web', 'style', 'paper')
            self.stripecount = cp.get('web', 'stripes', 1)
            self._baseurl = cp.get('web', 'baseurl')
            if 'paths' in cp:
                paths = cleannames(cp.items('paths'))
                for prefix, root in paths:
                    roothead, roottail = os.path.split(root)

        staticurl = config('web', 'staticurl') or url + 'static/'
        if not staticurl.endswith('/'):
            staticurl += '/'

        style = 'style' in req.form and req.form['style'][0] or self.style
        mapfile = templater.stylemap(style)
        tmpl = templater.templater(mapfile, templatefilters.filters,
                                   defaults={"header": header,
                                             "footer": footer,
                                             "motd": motd,