10 from i18n import _ |
10 from i18n import _ |
11 import os, re, difflib, time, tempfile, errno |
11 import os, re, difflib, time, tempfile, errno |
12 import hg, scmutil, util, revlog, copies, error, bookmarks |
12 import hg, scmutil, util, revlog, copies, error, bookmarks |
13 import patch, help, encoding, templatekw, discovery |
13 import patch, help, encoding, templatekw, discovery |
14 import archival, changegroup, cmdutil, hbisect |
14 import archival, changegroup, cmdutil, hbisect |
15 import sshserver, hgweb, hgweb.server, commandserver |
15 import sshserver, hgweb, commandserver |
|
16 from hgweb import server as hgweb_server |
16 import merge as mergemod |
17 import merge as mergemod |
17 import minirst, revset, fileset |
18 import minirst, revset, fileset |
18 import dagparser, context, simplemerge, graphmod |
19 import dagparser, context, simplemerge, graphmod |
19 import random, setdiscovery, treediscovery, dagutil, pvec, localrepo |
20 import random, setdiscovery, treediscovery, dagutil, pvec, localrepo |
20 import phases, obsolete |
21 import phases, obsolete |
5181 app = hgweb.hgweb(o, baseui=baseui) |
5182 app = hgweb.hgweb(o, baseui=baseui) |
5182 |
5183 |
5183 class service(object): |
5184 class service(object): |
5184 def init(self): |
5185 def init(self): |
5185 util.setsignalhandler() |
5186 util.setsignalhandler() |
5186 self.httpd = hgweb.server.create_server(ui, app) |
5187 self.httpd = hgweb_server.create_server(ui, app) |
5187 |
5188 |
5188 if opts['port'] and not ui.verbose: |
5189 if opts['port'] and not ui.verbose: |
5189 return |
5190 return |
5190 |
5191 |
5191 if self.httpd.prefix: |
5192 if self.httpd.prefix: |