Patchwork [3,of,5,V2] hgweb: load globally-enabled extensions explicitly

login
register
mail settings
Submitter Yuya Nishihara
Date Nov. 21, 2018, 2:03 p.m.
Message ID <39c91c2915f345203910.1542808988@mimosa>
Download mbox | patch
Permalink /patch/36690/
State Accepted
Headers show

Comments

Yuya Nishihara - Nov. 21, 2018, 2:03 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1542449505 -32400
#      Sat Nov 17 19:11:45 2018 +0900
# Node ID 39c91c2915f3452039109d182c91c8082aabc81a
# Parent  84a17834f4aa3bafba00b1b448d1a90dadd6d9e7
hgweb: load globally-enabled extensions explicitly

Before, extensions were loaded as a side effect of hg.repository() if the
hgweb was executed as a CGI/WSGI. I want to make it explicit so that another
ui hook can be inserted after extensions.loadall().

Patch

diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -22,6 +22,7 @@  from .common import (
 from .. import (
     encoding,
     error,
+    extensions,
     formatter,
     hg,
     hook,
@@ -212,6 +213,7 @@  class hgweb(object):
                 u = baseui.copy()
             else:
                 u = uimod.ui.load()
+                extensions.loadall(u)
             r = hg.repository(u, repo)
         else:
             # we trust caller to give us a private copy
diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py
+++ b/mercurial/hgweb/hgwebdir_mod.py
@@ -30,6 +30,7 @@  from .. import (
     configitems,
     encoding,
     error,
+    extensions,
     hg,
     profiling,
     pycompat,
@@ -268,6 +269,9 @@  class hgwebdir(object):
         self.lastrefresh = 0
         self.motd = None
         self.refresh()
+        if not baseui:
+            # set up environment for new ui
+            extensions.loadall(self.ui)
 
     def refresh(self):
         if self.ui: