equal
deleted
inserted
replaced
540 def config(*args, **kwargs): |
540 def config(*args, **kwargs): |
541 kwargs.setdefault('untrusted', True) |
541 kwargs.setdefault('untrusted', True) |
542 return self.ui.config(*args, **kwargs) |
542 return self.ui.config(*args, **kwargs) |
543 |
543 |
544 vars = {} |
544 vars = {} |
545 styles, (style, mapfile) = hgweb_mod.getstyle( |
545 styles, (style, mapfile, fp) = hgweb_mod.getstyle( |
546 req, config, self.templatepath |
546 req, config, self.templatepath |
547 ) |
547 ) |
548 if style == styles[0]: |
548 if style == styles[0]: |
549 vars[b'style'] = style |
549 vars[b'style'] = style |
550 |
550 |
575 if self.motd is not None: |
575 if self.motd is not None: |
576 yield self.motd |
576 yield self.motd |
577 else: |
577 else: |
578 yield config(b'web', b'motd') |
578 yield config(b'web', b'motd') |
579 |
579 |
580 tmpl = templater.templater.frommapfile(mapfile, defaults=defaults) |
580 return templater.templater.frommapfile( |
581 return tmpl |
581 mapfile, fp=fp, defaults=defaults |
|
582 ) |