[PATCH 4 of 4 V3] hgweb: always run search when a query is entered

Alexander Plavin alexander at plav.in
Thu Aug 22 10:09:30 CDT 2013


# HG changeset patch
# User Alexander Plavin <alexander at plav.in>
# Date 1374185353 -14400
#      Fri Jul 19 02:09:13 2013 +0400
# Node ID 04c91751cbf8abc1f3ea56c67ca4988e0e8e61a5
# Parent  ffa9a6d28047bfe1803676327269a1426769a7a8
hgweb: always run search when a query is entered

This changes the behavior for queries which point at a revision directly,
now the output is consistend to other cases: it results in only this matched
revision shown, not the log starting with it.
A new test checks this behaviour and fails for the old one.

diff -r ffa9a6d28047 -r 04c91751cbf8 mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py	Fri Jul 19 02:41:11 2013 +0400
+++ b/mercurial/hgweb/webcommands.py	Fri Jul 19 02:09:13 2013 +0400
@@ -213,11 +213,7 @@
     if 'node' in req.form:
         ctx = webutil.changectx(web.repo, req)
     elif 'rev' in req.form:
-        query = req.form['rev'][0]
-        try:
-            ctx = web.repo[query]
-        except (error.RepoError, error.LookupError):
-            return _search(web, req, tmpl) # XXX redirect to 404 page?
+        return _search(web, req, tmpl)
     else:
         ctx = web.repo['tip']
 
diff -r ffa9a6d28047 -r 04c91751cbf8 tests/test-hgweb-commands.t
--- a/tests/test-hgweb-commands.t	Fri Jul 19 02:41:11 2013 +0400
+++ b/tests/test-hgweb-commands.t	Fri Jul 19 02:09:13 2013 +0400
@@ -534,6 +534,8 @@
   </body>
   </html>
   
+  $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'log?rev=stable&style=raw' | grep 'revision:'
+  revision:    2
 
 File-related
 


More information about the Mercurial-devel mailing list