mercurial/hgweb/hgweb_mod.py
changeset 27007 c8cbef073645
parent 26846 7c1b4840c2cd
child 27008 7f19f331ef59
--- a/mercurial/hgweb/hgweb_mod.py	Tue Nov 17 14:23:26 2015 -0800
+++ b/mercurial/hgweb/hgweb_mod.py	Sun Nov 01 13:58:32 2015 +0900
@@ -8,7 +8,8 @@
 
 import contextlib
 import os
-from mercurial import ui, hg, hook, error, encoding, templater, util, repoview
+from mercurial import hg, hook, error, encoding, templater, util, repoview
+from mercurial import ui as uimod
 from mercurial.templatefilters import websub
 from common import ErrorResponse, permhooks, caching
 from common import HTTP_OK, HTTP_NOT_MODIFIED, HTTP_BAD_REQUEST
@@ -195,7 +196,7 @@
             if baseui:
                 u = baseui.copy()
             else:
-                u = ui.ui()
+                u = uimod.ui()
             r = hg.repository(u, repo)
         else:
             # we trust caller to give us a private copy