Mercurial > hg > mercurial-crew-with-dirclash
changeset 2312:4f04368423ec
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 18 May 2006 16:49:45 -0700 |
parents | d01eac5968c6 (current diff) b832b6eb65ab (diff) |
children | a600d9997521 b30aa02c85e7 |
files | mercurial/hgweb.py |
diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
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
--- 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',