##// END OF EJS Templates
changegroup: remove reordering control (BC)...
changegroup: remove reordering control (BC) This logic - including the experimental bundle.reorder option - was originally added in a8e3931e3fb5 in 2011 and then later ported to changegroup.py. The intent of this option and associated logic is to control the ordering of revisions in deltagroups in changegroups. At the time it was implemented, only changegroup version 1 existed and generaldelta revlogs were just coming into the world. Changegroup version 1 requires that deltas be made against the last revision sent over the wire. Used with generaldelta, this created an impedance mismatch of sorts and resulted in changegroup producers spending a lot of time recomputing deltas. Revision reordering was introduced so outgoing revisions would be sent in "generaldelta order" and producers would be able to reuse internal deltas from storage. Later on, we introduced changegroup version 2. It supported denoting which revision a delta was against. So we no longer needed to sort outgoing revisions to ensure optimal delta generation from the producer. So, subsequent changegroup versions disabled reordering. We also later made the changelog not store deltas by default. And we also made the changelog send out deltas in storage order. Why we do this for changelog, I'm not sure. Maybe we want to preserve revision order across clones? It doesn't really matter for this commit. Fast forward to 2018. We want to abstract storage backends. And having changegroup code require knowledge about how deltas are stored internally interferes with that goal. This commit removes reordering control from changegroup generation. After this commit, the reordering behavior is: * The changelog is always sent out in storage order (no behavior change). * Non-changelog generaldelta revlogs are reordered to always be in DAG topological order (previously, generaldelta revlogs would be emitted in storage order for version 2 and 3 changegroups). * Non-changelog non-generaldelta revlogs are sent in storage order (no behavior change). * There exists no config option to override behavior. The big difference here is that generaldelta revlogs now *always* have their revisions sorted in DAG order before going out over the wire. This behavior was previously only done for changegroup version 1. Version 2 and version 3 changegroups disabled reordering because the interchange format supported encoding arbitrary delta parents, so reordering wasn't strictly necessary. I can think of a few significant implications for this change. Because changegroup receivers will now see non-changelog revisions in DAG order instead of storage order, the internal storage order of manifests and files may differ substantially between producer and consumer. I don't think this matters that much, since the storage order of manifests and files is largely hidden from users. Only the storage order of changelog matters (because `hg log` shows the changelog in storage order). I don't think there should be any controversy here. The reordering of revisions has implications for changegroup producers. Previously, generaldelta revlogs would be emitted in storage order. And in the common case, the internally-stored delta could effectively be copied from disk into the deltagroup delta. This meant that emitting delta groups for generaldelta revlogs would be mostly linear read I/O. This is desirable for performance. With us now reordering generaldelta revlog revisions in DAG order, the read operations may use more random I/O instead of sequential I/O. This could result in performance loss. But with the prevalence of SSDs and fast random I/O, I'm not too worried. (Note: the optimal emission order for revlogs is actually delta encoding order. But the changegroup code wasn't doing that before or after this change. We could potentially implement that in a later commit.) Changegroups in DAG order will have implications for receivers. Previously, receiving storage order might mean seeing a number of interleaved branches. This would mean long delta chains, sparse I/O, and possibly more fulltext revisions instead of deltas, blowing up storage storage. (This is the same set of problems that sparse revlogs aims to address.) With the producer now sending revisions in DAG order, the receiver also stores revisions in DAG order. That means revisions for the same DAG branch are all grouped together. And this should yield better storage outcomes. In other words, sending the reordered changegroup allows the receiver to have better storage order and for the producer to not propagate its (possibly sub-optimal) internal storage order. On the mozilla-unified repository, this change influences bundle generation: $ hg bundle -t none-v2 -a before: time: real 355.680 secs (user 256.790+0.000 sys 16.820+0.000) after: time: real 382.950 secs (user 281.700+0.000 sys 17.690+0.000) before: 7,150,228,967 bytes (uncompressed) after: 7,041,556,273 bytes (uncompressed) before: 1,669,063,234 bytes (zstd l=3) after: 1,628,598,830 bytes (zstd l=3) $ hg unbundle before: time: real 511.910 secs (user 466.750+0.000 sys 32.680+0.000) after: time: real 487.790 secs (user 443.940+0.000 sys 30.840+0.000) 00manifest.d size: source: 274,924,292 bytes before: 304,741,626 bytes after: 245,252,087 bytes .hg/store total file size: source: 2,649,133,490 before: 2,680,888,130 after: 2,627,875,673 We see the bundle size drop. That's probably because if a revlog internally isn't storing a delta, it will choose to delta against the last emitted revision. And on repos with interleaved branches (like mozilla-unified), the previous revision could be an unrelated branch and therefore be a large delta. But with this patch, the previous revision is likely p1 or p2 and a delta should be small. We also see the manifest size drop by ~50 MB. It's worth noting that the manifest actually *increased* in size by ~25 MB in the old strategy and decreased ~25 MB from its source in the new strategy. Again, my explanation for this is that the DAG ordering in the changegroup is resulting in better grouping of revisions in the receiver, which results in more compact delta chains and higher storage efficiency. Unbundle time also dropped. I suspect this is due to the revlog having to work less to compute deltas since the incoming deltas are more optimal. i.e. the receiver spends less time resolving fulltext revisions as incoming deltas bounce around between DAG branches and delta chains. We also see bundle generation time increase. This is not desirable. However, the regression is only significant on the original repository: if we generate a bundle from the repository created from the new, always reordered bundles, we're close to baseline (if not at it with expected noise): $ hg bundle -t none-v2 -a before (original): time: real 355.680 secs (user 256.790+0.000 sys 16.820+0.000) after (original): time: real 382.950 secs (user 281.700+0.000 sys 17.690+0.000) after (new repo): time: real 362.280 secs (user 260.300+0.000 sys 17.700+0.000) This regression is a bit worrying because it will impact serving canonical repositories (that don't have optimal internal storage unless they are reordered - possibly as part of running `hg debugupgraderepo`). However, this regression will only be noticed by very large changegroups. And I'm guessing/hoping that any repository that large is using clonebundles to mitigate server load. Again, sending DAG order isn't the optimal send order for servers: sending in storage-delta order is. But in order to enable storage-optimal send order, we'll need a storage API that handles sorting. Future commits will introduce such an API. Differential Revision: https://phab.mercurial-scm.org/D4721

