Show More
@@ -6,11 +6,11 b'' | |||||
6 | # This software may be used and distributed according to the terms |
|
6 | # This software may be used and distributed according to the terms | |
7 | # of the GNU General Public License, incorporated herein by reference. |
|
7 | # of the GNU General Public License, incorporated herein by reference. | |
8 |
|
8 | |||
9 | import os, cgi, time, re, socket, sys, zlib, errno |
|
9 | import os, cgi, sys | |
10 | import mdiff |
|
10 | from demandload import demandload | |
11 | from hg import * |
|
11 | demandload(globals(), "mdiff time re socket zlib errno ui hg") | |
12 | from ui import * |
|
12 | demandload(globals(), "zipfile tempfile StringIO tarfile BaseHTTPServer") | |
13 |
|
13 | from node import * | ||
14 |
|
14 | |||
15 | def templatepath(): |
|
15 | def templatepath(): | |
16 | for f in "templates", "../templates": |
|
16 | for f in "templates", "../templates": | |
@@ -171,7 +171,7 b' common_filters = {' | |||||
171 | class hgweb: |
|
171 | class hgweb: | |
172 | def __init__(self, repo, name=None): |
|
172 | def __init__(self, repo, name=None): | |
173 | if type(repo) == type(""): |
|
173 | if type(repo) == type(""): | |
174 | self.repo = repository(ui(), repo) |
|
174 | self.repo = hg.repository(ui.ui(), repo) | |
175 | else: |
|
175 | else: | |
176 | self.repo = repo |
|
176 | self.repo = repo | |
177 |
|
177 | |||
@@ -183,7 +183,7 b' class hgweb:' | |||||
183 | s = os.stat(os.path.join(self.repo.root, ".hg", "00changelog.i")) |
|
183 | s = os.stat(os.path.join(self.repo.root, ".hg", "00changelog.i")) | |
184 | if s.st_mtime != self.mtime: |
|
184 | if s.st_mtime != self.mtime: | |
185 | self.mtime = s.st_mtime |
|
185 | self.mtime = s.st_mtime | |
186 | self.repo = repository(self.repo.ui, self.repo.root) |
|
186 | self.repo = hg.repository(self.repo.ui, self.repo.root) | |
187 | self.maxchanges = self.repo.ui.config("web", "maxchanges", 10) |
|
187 | self.maxchanges = self.repo.ui.config("web", "maxchanges", 10) | |
188 | self.maxfiles = self.repo.ui.config("web", "maxchanges", 10) |
|
188 | self.maxfiles = self.repo.ui.config("web", "maxchanges", 10) | |
189 | self.allowpull = self.repo.ui.configbool("web", "allowpull", True) |
|
189 | self.allowpull = self.repo.ui.configbool("web", "allowpull", True) | |
@@ -660,8 +660,6 b' class hgweb:' | |||||
660 | files.sort() |
|
660 | files.sort() | |
661 |
|
661 | |||
662 | if type == 'zip': |
|
662 | if type == 'zip': | |
663 | import zipfile, tempfile |
|
|||
664 |
|
||||
665 | tmp = tempfile.mkstemp()[1] |
|
663 | tmp = tempfile.mkstemp()[1] | |
666 | try: |
|
664 | try: | |
667 | zf = zipfile.ZipFile(tmp, "w", zipfile.ZIP_DEFLATED) |
|
665 | zf = zipfile.ZipFile(tmp, "w", zipfile.ZIP_DEFLATED) | |
@@ -679,10 +677,6 b' class hgweb:' | |||||
679 | os.unlink(tmp) |
|
677 | os.unlink(tmp) | |
680 |
|
678 | |||
681 | else: |
|
679 | else: | |
682 | import StringIO |
|
|||
683 | import time |
|
|||
684 | import tarfile |
|
|||
685 |
|
||||
686 | tf = tarfile.TarFile.open(mode='w|' + type, fileobj=req.out) |
|
680 | tf = tarfile.TarFile.open(mode='w|' + type, fileobj=req.out) | |
687 | mff = self.repo.manifest.readflags(mnode) |
|
681 | mff = self.repo.manifest.readflags(mnode) | |
688 | mtime = int(time.time()) |
|
682 | mtime = int(time.time()) | |
@@ -849,8 +843,6 b' def create_server(repo):' | |||||
849 | accesslog = openlog(repo.ui.config("web", "accesslog", "-"), sys.stdout) |
|
843 | accesslog = openlog(repo.ui.config("web", "accesslog", "-"), sys.stdout) | |
850 | errorlog = openlog(repo.ui.config("web", "errorlog", "-"), sys.stderr) |
|
844 | errorlog = openlog(repo.ui.config("web", "errorlog", "-"), sys.stderr) | |
851 |
|
845 | |||
852 | import BaseHTTPServer |
|
|||
853 |
|
||||
854 | class IPv6HTTPServer(BaseHTTPServer.HTTPServer): |
|
846 | class IPv6HTTPServer(BaseHTTPServer.HTTPServer): | |
855 | address_family = getattr(socket, 'AF_INET6', None) |
|
847 | address_family = getattr(socket, 'AF_INET6', None) | |
856 |
|
848 | |||
@@ -962,7 +954,7 b' class hgwebdir:' | |||||
962 | def entries(**map): |
|
954 | def entries(**map): | |
963 | parity = 0 |
|
955 | parity = 0 | |
964 | for name, path in self.repos: |
|
956 | for name, path in self.repos: | |
965 | u = ui() |
|
957 | u = ui.ui() | |
966 | try: |
|
958 | try: | |
967 | u.readconfig(file(os.path.join(path, '.hg', 'hgrc'))) |
|
959 | u.readconfig(file(os.path.join(path, '.hg', 'hgrc'))) | |
968 | except IOError: |
|
960 | except IOError: |
General Comments 0
You need to be logged in to leave comments.
Login now