upstream/mercurial-mirror Commit - r6368:2c370f08

hgweb: better error messages

Dirkjan Ochtman -

r6368:2c370f08 default

parent child

mercurial/hgweb/hgweb_mod.py

0 +7 -3

                             cmd = req.form['cmd'][0]
                         if cmd not in webcommands.__all__:
-                            msg = 'No such method: %s' % cmd
+                            msg = 'no such method: %s' % cmd
                             raise ErrorResponse(HTTP_BAD_REQUEST, msg)
                         elif cmd == 'file' and 'raw' in req.form.get('style', []):
                             self.ctype = ctype
                     except revlog.LookupError, err:
                         req.respond(HTTP_NOT_FOUND, ctype)
-                        req.write(tmpl('error', error='revision not found: %s' % err.name))
+                        if 'manifest' in err.message:
+                            msg = str(err)
+                        else:
+                            msg = 'revision not found: %s' % err.name
+                        req.write(tmpl('error', error=msg))
                     except (RepoError, revlog.RevlogError), inst:
                         req.respond(HTTP_SERVER_ERROR, ctype)
                         req.write(tmpl('error', error=str(inst)))
                             files[short] = (f, n)
                     if not files:
-                        raise ErrorResponse(HTTP_NOT_FOUND, 'Path not found: ' + path)
+                        raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
                     def filelist(**map):
                         fl = files.keys()

mercurial/hgweb/webcommands.py

0 +13 -7

                 try:
                     fctx = web.filectx(req)
-                except revlog.LookupError:
+                except revlog.LookupError, inst:
-                    content = web.manifest(tmpl, web.changectx(req), path)
+                    try:
-                    req.respond(HTTP_OK, web.ctype)
+                        content = web.manifest(tmpl, web.changectx(req), path)
-                    return content
+                        req.respond(HTTP_OK, web.ctype)
+                        return content
+                    except ErrorResponse:
+                        raise inst
                 path = fctx.path()
                 text = fctx.data()
                 if path:
                     try:
                         return web.filerevision(tmpl, web.filectx(req))
-                    except revlog.LookupError:
+                    except revlog.LookupError, inst:
                         pass
-                return web.manifest(tmpl, web.changectx(req), path)
+                try:
+                    return web.manifest(tmpl, web.changectx(req), path)
+                except ErrorResponse:
+                    raise inst
             def changelog(web, req, tmpl, shortlog = False):
                 if 'node' in req.form:
                     web.configbool("web", "allow" + type_, False))):
                     web.archive(tmpl, req, req.form['node'][0], type_)
                     return []
-                raise ErrorResponse(HTTP_NOT_FOUND, 'Unsupported archive type: %s' % type_)
+                raise ErrorResponse(HTTP_NOT_FOUND, 'unsupported archive type: %s' % type_)
             def static(web, req, tmpl):
                 fname = req.form['file'][0]

tests/test-hgweb

0 +2 0

             echo % should give a 404 - file does not exist
             "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork?style=raw'
+            "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork'
+            "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/bork?style=raw'
             echo % stop and restart
             kill `cat hg.pid`

tests/test-hgweb.out

0 +38 -3

@@ -59,14 +59,49 b' error: revision not found: spam'
59	400	59	400
60		60
61		61
62	error: No such method: spam	62	error: no such method: spam
63	% should give a 404 - file does not exist	63	% should give a 404 - file does not exist
64	404 Not Found	64	404 Not Found
65		65
66		66
67	error: Path not found: bork/	67	error: bork@2ef0ac749a14: not found in manifest
		68	404 Not Found
		69
		70	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
		71	<html>
		72	<head>
		73	<link rel="icon" href="/static/hgicon.png" type="image/png">
		74	<meta name="robots" content="index, nofollow" />
		75	<link rel="stylesheet" href="/static/style.css" type="text/css" />
		76
		77	<title>Mercurial Error</title>
		78	</head>
		79	<body>
		80
		81	<h2>Mercurial Error</h2>
		82
		83	<p>
		84	An error occurred while processing your request:
		85	</p>
		86	<p>
		87	bork@2ef0ac749a14: not found in manifest
		88	</p>
		89
		90
		91	<div class="logo">
		92	<a href="http://www.selenic.com/mercurial/">
		93	<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
		94	</div>
		95
		96	</body>
		97	</html>
		98
		99	404 Not Found
		100
		101
		102	error: bork@2ef0ac749a14: not found in manifest
68	% stop and restart	103	% stop and restart
69	7 log lines written	104	9 log lines written
70	% static file	105	% static file
71	200 Script output follows	106	200 Script output follows
72		107

tests/test-hgwebdir.out

0 +1 -1

 Not Found
-            error: Path not found: bork/
+            error: bork@8580ff50825a: not found in manifest
             % should succeed
 Script output follows

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages