Show More
@@ -8,7 +8,8 b'' | |||
|
8 | 8 | |
|
9 | 9 | import contextlib |
|
10 | 10 | import os |
|
11 |
from mercurial import |
|
|
11 | from mercurial import hg, hook, error, encoding, templater, util, repoview | |
|
12 | from mercurial import ui as uimod | |
|
12 | 13 | from mercurial.templatefilters import websub |
|
13 | 14 | from common import ErrorResponse, permhooks, caching |
|
14 | 15 | from common import HTTP_OK, HTTP_NOT_MODIFIED, HTTP_BAD_REQUEST |
@@ -195,7 +196,7 b' class hgweb(object):' | |||
|
195 | 196 | if baseui: |
|
196 | 197 | u = baseui.copy() |
|
197 | 198 | else: |
|
198 | u = ui.ui() | |
|
199 | u = uimod.ui() | |
|
199 | 200 | r = hg.repository(u, repo) |
|
200 | 201 | else: |
|
201 | 202 | # we trust caller to give us a private copy |
@@ -8,7 +8,8 b'' | |||
|
8 | 8 | |
|
9 | 9 | import os, re, time |
|
10 | 10 | from mercurial.i18n import _ |
|
11 |
from mercurial import |
|
|
11 | from mercurial import hg, scmutil, util, templater | |
|
12 | from mercurial import ui as uimod | |
|
12 | 13 | from mercurial import error, encoding |
|
13 | 14 | from common import ErrorResponse, get_mtime, staticfile, paritygen, ismember, \ |
|
14 | 15 | get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR |
@@ -108,7 +109,7 b' class hgwebdir(object):' | |||
|
108 | 109 | if self.baseui: |
|
109 | 110 | u = self.baseui.copy() |
|
110 | 111 | else: |
|
111 | u = ui.ui() | |
|
112 | u = uimod.ui() | |
|
112 | 113 | u.setconfig('ui', 'report_untrusted', 'off', 'hgwebdir') |
|
113 | 114 | u.setconfig('ui', 'nontty', 'true', 'hgwebdir') |
|
114 | 115 | # displaying bundling progress bar while serving feels wrong and may |
@@ -8,7 +8,8 b'' | |||
|
8 | 8 | |
|
9 | 9 | import os, copy |
|
10 | 10 | import re |
|
11 |
from mercurial import match, patch, error, |
|
|
11 | from mercurial import match, patch, error, util, pathutil, context | |
|
12 | from mercurial import ui as uimod | |
|
12 | 13 | from mercurial.i18n import _ |
|
13 | 14 | from mercurial.node import hex, nullid, short |
|
14 | 15 | from mercurial.templatefilters import revescape |
@@ -537,7 +538,7 b' class sessionvars(object):' | |||
|
537 | 538 | yield {'name': key, 'value': str(value), 'separator': separator} |
|
538 | 539 | separator = '&' |
|
539 | 540 | |
|
540 | class wsgiui(ui.ui): | |
|
541 | class wsgiui(uimod.ui): | |
|
541 | 542 | # default termwidth breaks under mod_wsgi |
|
542 | 543 | def termwidth(self): |
|
543 | 544 | return 80 |
General Comments 0
You need to be logged in to leave comments.
Login now