mercurial-crew-with-dirclash: mercurial/hgweb/server.py annotate

annotate mercurial/hgweb/server.py @ 4307:c8919eb0f315

purge: abort with missing files avoiding problems with name-mangling fs In a name mangling filesystem (e.g. a case insensitive one) dirstate.walk() can yield filenames different from the ones stored in the dirstate. This already confuses the status and add commands, but with purge this may cause data loss. To prevent this purge refuses to work if there are missing files and has a 'force' option if the user knows it is safe. Even with the force option purge checks if any of the missing files is still available in the working dir: if so there may be some problem with the underlying filesystem, so it unconditionally aborts.

author	Emanuele Aina <em@nerd.ocracy.org>
date	Wed, 28 Mar 2007 21:34:12 +0200
parents	ca639faa38a2
children	80c7fa620a4d

rev	line source
2391 d351a3be3371 Fixing up comment headers for split up code. Eric Hopper <hopper@omnifarious.org> parents: 2355 diff changeset	1 # hgweb/server.py - The standalone hg web server.
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	2 #
238 3b92f8fe47ae hgweb.py: kill #! line, clean up copyright notice mpm@selenic.com parents: 222 diff changeset	3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
2858 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2644 diff changeset	4 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	5 #
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	6 # This software may be used and distributed according to the terms
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	8
4016 a195f11ed1a2 sync with -stable Thomas Arendsen Hein <thomas@intevation.de> parents: 3886 4015 diff changeset	9 import os, sys, errno, urllib, BaseHTTPServer, socket, SocketServer, traceback
3886 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3836 diff changeset	10 from mercurial import ui, hg, util, templater
abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3836 diff changeset	11 from hgweb_mod import hgweb
abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3836 diff changeset	12 from hgwebdir_mod import hgwebdir
abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3836 diff changeset	13 from request import wsgiapplication
2311 b832b6eb65ab Moving hgweb.py into it's own module in preparation for breaking it up. Eric Hopper <hopper@omnifarious.org> parents: 2275 diff changeset	14 from mercurial.i18n import gettext as _
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	15
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	16 def _splitURI(uri):
2123 c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	17 """ Return path and query splited from uri
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	18
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	19 Just like CGI environment, the path is unquoted, the query is
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	20 not.
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	21 """
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	22 if '?' in uri:
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	23 path, query = uri.split('?', 1)
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	24 else:
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	25 path, query = uri, ''
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	26 return urllib.unquote(path), query
c0729a7f6f8a Fixed path handling of the standalone server, fixed typo. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	27
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	28 class _error_logger(object):
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	29 def __init__(self, handler):
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	30 self.handler = handler
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	31 def flush(self):
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	32 pass
3125 2e043c9a38a6 hgweb: fix errors spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3076 diff changeset	33 def write(self, str):
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	34 self.writelines(str.split('\n'))
3125 2e043c9a38a6 hgweb: fix errors spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3076 diff changeset	35 def writelines(self, seq):
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	36 for msg in seq:
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	37 self.handler.log_error("HG error: %s", msg)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	38
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	39 class _hgwebhandler(object, BaseHTTPServer.BaseHTTPRequestHandler):
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	40 def __init__(self, args, *kargs):
2434 a2df85adface http server: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2404 diff changeset	41 self.protocol_version = 'HTTP/1.1'
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	42 BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, args, *kargs)
1498 78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	43
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	44 def log_error(self, format, *args):
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	45 errorlog = self.server.errorlog
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	46 errorlog.write("%s - - [%s] %s\n" % (self.address_string(),
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	47 self.log_date_time_string(),
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	48 format % args))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	49
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	50 def log_message(self, format, *args):
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	51 accesslog = self.server.accesslog
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	52 accesslog.write("%s - - [%s] %s\n" % (self.address_string(),
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	53 self.log_date_time_string(),
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	54 format % args))
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	55
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	56 def do_POST(self):
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	57 try:
4015 769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	58 try:
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	59 self.do_hgweb()
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	60 except socket.error, inst:
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	61 if inst[0] != errno.EPIPE:
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	62 raise
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	63 except StandardError, inst:
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	64 self._start_response("500 Internal Server Error", [])
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	65 self._write("Internal Server Error")
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	66 tb = "".join(traceback.format_exception(*sys.exc_info()))
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	67 self.log_error("Exception happened during processing request '%s':\n%s",
769be3c57564 Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback Thomas Arendsen Hein <thomas@intevation.de> parents: 3836 diff changeset	68 self.path, tb)
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	69
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	70 def do_GET(self):
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	71 self.do_POST()
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	72
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	73 def do_hgweb(self):
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	74 path_info, query = _splitURI(self.path)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	75
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	76 env = {}
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	77 env['GATEWAY_INTERFACE'] = 'CGI/1.1'
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	78 env['REQUEST_METHOD'] = self.command
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	79 env['SERVER_NAME'] = self.server.server_name
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	80 env['SERVER_PORT'] = str(self.server.server_port)
3262 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3125 diff changeset	81 env['REQUEST_URI'] = self.path
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	82 env['PATH_INFO'] = path_info
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	83 if query:
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	84 env['QUERY_STRING'] = query
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	85 host = self.address_string()
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	86 if host != self.client_address[0]:
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	87 env['REMOTE_HOST'] = host
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	88 env['REMOTE_ADDR'] = self.client_address[0]
1579 85803ec2daab Remove tabs, and trailing whitespace from hgweb.py Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1575 diff changeset	89
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	90 if self.headers.typeheader is None:
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	91 env['CONTENT_TYPE'] = self.headers.type
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	92 else:
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	93 env['CONTENT_TYPE'] = self.headers.typeheader
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	94 length = self.headers.getheader('content-length')
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	95 if length:
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	96 env['CONTENT_LENGTH'] = length
2505 01b856927970 Fix server to set up a more WSGI compliant environment. Eric Hopper <hopper@omnifarious.org> parents: 2434 diff changeset	97 for header in [h for h in self.headers.keys() \
01b856927970 Fix server to set up a more WSGI compliant environment. Eric Hopper <hopper@omnifarious.org> parents: 2434 diff changeset	98 if h not in ('content-type', 'content-length')]:
01b856927970 Fix server to set up a more WSGI compliant environment. Eric Hopper <hopper@omnifarious.org> parents: 2434 diff changeset	99 hkey = 'HTTP_' + header.replace('-', '_').upper()
01b856927970 Fix server to set up a more WSGI compliant environment. Eric Hopper <hopper@omnifarious.org> parents: 2434 diff changeset	100 hval = self.headers.getheader(header)
01b856927970 Fix server to set up a more WSGI compliant environment. Eric Hopper <hopper@omnifarious.org> parents: 2434 diff changeset	101 hval = hval.replace('\n', '').strip()
01b856927970 Fix server to set up a more WSGI compliant environment. Eric Hopper <hopper@omnifarious.org> parents: 2434 diff changeset	102 if hval:
01b856927970 Fix server to set up a more WSGI compliant environment. Eric Hopper <hopper@omnifarious.org> parents: 2434 diff changeset	103 env[hkey] = hval
01b856927970 Fix server to set up a more WSGI compliant environment. Eric Hopper <hopper@omnifarious.org> parents: 2434 diff changeset	104 env['SERVER_PROTOCOL'] = self.request_version
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	105 env['wsgi.version'] = (1, 0)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	106 env['wsgi.url_scheme'] = 'http'
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	107 env['wsgi.input'] = self.rfile
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	108 env['wsgi.errors'] = _error_logger(self)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	109 env['wsgi.multithread'] = isinstance(self.server,
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	110 SocketServer.ThreadingMixIn)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	111 env['wsgi.multiprocess'] = isinstance(self.server,
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	112 SocketServer.ForkingMixIn)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	113 env['wsgi.run_once'] = 0
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	114
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	115 self.close_connection = True
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	116 self.saved_status = None
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	117 self.saved_headers = []
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	118 self.sent_headers = False
2508 ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	119 self.length = None
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	120 req = self.server.reqmaker(env, self._start_response)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	121 for data in req:
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	122 if data:
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	123 self._write(data)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	124
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	125 def send_headers(self):
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	126 if not self.saved_status:
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	127 raise AssertionError("Sending headers before start_response() called")
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	128 saved_status = self.saved_status.split(None, 1)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	129 saved_status[0] = int(saved_status[0])
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	130 self.send_response(*saved_status)
2508 ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	131 should_close = True
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	132 for h in self.saved_headers:
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	133 self.send_header(*h)
2508 ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	134 if h[0].lower() == 'content-length':
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	135 should_close = False
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	136 self.length = int(h[1])
2582 276de216d2c5 Respect "Connection: close" headers sent by HTTP clients. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2508 diff changeset	137 # The value of the Connection header is a list of case-insensitive
276de216d2c5 Respect "Connection: close" headers sent by HTTP clients. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2508 diff changeset	138 # tokens separated by commas and optional whitespace.
2600 c4325f0a9b91 clean up trailing white space. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2582 diff changeset	139 if 'close' in [token.strip().lower() for token in
2582 276de216d2c5 Respect "Connection: close" headers sent by HTTP clients. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2508 diff changeset	140 self.headers.get('connection', '').split(',')]:
276de216d2c5 Respect "Connection: close" headers sent by HTTP clients. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2508 diff changeset	141 should_close = True
2508 ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	142 if should_close:
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	143 self.send_header('Connection', 'close')
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	144 self.close_connection = should_close
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	145 self.end_headers()
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	146 self.sent_headers = True
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	147
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	148 def _start_response(self, http_status, headers, exc_info=None):
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	149 code, msg = http_status.split(None, 1)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	150 code = int(code)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	151 self.saved_status = http_status
2508 ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	152 bad_headers = ('connection', 'transfer-encoding')
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	153 self.saved_headers = [ h for h in headers \
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	154 if h[0].lower() not in bad_headers ]
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	155 return self._write
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	156
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	157 def _write(self, data):
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	158 if not self.saved_status:
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	159 raise AssertionError("data written before start_response() called")
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	160 elif not self.sent_headers:
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	161 self.send_headers()
2508 ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	162 if self.length is not None:
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	163 if len(data) > self.length:
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	164 raise AssertionError("Content-length header sent, but more bytes than specified are being written.")
ab460a3f0e3a Put support for persistent connections back in. Eric Hopper <hopper@omnifarious.org> parents: 2507 diff changeset	165 self.length = self.length - len(data)
2506 d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	166 self.wfile.write(data)
d0db3462d568 This patch make several WSGI related alterations. Eric Hopper <hopper@omnifarious.org> parents: 2505 diff changeset	167 self.wfile.flush()
136 0e8d60d2bb2b added annotate jake@edge2.net parents: 135 diff changeset	168
2392 8238a3f039e6 Adjusting hgweb splitup to be a little cleaner. Eric Hopper <hopper@omnifarious.org> parents: 2391 diff changeset	169 def create_server(ui, repo):
2121 150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	170 use_threads = True
2124 27fd8b7a6c51 Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2123 diff changeset	171
938 54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	172 def openlog(opt, default):
54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	173 if opt and opt != '-':
54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	174 return open(opt, 'w')
54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	175 return default
54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	176
2127 8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2124 diff changeset	177 address = ui.config("web", "address", "")
8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2124 diff changeset	178 port = int(ui.config("web", "port", 8000))
8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2124 diff changeset	179 use_ipv6 = ui.configbool("web", "ipv6")
8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2124 diff changeset	180 webdir_conf = ui.config("web", "webdir_conf")
8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2124 diff changeset	181 accesslog = openlog(ui.config("web", "accesslog", "-"), sys.stdout)
8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2124 diff changeset	182 errorlog = openlog(ui.config("web", "errorlog", "-"), sys.stderr)
2124 27fd8b7a6c51 Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2123 diff changeset	183
2121 150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	184 if use_threads:
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	185 try:
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	186 from threading import activeCount
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	187 except ImportError:
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	188 use_threads = False
938 54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	189
2121 150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	190 if use_threads:
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	191 _mixin = SocketServer.ThreadingMixIn
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	192 else:
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	193 if hasattr(os, "fork"):
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	194 _mixin = SocketServer.ForkingMixIn
150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	195 else:
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3631 diff changeset	196 class _mixin:
eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3631 diff changeset	197 pass
2121 150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	198
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	199 class MercurialHTTPServer(object, _mixin, BaseHTTPServer.HTTPServer):
4130 178007785be8 web/server: disable address reuse option for BaseHTTPServer on windows Patrick Mezard <pmezard@gmail.com> parents: 4091 diff changeset	200
178007785be8 web/server: disable address reuse option for BaseHTTPServer on windows Patrick Mezard <pmezard@gmail.com> parents: 4091 diff changeset	201 # SO_REUSEADDR has broken semantics on windows
178007785be8 web/server: disable address reuse option for BaseHTTPServer on windows Patrick Mezard <pmezard@gmail.com> parents: 4091 diff changeset	202 if os.name == 'nt':
178007785be8 web/server: disable address reuse option for BaseHTTPServer on windows Patrick Mezard <pmezard@gmail.com> parents: 4091 diff changeset	203 allow_reuse_address = 0
178007785be8 web/server: disable address reuse option for BaseHTTPServer on windows Patrick Mezard <pmezard@gmail.com> parents: 4091 diff changeset	204
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	205 def __init__(self, args, *kargs):
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	206 BaseHTTPServer.HTTPServer.__init__(self, args, *kargs)
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	207 self.accesslog = accesslog
eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	208 self.errorlog = errorlog
2644 56e98084e040 Make hgweb threads into daemon threads. Brendan Cully <brendan@kublai.com> parents: 2600 diff changeset	209 self.daemon_threads = True
4247 bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	210 def make_handler():
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	211 if webdir_conf:
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	212 hgwebobj = hgwebdir(webdir_conf, ui)
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	213 elif repo is not None:
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	214 hgwebobj = hgweb(hg.repository(repo.ui, repo.root))
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	215 else:
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	216 raise hg.RepoError(_("There is no Mercurial repository here"
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	217 " (.hg not found)"))
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	218 return hgwebobj
bd46b83b9692 avoid wsgiapplication <-> MercurialHTTPServer circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4130 diff changeset	219 self.reqmaker = wsgiapplication(make_handler)
2355 eb08fb4d41e1 Splitting up hgweb so it's easier to change. Eric Hopper <hopper@omnifarious.org> parents: 2328 diff changeset	220
3836 925b1816c746 Fix hg serve -6 getsockname handling Brendan Cully <brendan@kublai.com> parents: 3673 diff changeset	221 addr, port = self.socket.getsockname()[:2]
925b1816c746 Fix hg serve -6 getsockname handling Brendan Cully <brendan@kublai.com> parents: 3673 diff changeset	222 if addr in ('0.0.0.0', '::'):
3631 dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	223 addr = socket.gethostname()
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	224 else:
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	225 try:
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	226 addr = socket.gethostbyaddr(addr)[0]
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	227 except socket.error:
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	228 pass
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	229 self.addr, self.port = addr, port
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	230
2121 150cdd6c3c90 Added threading support to hg serve. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2119 diff changeset	231 class IPv6HTTPServer(MercurialHTTPServer):
881 16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	232 address_family = getattr(socket, 'AF_INET6', None)
16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	233
16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	234 def __init__(self, args, *kwargs):
16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	235 if self.address_family is None:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	236 raise hg.RepoError(_('IPv6 not available on this system'))
2507 7e01da2bc7f3 Fix two small bugs that would've prevented the web interface and IPv6 Eric Hopper <hopper@omnifarious.org> parents: 2506 diff changeset	237 super(IPv6HTTPServer, self).__init__(args, *kwargs)
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	238
3631 dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	239 try:
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	240 if use_ipv6:
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	241 return IPv6HTTPServer((address, port), _hgwebhandler)
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	242 else:
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	243 return MercurialHTTPServer((address, port), _hgwebhandler)
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	244 except socket.error, inst:
dc3504af7722 hgweb: internalize some socket details Matt Mackall <mpm@selenic.com> parents: 3262 diff changeset	245 raise util.Abort(_('cannot start server: %s') % inst.args[1])

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/hgweb/server.py @ 4307:c8919eb0f315