File last commit:

r39813:b63dee7b default
r39897:db5501d9 default
Show More
hgweb_mod.py
475 lines | 17.6 KiB | text/x-python | PythonLexer
Eric Hopper
Fixing up comment headers for split up code.
r2391 # hgweb/hgweb_mod.py - Web interface for a repository.
Eric Hopper
Final stage of the hgweb split up....
r2356 #
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
Eric Hopper
Final stage of the hgweb split up....
r2356 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Eric Hopper
Final stage of the hgweb split up....
r2356
Yuya Nishihara
hgweb: use absolute_import
r27046 from __future__ import absolute_import
Gregory Szorc
hgweb: use separate repo instances per thread...
r26220 import contextlib
Gregory Szorc
hgweb: extract web substitutions table generation to own function...
r26162 import os
Yuya Nishihara
hgweb: use absolute_import
r27046
from .common import (
ErrorResponse,
HTTP_BAD_REQUEST,
Gregory Szorc
hgweb: support Content Security Policy...
r30766 cspvalues,
Yuya Nishihara
hgweb: use absolute_import
r27046 permhooks,
Gregory Szorc
hgweb: send errors using new response API...
r36895 statusmessage,
Yuya Nishihara
hgweb: use absolute_import
r27046 )
from .. import (
encoding,
error,
Yuya Nishihara
hgweb: make templater mostly compatible with log templates...
r36535 formatter,
Yuya Nishihara
hgweb: use absolute_import
r27046 hg,
hook,
Gregory Szorc
hgweb: profile HTTP requests...
r29787 profiling,
Augie Fackler
hgweb: extract function for loading style from request context...
r34516 pycompat,
Yuya Nishihara
hgweb: use registrar to declare "websub" template filter...
r37238 registrar,
Yuya Nishihara
hgweb: use absolute_import
r27046 repoview,
templatefilters,
templater,
Yuya Nishihara
hgweb: wrap {pathdef} with mappinglist...
r37527 templateutil,
Yuya Nishihara
hgweb: use absolute_import
r27046 ui as uimod,
util,
Gregory Szorc
wireprotoserver: rename hgweb.protocol to wireprotoserver (API)...
r35874 wireprotoserver,
Yuya Nishihara
hgweb: use absolute_import
r27046 )
from . import (
Gregory Szorc
hgweb: rename req to wsgireq...
r36822 request as requestmod,
Yuya Nishihara
hgweb: use absolute_import
r27046 webcommands,
webutil,
wsgicgi,
)
Eric Hopper
Final stage of the hgweb split up....
r2356
Augie Fackler
hgweb: extract function for loading style from request context...
r34516 def getstyle(req, configfn, templatepath):
styles = (
Gregory Szorc
hgweb: use our new request object for "style" parameter...
r36879 req.qsparams.get('style', None),
Augie Fackler
hgweb: extract function for loading style from request context...
r34516 configfn('web', 'style'),
'paper',
)
return styles, templater.stylemap(styles, templatepath)
Angel Ezquerra
hgwebdir: use web.prefix when creating url breadcrumbs (issue3790)...
r18515 def makebreadcrumb(url, prefix=''):
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 '''Return a 'URL breadcrumb' list
A 'URL breadcrumb' is a list of URL-name pairs,
corresponding to each of the path items on a URL.
This can be used to create path navigation entries.
'''
if url.endswith('/'):
url = url[:-1]
Angel Ezquerra
hgwebdir: use web.prefix when creating url breadcrumbs (issue3790)...
r18515 if prefix:
url = '/' + prefix + url
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 relpath = url
if relpath.startswith('/'):
relpath = relpath[1:]
breadcrumb = []
urlel = url
pathitems = [''] + relpath.split('/')
for pathel in reversed(pathitems):
if not pathel or not urlel:
break
breadcrumb.append({'url': urlel, 'name': pathel})
urlel = os.path.dirname(urlel)
Yuya Nishihara
hgweb: wrap {pathdef} with mappinglist...
r37527 return templateutil.mappinglist(reversed(breadcrumb))
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258
Gregory Szorc
hgweb: establish class for holding per request context...
r26134 class requestcontext(object):
"""Holds state/context for an individual request.
Servers can be multi-threaded. Holding state on the WSGI application
is prone to race conditions. Instances of this class exist to hold
mutable and race-free state for requests.
"""
Gregory Szorc
hgweb: support using new response object for web commands...
r36886 def __init__(self, app, repo, req, res):
Gregory Szorc
hg: establish a cache for localrepository instances...
r26219 self.repo = repo
Gregory Szorc
hgweb: remove proxy to hgweb instance...
r26217 self.reponame = app.reponame
Gregory Szorc
hgweb: support using new response object for web commands...
r36886 self.req = req
self.res = res
Gregory Szorc
hgweb: establish class for holding per request context...
r26134
Boris Feld
configitems: register the 'web.maxchanges' config
r34591 self.maxchanges = self.configint('web', 'maxchanges')
Boris Feld
configitems: register the 'web.stripes' config
r34242 self.stripecount = self.configint('web', 'stripes')
Boris Feld
configitems: register the 'web.maxshortchanges' config
r34589 self.maxshortchanges = self.configint('web', 'maxshortchanges')
Boris Feld
configitems: register the 'web.maxfiles' config
r34590 self.maxfiles = self.configint('web', 'maxfiles')
David Demelier
config: rename allowpull to allow-pull...
r35028 self.allowpull = self.configbool('web', 'allow-pull')
Gregory Szorc
hgweb: move some config options to requestcontext...
r26135
Gregory Szorc
hgweb: move templatepath to requestcontext...
r26163 # we use untrusted=False to prevent a repo owner from using
# web.templates in .hg/hgrc to get access to any file readable
# by the user running the CGI script
Gregory Szorc
hgweb: remove proxy to hgweb instance...
r26217 self.templatepath = self.config('web', 'templates', untrusted=False)
Gregory Szorc
hgweb: move templatepath to requestcontext...
r26163
Gregory Szorc
hgweb: create websubtable on requestcontext
r26164 # This object is more expensive to build than simple config values.
# It is shared across requests. The app will replace the object
# if it is updated. Since this is a reference and nothing should
# modify the underlying object, it should be constant for the lifetime
# of the request.
Gregory Szorc
hgweb: remove proxy to hgweb instance...
r26217 self.websubtable = app.websubtable
Gregory Szorc
hgweb: create websubtable on requestcontext
r26164
Gregory Szorc
hgweb: support Content Security Policy...
r30766 self.csp, self.nonce = cspvalues(self.repo.ui)
Gregory Szorc
hgweb: move some config options to requestcontext...
r26135 # Trust the settings from the .hg/hgrc files by default.
David Demelier
hgweb: use ui._unset to prevent a warning in configitems
r33328 def config(self, section, name, default=uimod._unset, untrusted=True):
Gregory Szorc
hgweb: move some config options to requestcontext...
r26135 return self.repo.ui.config(section, name, default,
untrusted=untrusted)
David Demelier
hgweb: use ui._unset to prevent a warning in configitems
r33328 def configbool(self, section, name, default=uimod._unset, untrusted=True):
Gregory Szorc
hgweb: move some config options to requestcontext...
r26135 return self.repo.ui.configbool(section, name, default,
untrusted=untrusted)
David Demelier
hgweb: use ui._unset to prevent a warning in configitems
r33328 def configint(self, section, name, default=uimod._unset, untrusted=True):
Gregory Szorc
hgweb: move some config options to requestcontext...
r26135 return self.repo.ui.configint(section, name, default,
untrusted=untrusted)
David Demelier
hgweb: use ui._unset to prevent a warning in configitems
r33328 def configlist(self, section, name, default=uimod._unset, untrusted=True):
Gregory Szorc
hgweb: move some config options to requestcontext...
r26135 return self.repo.ui.configlist(section, name, default,
untrusted=untrusted)
Gregory Szorc
hgweb: move archive related attributes to requestcontext...
r26136 def archivelist(self, nodeid):
Yuya Nishihara
hgweb: forward archivelist() of hgweb to webutil...
r37532 return webutil.archivelist(self.repo.ui, nodeid)
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258
Gregory Szorc
hgweb: expose repo name on parsedrequest...
r36884 def templater(self, req):
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183 # determine scheme, port and server name
# this is needed to create absolute urls
Boris Feld
configitems: register the 'web.logourl' config
r34613 logourl = self.config('web', 'logourl')
Boris Feld
configitems: register the 'web.logoimg' config
r34612 logoimg = self.config('web', 'logoimg')
Gregory Szorc
hgweb: ensure all wsgi environment values are str...
r36820 staticurl = (self.config('web', 'staticurl')
Cédric Krier
hgweb: strip trailing '/' in apppath before appending '/static/' (issue5943)...
r38768 or req.apppath.rstrip('/') + '/static/')
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183 if not staticurl.endswith('/'):
staticurl += '/'
# figure out which style to use
vars = {}
Gregory Szorc
hgweb: expose repo name on parsedrequest...
r36884 styles, (style, mapfile) = getstyle(req, self.config,
Augie Fackler
hgweb: extract function for loading style from request context...
r34516 self.templatepath)
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183 if style == styles[0]:
vars['style'] = style
Gregory Szorc
hgweb: always use "?" when writing session vars...
r36823 sessionvars = webutil.sessionvars(vars, '?')
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183
if not self.reponame:
Boris Feld
configitems: register the 'web.name' config
r34587 self.reponame = (self.config('web', 'name', '')
Gregory Szorc
hgweb: expose repo name on parsedrequest...
r36884 or req.reponame
or req.apppath
or self.repo.root)
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183
Yuya Nishihara
hgweb: use registrar to declare "websub" template filter...
r37238 filters = {}
templatefilter = registrar.templatefilter(filters)
Yuya Nishihara
templatefilters: declare input type as bytes where appropriate...
r37240 @templatefilter('websub', intype=bytes)
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183 def websubfilter(text):
Yuya Nishihara
hgweb: do not import templatefilters.revescape and websub as symbol...
r27008 return templatefilters.websub(text, self.websubtable)
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183
# create the templater
Yuya Nishihara
hgweb: make templater mostly compatible with log templates...
r36535 # TODO: export all keywords: defaults = templatekw.keywords.copy()
Yuya Nishihara
templater: separate function to create templater from map file (API)...
r28954 defaults = {
Gregory Szorc
hgweb: use the parsed application path directly...
r36826 'url': req.apppath + '/',
Yuya Nishihara
templater: separate function to create templater from map file (API)...
r28954 'logourl': logourl,
'logoimg': logoimg,
'staticurl': staticurl,
Gregory Szorc
hgweb: use computed base URL from parsed request...
r36825 'urlbase': req.advertisedbaseurl,
Yuya Nishihara
templater: separate function to create templater from map file (API)...
r28954 'repo': self.reponame,
'encoding': encoding.encoding,
'sessionvars': sessionvars,
Gregory Szorc
hgweb: use the parsed application path directly...
r36826 'pathdef': makebreadcrumb(req.apppath),
Yuya Nishihara
templater: separate function to create templater from map file (API)...
r28954 'style': style,
Gregory Szorc
hgweb: support Content Security Policy...
r30766 'nonce': self.nonce,
Yuya Nishihara
templater: separate function to create templater from map file (API)...
r28954 }
Yuya Nishihara
hgweb: use registrar to add "motd" template keyword...
r38964 templatekeyword = registrar.templatekeyword(defaults)
@templatekeyword('motd', requires=())
def motd(context, mapping):
yield self.config('web', 'motd')
Yuya Nishihara
hgweb: make templater mostly compatible with log templates...
r36535 tres = formatter.templateresources(self.repo.ui, self.repo)
Yuya Nishihara
templater: separate function to create templater from map file (API)...
r28954 tmpl = templater.templater.frommapfile(mapfile,
Yuya Nishihara
hgweb: use registrar to declare "websub" template filter...
r37238 filters=filters,
Yuya Nishihara
hgweb: make templater mostly compatible with log templates...
r36535 defaults=defaults,
resources=tres)
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183 return tmpl
Gregory Szorc
hgweb: add a sendtemplate() helper function...
r36899 def sendtemplate(self, name, **kwargs):
"""Helper function to send a response generated from a template."""
Yuya Nishihara
templater: use named function to expand template against mapping dict (API)...
r37037 kwargs = pycompat.byteskwargs(kwargs)
self.res.setbodygen(self.tmpl.generate(name, kwargs))
Gregory Szorc
hgweb: add a sendtemplate() helper function...
r36899 return self.res.sendresponse()
Gregory Szorc
hgweb: move templater instantiation to requestcontext...
r26183
Eric Hopper
Final stage of the hgweb split up....
r2356 class hgweb(object):
Gregory Szorc
hgweb: add some documentation...
r26132 """HTTP server for individual repositories.
Instances of this class serve HTTP responses for a particular
repository.
Instances are typically used as WSGI applications.
Some servers are multi-threaded. On these servers, there may
be multiple active threads inside __call__.
"""
Matt Mackall
hgweb: add baseui to hgweb entrypoint
r10994 def __init__(self, repo, name=None, baseui=None):
Augie Fackler
hgweb_mod: inform hgweb class about paths actually being bytes...
r37764 if isinstance(repo, bytes):
Matt Mackall
hgweb: add baseui to hgweb entrypoint
r10994 if baseui:
u = baseui.copy()
else:
Yuya Nishihara
ui: factor out ui.load() to create a ui without loading configs (API)...
r30559 u = uimod.ui.load()
Matt Mackall
hgweb: avoid initialization race (issue3953)
r20168 r = hg.repository(u, repo)
Eric Hopper
Final stage of the hgweb split up....
r2356 else:
Matt Mackall
hgweb: avoid config object race with hgwebdir (issue4326)...
r22087 # we trust caller to give us a private copy
Matt Mackall
hgweb: avoid initialization race (issue3953)
r20168 r = repo
Eric Hopper
Final stage of the hgweb split up....
r2356
Mads Kiilerich
config: set a 'source' in most cases where config don't come from file but code...
r20790 r.ui.setconfig('ui', 'report_untrusted', 'off', 'hgweb')
r.baseui.setconfig('ui', 'report_untrusted', 'off', 'hgweb')
r.ui.setconfig('ui', 'nontty', 'true', 'hgweb')
r.baseui.setconfig('ui', 'nontty', 'true', 'hgweb')
Yuya Nishihara
hgweb: overwrite cwd to resolve file patterns relative to repo (issue4568)...
r26294 # resolve file patterns relative to repo root
r.ui.setconfig('ui', 'forcecwd', r.root, 'hgweb')
r.baseui.setconfig('ui', 'forcecwd', r.root, 'hgweb')
Yuya Nishihara
hgweb: do not try to replace signal handlers while locking...
r38158 # it's unlikely that we can replace signal handlers in WSGI server,
# and mod_wsgi issues a big warning. a plain hgweb process (with no
# threading) could replace signal handlers, but we don't bother
# conditionally enabling it.
r.ui.setconfig('ui', 'signal-safe-lock', 'false', 'hgweb')
r.baseui.setconfig('ui', 'signal-safe-lock', 'false', 'hgweb')
Pierre-Yves David
hgewb: disable progress when serving (issue4582)...
r25488 # displaying bundling progress bar while serving feel wrong and may
# break some wsgi implementation.
r.ui.setconfig('progress', 'disable', 'true', 'hgweb')
r.baseui.setconfig('progress', 'disable', 'true', 'hgweb')
Gregory Szorc
hgweb: use separate repo instances per thread...
r26220 self._repos = [hg.cachedlocalrepo(self._webifyrepo(r))]
self._lastrepo = self._repos[0]
Matt Mackall
hook: redirect stdout to stderr for ssh and http servers
r5833 hook.redirect(True)
Eric Hopper
Final stage of the hgweb split up....
r2356 self.reponame = name
Alexis S. L. Carvalho
use untrusted settings in hgweb...
r3555
Gregory Szorc
hgweb: create function to perform actions on new repo...
r26218 def _webifyrepo(self, repo):
repo = getwebview(repo)
self.websubtable = webutil.getwebsubs(repo)
return repo
Gregory Szorc
hgweb: use separate repo instances per thread...
r26220 @contextlib.contextmanager
def _obtainrepo(self):
"""Obtain a repo unique to the caller.
Internally we maintain a stack of cachedlocalrepo instances
to be handed out. If one is available, we pop it and return it,
ensuring it is up to date in the process. If one is not available,
we clone the most recently used repo instance and return it.
Gregory Szorc
hg: establish a cache for localrepository instances...
r26219
Gregory Szorc
hgweb: use separate repo instances per thread...
r26220 It is currently possible for the stack to grow without bounds
if the server allows infinite threads. However, servers should
have a thread limit, thus establishing our limit.
"""
if self._repos:
cached = self._repos.pop()
r, created = cached.fetch()
else:
cached = self._lastrepo.copy()
r, created = cached.fetch()
Gregory Szorc
hg: always create new localrepository instance...
r26240 if created:
r = self._webifyrepo(r)
Gregory Szorc
hgweb: use separate repo instances per thread...
r26220
self._lastrepo = cached
self.mtime = cached.mtime
try:
yield r
finally:
self._repos.append(cached)
Eric Hopper
Final stage of the hgweb split up....
r2356
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591 def run(self):
Gregory Szorc
hgweb: add some documentation...
r26132 """Start a server from CGI environment.
Modern servers should be using WSGI and should avoid this
method, if possible.
"""
Pulkit Goyal
py3: replace os.environ with encoding.environ (part 3 of 5)
r30636 if not encoding.environ.get('GATEWAY_INTERFACE',
'').startswith("CGI/1."):
Martin Geisler
wrap string literals in error messages
r8663 raise RuntimeError("This function is only intended to be "
"called while running as a CGI script.")
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591 wsgicgi.launch(self)
def __call__(self, env, respond):
Gregory Szorc
hgweb: add some documentation...
r26132 """Run the WSGI application.
This may be called by multiple threads.
"""
Gregory Szorc
hgweb: remove wsgirequest (API)...
r36928 req = requestmod.parserequestfromenv(env)
res = requestmod.wsgiresponse(req, respond)
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591
Gregory Szorc
hgweb: remove wsgirequest (API)...
r36928 return self.run_wsgi(req, res)
def run_wsgi(self, req, res):
Gregory Szorc
hgweb: add some documentation...
r26132 """Internal method to run the WSGI application.
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591
Gregory Szorc
hgweb: add some documentation...
r26132 This is typically only called by Mercurial. External consumers
should be using instances of this class as the WSGI application.
"""
Gregory Szorc
hgweb: use separate repo instances per thread...
r26220 with self._obtainrepo() as repo:
profile: drop maybeprofile...
r32788 profile = repo.ui.configbool('profiling', 'enabled')
with profiling.profile(repo.ui, enabled=profile):
Gregory Szorc
hgweb: remove wsgirequest (API)...
r36928 for r in self._runwsgi(req, res, repo):
Gregory Szorc
hgweb: profile HTTP requests...
r29787 yield r
Gregory Szorc
hgweb: use separate repo instances per thread...
r26220
Gregory Szorc
hgweb: remove wsgirequest (API)...
r36928 def _runwsgi(self, req, res, repo):
Gregory Szorc
hgweb: support using new response object for web commands...
r36886 rctx = requestcontext(self, repo, req, res)
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591
Gregory Szorc
hgweb: move additional state setting outside of refresh...
r26160 # This state is global across all threads.
Boris Feld
configitems: register the 'web.encoding' config
r34236 encoding.encoding = rctx.config('web', 'encoding')
Gregory Szorc
hgweb: store the raw WSGI environment dict...
r36925 rctx.repo.ui.environ = req.rawenv
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591
Gregory Szorc
hgweb: support Content Security Policy...
r30766 if rctx.csp:
# hgwebdir may have added CSP header. Since we generate our own,
# replace it.
Gregory Szorc
hgweb: create dedicated type for WSGI responses...
r36877 res.headers['Content-Security-Policy'] = rctx.csp
Gregory Szorc
hgweb: support Content Security Policy...
r30766
Gregory Szorc
wireproto: support /api/* URL space for exposing APIs...
r37064 # /api/* is reserved for various API implementations. Dispatch
Gregory Szorc
hgweb: don't responsd to api requests unless feature is enabled...
r37111 # accordingly. But URL paths can conflict with subrepos and virtual
# repos in hgwebdir. So until we have a workaround for this, only
# expose the URLs if the feature is enabled.
apienabled = rctx.repo.ui.configbool('experimental', 'web.apiserver')
if apienabled and req.dispatchparts and req.dispatchparts[0] == b'api':
Gregory Szorc
wireproto: support /api/* URL space for exposing APIs...
r37064 wireprotoserver.handlewsgiapirequest(rctx, req, res,
self.check_perm)
return res.sendresponse()
Gregory Szorc
hgweb: create dedicated type for WSGI responses...
r36877 handled = wireprotoserver.handlewsgirequest(
Gregory Szorc
hgweb: transition permissions hooks to modern request type (API)...
r36893 rctx, req, res, self.check_perm)
Gregory Szorc
wireprotoserver: move all wire protocol handling logic out of hgweb...
r36830 if handled:
Gregory Szorc
hgweb: create dedicated type for WSGI responses...
r36877 return res.sendresponse()
Gregory Szorc
wireprotoserver: move all wire protocol handling logic out of hgweb...
r36830
Gregory Szorc
hgweb: change how dispatch path is reported...
r36914 # Old implementations of hgweb supported dispatching the request via
# the initial query string parameter instead of using PATH_INFO.
# If PATH_INFO is present (signaled by ``req.dispatchpath`` having
# a value), we use it. Otherwise fall back to the query string.
if req.dispatchpath is not None:
Gregory Szorc
hgweb: use parsed request to construct query parameters...
r36829 query = req.dispatchpath
Dirkjan Ochtman
hgweb: get rid of some nested functions
r5596 else:
Gregory Szorc
hgweb: use parsed request to construct query parameters...
r36829 query = req.querystring.partition('&')[0].partition(';')[0]
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591
Dirkjan Ochtman
hgweb: get rid of some nested functions
r5596 # translate user-visible url structure to internal structure
Gregory Szorc
hgweb: use parsed request to construct query parameters...
r36829 args = query.split('/', 2)
Gregory Szorc
hgweb: perform all parameter lookup via qsparams...
r36881 if 'cmd' not in req.qsparams and args and args[0]:
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591 cmd = args.pop(0)
style = cmd.rfind('-')
if style != -1:
Gregory Szorc
hgweb: use our new request object for "style" parameter...
r36879 req.qsparams['style'] = cmd[:style]
Matt Mackall
many, many trivial check-code fixups
r10282 cmd = cmd[style + 1:]
Dirkjan Ochtman
hgweb: get rid of some nested functions
r5596
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591 # avoid accepting e.g. style parameter as command
Augie Fackler
hgweb_mod: use safehasattr instead of hasattr
r14953 if util.safehasattr(webcommands, cmd):
Gregory Szorc
hgweb: set variables in qsparams...
r36880 req.qsparams['cmd'] = cmd
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591
Brendan Cully
hgweb: handle subdirectories within static directory
r7287 if cmd == 'static':
Gregory Szorc
hgweb: set variables in qsparams...
r36880 req.qsparams['file'] = '/'.join(args)
Brendan Cully
hgweb: handle subdirectories within static directory
r7287 else:
if args and args[0]:
av6
hgweb: allow symbolic revisions with forward slashes in urls...
r25777 node = args.pop(0).replace('%2F', '/')
Gregory Szorc
hgweb: set variables in qsparams...
r36880 req.qsparams['node'] = node
Brendan Cully
hgweb: handle subdirectories within static directory
r7287 if args:
Gregory Szorc
hgweb: set variables in qsparams...
r36880 if 'file' in req.qsparams:
del req.qsparams['file']
for a in args:
req.qsparams.add('file', a)
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591
Gregory Szorc
hgweb: parse and store HTTP request headers...
r36832 ua = req.headers.get('User-Agent', '')
Dirkjan Ochtman
hgweb: treat rev as raw-rev if user agent is hg
r9731 if cmd == 'rev' and 'mercurial' in ua:
Gregory Szorc
hgweb: use our new request object for "style" parameter...
r36879 req.qsparams['style'] = 'raw'
Dirkjan Ochtman
hgweb: treat rev as raw-rev if user agent is hg
r9731
Brendan Cully
hgweb: handle subdirectories within static directory
r7287 if cmd == 'archive':
Gregory Szorc
hgweb: perform all parameter lookup via qsparams...
r36881 fn = req.qsparams['node']
Yuya Nishihara
hgweb: drop archivespecs from requestcontext...
r37530 for type_, spec in webutil.archivespecs.iteritems():
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591 ext = spec[2]
if fn.endswith(ext):
Gregory Szorc
hgweb: perform all parameter lookup via qsparams...
r36881 req.qsparams['node'] = fn[:-len(ext)]
Gregory Szorc
hgweb: set variables in qsparams...
r36880 req.qsparams['type'] = type_
Gregory Szorc
wireprotoserver: move protocol parsing and dispatch out of hgweb...
r36002 else:
Gregory Szorc
hgweb: perform all parameter lookup via qsparams...
r36881 cmd = req.qsparams.get('cmd', '')
Dirkjan Ochtman
split out hgweb commands into a separate file, move some code around
r5591
Dirkjan Ochtman
hgweb: separate protocol calls from interface calls (issue996)...
r6149 # process the web interface request
Dirkjan Ochtman
hgweb: split out templater definition
r5599
try:
Gregory Szorc
hgweb: add a sendtemplate() helper function...
r36899 rctx.tmpl = rctx.templater(req)
Yuya Nishihara
templater: factor out helper that renders named template as string...
r37004 ctype = rctx.tmpl.render('mimetype',
{'encoding': encoding.encoding})
Dirkjan Ochtman
hgweb: separate protocol calls from interface calls (issue996)...
r6149
Mark Edgington
hgweb: allow static content when deny_read denies access
r7562 # check read permissions non-static content
if cmd != 'static':
Gregory Szorc
hgweb: transition permissions hooks to modern request type (API)...
r36893 self.check_perm(rctx, req, None)
Mark Edgington
hgweb: support for deny_read/allow_read options...
r7336
Dirkjan Ochtman
hgweb: separate protocol calls from interface calls (issue996)...
r6149 if cmd == '':
Yuya Nishihara
hgweb: evaluate the "default" value as template...
r37038 req.qsparams['cmd'] = rctx.tmpl.render('default', {})
Gregory Szorc
hgweb: perform all parameter lookup via qsparams...
r36881 cmd = req.qsparams['cmd']
Dirkjan Ochtman
hgweb: fast path for sending raw files
r5890
Gregory Szorc
hgweb: support Content Security Policy...
r30766 # Don't enable caching if using a CSP nonce because then it wouldn't
# be a nonce.
Boris Feld
configitems: register the 'web.cache' config
r34606 if rctx.configbool('web', 'cache') and not rctx.nonce:
Gregory Szorc
hgweb: inline caching() and port to modern mechanisms...
r36885 tag = 'W/"%d"' % self.mtime
if req.headers.get('If-None-Match') == tag:
Gregory Szorc
hgweb: refactor 304 handling code...
r36894 res.status = '304 Not Modified'
Gregory Szorc
hgweb: discard Content-Type header for 304 responses (issue5844)...
r37846 # Content-Type may be defined globally. It isn't valid on a
# 304, so discard it.
try:
del res.headers[b'Content-Type']
except KeyError:
pass
Gregory Szorc
hgweb: refactor 304 handling code...
r36894 # Response body not allowed on 304.
res.setbodybytes('')
return res.sendresponse()
Gregory Szorc
hgweb: inline caching() and port to modern mechanisms...
r36885
res.headers['ETag'] = tag
Dirkjan Ochtman
hgweb: separate protocol calls from interface calls (issue996)...
r6149 if cmd not in webcommands.__all__:
Dirkjan Ochtman
hgweb: better error messages
r6368 msg = 'no such method: %s' % cmd
Dirkjan Ochtman
hgweb: separate protocol calls from interface calls (issue996)...
r6149 raise ErrorResponse(HTTP_BAD_REQUEST, msg)
else:
Gregory Szorc
hgweb: support using new response object for web commands...
r36886 # Set some globals appropriate for web handlers. Commands can
# override easily enough.
res.status = '200 Script output follows'
res.headers['Content-Type'] = ctype
Gregory Szorc
hgweb: stop passing req and tmpl into @webcommand functions (API)...
r36903 return getattr(webcommands, cmd)(rctx)
Dirkjan Ochtman
hgweb: explicitly pass around the templater
r5600
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except (error.LookupError, error.RepoLookupError) as err:
Augie Fackler
py3: get bytes-repr of network errors portably...
r36272 msg = pycompat.bytestr(err)
Takumi IINO
hgweb: show correct error message for i18n environment...
r18855 if (util.safehasattr(err, 'name') and
not isinstance(err, error.ManifestLookupError)):
Dirkjan Ochtman
hgweb: better error messages
r6368 msg = 'revision not found: %s' % err.name
Gregory Szorc
hgweb: send errors using new response API...
r36895
res.status = '404 Not Found'
res.headers['Content-Type'] = ctype
Gregory Szorc
hgweb: add a sendtemplate() helper function...
r36899 return rctx.sendtemplate('error', error=msg)
Gregory Szorc
global: replace most uses of RevlogError with StorageError (API)...
r39813 except (error.RepoError, error.StorageError) as e:
Gregory Szorc
hgweb: send errors using new response API...
r36895 res.status = '500 Internal Server Error'
res.headers['Content-Type'] = ctype
Gregory Szorc
hgweb: add a sendtemplate() helper function...
r36899 return rctx.sendtemplate('error', error=pycompat.bytestr(e))
Yuya Nishihara
hgweb: map Abort to 403 error to report inaccessible path for example...
r39506 except error.Abort as e:
res.status = '403 Forbidden'
res.headers['Content-Type'] = ctype
return rctx.sendtemplate('error', error=pycompat.bytestr(e))
Gregory Szorc
hgweb: send errors using new response API...
r36895 except ErrorResponse as e:
Sune Foldager
hgweb: propagate http headers from ErrorResponse for web interface commands...
r38326 for k, v in e.headers:
res.headers[k] = v
Gregory Szorc
hgweb: send errors using new response API...
r36895 res.status = statusmessage(e.code, pycompat.bytestr(e))
res.headers['Content-Type'] = ctype
Gregory Szorc
hgweb: add a sendtemplate() helper function...
r36899 return rctx.sendtemplate('error', error=pycompat.bytestr(e))
Dirkjan Ochtman
hgweb: split out templater definition
r5599
Gregory Szorc
hgweb: establish class for holding per request context...
r26134 def check_perm(self, rctx, req, op):
Mads Kiilerich
cleanup: avoid local vars shadowing imports...
r22200 for permhook in permhooks:
Gregory Szorc
hgweb: establish class for holding per request context...
r26134 permhook(rctx, req, op)
Gregory Szorc
hgweb: extract _getview to own function...
r26208
def getwebview(repo):
"""The 'web.view' config controls changeset filter to hgweb. Possible
values are ``served``, ``visible`` and ``all``. Default is ``served``.
The ``served`` filter only shows changesets that can be pulled from the
hgweb instance. The``visible`` filter includes secret changesets but
still excludes "hidden" one.
See the repoview module for details.
The option has been around undocumented since Mercurial 2.5, but no
user ever asked about it. So we better keep it undocumented for now."""
Boris Feld
configitems: register the 'web.view' config
r34585 # experimental config: web.view
viewconfig = repo.ui.config('web', 'view', untrusted=True)
Gregory Szorc
hgweb: extract _getview to own function...
r26208 if viewconfig == 'all':
return repo.unfiltered()
elif viewconfig in repoview.filtertable:
return repo.filtered(viewconfig)
else:
return repo.filtered('served')