# HG changeset patch
# User Eric Hopper <hopper@omnifarious.org>
# Date 1147978113 25200
# Node ID b832b6eb65ab62bf95de0a2686adb502c242f5dc
# Parent  5b3a3e35f0849cc4d862c3f96c085538689bed6f
Moving hgweb.py into it's own module in preparation for breaking it up.

diff --git a/mercurial/hgweb.py b/mercurial/hgweb/__init__.py
rename from mercurial/hgweb.py
rename to mercurial/hgweb/__init__.py
--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb/__init__.py
@@ -8,12 +8,12 @@
 
 import os, cgi, sys
 import mimetypes
-from demandload import demandload
-demandload(globals(), "mdiff time re socket zlib errno ui hg ConfigParser")
-demandload(globals(), "tempfile StringIO BaseHTTPServer util SocketServer")
-demandload(globals(), "archival mimetypes templater urllib")
-from node import *
-from i18n import gettext as _
+from mercurial.demandload import demandload
+demandload(globals(), "time re socket zlib errno ConfigParser tempfile")
+demandload(globals(), "StringIO BaseHTTPServer SocketServer urllib")
+demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,templater")
+from mercurial.node import *
+from mercurial.i18n import gettext as _
 
 def splitURI(uri):
     """ Return path and query splited from uri
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -57,6 +57,8 @@ try:
             self.includes += mercurial.packagescan.getmodules(self.build_lib,
                                                               'mercurial')
             self.includes += mercurial.packagescan.getmodules(self.build_lib,
+                                                              'mercurial/hgweb')
+            self.includes += mercurial.packagescan.getmodules(self.build_lib,
                                                               'hgext')
             build_exe.finalize_options(self)
 except ImportError:
@@ -85,7 +87,7 @@ setup(name='mercurial',
         url='http://selenic.com/mercurial',
         description='Scalable distributed SCM',
         license='GNU GPL',
-        packages=['mercurial', 'hgext'],
+        packages=['mercurial', 'mercurial.hgweb', 'hgext'],
         ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
                     Extension('mercurial.bdiff', ['mercurial/bdiff.c'])],
         data_files=[('mercurial/templates',