Show More
@@ -90,8 +90,6 b' class requestcontext(object):' | |||
|
90 | 90 | self.req = req |
|
91 | 91 | self.res = res |
|
92 | 92 | |
|
93 | self.archivespecs = webutil.archivespecs | |
|
94 | ||
|
95 | 93 | self.maxchanges = self.configint('web', 'maxchanges') |
|
96 | 94 | self.stripecount = self.configint('web', 'stripes') |
|
97 | 95 | self.maxshortchanges = self.configint('web', 'maxshortchanges') |
@@ -131,7 +129,7 b' class requestcontext(object):' | |||
|
131 | 129 | |
|
132 | 130 | def archivelist(self, nodeid): |
|
133 | 131 | allowed = self.configlist('web', 'allow_archive') |
|
134 |
for typ, spec in |
|
|
132 | for typ, spec in webutil.archivespecs.iteritems(): | |
|
135 | 133 | if typ in allowed or self.configbool('web', 'allow%s' % typ): |
|
136 | 134 | yield {'type': typ, 'extension': spec[2], 'node': nodeid} |
|
137 | 135 | |
@@ -375,7 +373,7 b' class hgweb(object):' | |||
|
375 | 373 | |
|
376 | 374 | if cmd == 'archive': |
|
377 | 375 | fn = req.qsparams['node'] |
|
378 |
for type_, spec in |
|
|
376 | for type_, spec in webutil.archivespecs.iteritems(): | |
|
379 | 377 | ext = spec[2] |
|
380 | 378 | if fn.endswith(ext): |
|
381 | 379 | req.qsparams['node'] = fn[:-len(ext)] |
@@ -1164,7 +1164,7 b' def archive(web):' | |||
|
1164 | 1164 | allowed = web.configlist("web", "allow_archive") |
|
1165 | 1165 | key = web.req.qsparams['node'] |
|
1166 | 1166 | |
|
1167 | if type_ not in web.archivespecs: | |
|
1167 | if type_ not in webutil.archivespecs: | |
|
1168 | 1168 | msg = 'Unsupported archive type: %s' % type_ |
|
1169 | 1169 | raise ErrorResponse(HTTP_NOT_FOUND, msg) |
|
1170 | 1170 | |
@@ -1193,7 +1193,7 b' def archive(web):' | |||
|
1193 | 1193 | raise ErrorResponse(HTTP_NOT_FOUND, |
|
1194 | 1194 | 'file(s) not found: %s' % file) |
|
1195 | 1195 | |
|
1196 | mimetype, artype, extension, encoding = web.archivespecs[type_] | |
|
1196 | mimetype, artype, extension, encoding = webutil.archivespecs[type_] | |
|
1197 | 1197 | |
|
1198 | 1198 | web.res.headers['Content-Type'] = mimetype |
|
1199 | 1199 | web.res.headers['Content-Disposition'] = 'attachment; filename=%s%s' % ( |
General Comments 0
You need to be logged in to leave comments.
Login now