facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

hgweb: move archive related attributes to requestcontext

Browse Source 
As part of this, "archive_specs" was renamed to "archivespecs" to align
with naming conventions.

"archive_specs" didn't technically need to be moved from hgweb. But it
seemed to make sense to have all the archive code in the same class.

As part of this, hgweb.configlist is no longer used, so it was deleted.
This commit is contained in:
Gregory Szorc 2015-08-22 15:12:52 -07:00
parent 820065a592
commit 34c68673a7
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mercurial/hgweb/hgweb_mod.py
View File

@ -72,6 +72,8 @@ class requestcontext(object):
object.__setattr__(self, 'app', app)
object.__setattr__(self, 'repo', app.repo)
object.__setattr__(self, 'archives', ('zip', 'gz', 'bz2'))
object.__setattr__(self, 'maxchanges',
self.configint('web', 'maxchanges', 10))
object.__setattr__(self, 'stripecount',
@ -109,6 +111,18 @@ class requestcontext(object):
return self.repo.ui.configlist(section, name, default,
untrusted=untrusted)
archivespecs = {
'bz2': ('application/x-bzip2', 'tbz2', '.tar.bz2', None),
'gz': ('application/x-gzip', 'tgz', '.tar.gz', None),
'zip': ('application/zip', 'zip', '.zip', None),
}
def archivelist(self, nodeid):
allowed = self.configlist('web', 'allow_archive')
for typ, spec in self.archivespecs.iteritems():
if typ in allowed or self.configbool('web', 'allow%s' % typ):
yield {'type': typ, 'extension': spec[2], 'node': nodeid}
class hgweb(object):
"""HTTP server for individual repositories.
@ -145,7 +159,6 @@ class hgweb(object):
self.repostate = ((-1, -1), (-1, -1))
self.mtime = -1
self.reponame = name
self.archives = 'zip', 'gz', 'bz2'
# a repo owner may set web.templates in .hg/hgrc to get any file
# readable by the user running the CGI script
self.templatepath = self.config('web', 'templates')
@ -161,10 +174,6 @@ class hgweb(object):
return self.repo.ui.configbool(section, name, default,
untrusted=untrusted)
def configlist(self, section, name, default=None, untrusted=True):
return self.repo.ui.configlist(section, name, default,
untrusted=untrusted)
def _getview(self, repo):
"""The 'web.view' config controls changeset filter to hgweb. Possible
values are ``served``, ``visible`` and ``all``. Default is ``served``.
@ -311,7 +320,7 @@ class hgweb(object):
if cmd == 'archive':
fn = req.form['node'][0]
for type_, spec in self.archive_specs.iteritems():
for type_, spec in rctx.archivespecs.iteritems():
ext = spec[2]
if fn.endswith(ext):
req.form['node'] = [fn[:-len(ext)]]
@ -472,18 +481,6 @@ class hgweb(object):
})
return tmpl
def archivelist(self, nodeid):
allowed = self.configlist("web", "allow_archive")
for i, spec in self.archive_specs.iteritems():
if i in allowed or self.configbool("web", "allow" + i):
yield {"type" : i, "extension" : spec[2], "node" : nodeid}
archive_specs = {
'bz2': ('application/x-bzip2', 'tbz2', '.tar.bz2', None),
'gz': ('application/x-gzip', 'tgz', '.tar.gz', None),
'zip': ('application/zip', 'zip', '.zip', None),
}
def check_perm(self, rctx, req, op):
for permhook in permhooks:
permhook(rctx, req, op)

2
mercurial/hgweb/webcommands.py
View File

@ -1078,7 +1078,7 @@ def archive(web, req, tmpl):
raise ErrorResponse(HTTP_NOT_FOUND,
'file(s) not found: %s' % file[0])
mimetype, artype, extension, encoding = web.archive_specs[type_]
mimetype, artype, extension, encoding = web.archivespecs[type_]
headers = [
('Content-Disposition', 'attachment; filename=%s%s' % (name, extension))
]