Patchwork D2020: hgweb: move call to protocol handler outside of try..except

login
register
mail settings
Submitter phabricator
Date Feb. 3, 2018, 1:50 a.m.
Message ID <differential-rev-PHID-DREV-kagwkx22djb2cycxbs3p-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27250/
State Superseded
Headers show

Comments

phabricator - Feb. 3, 2018, 1:50 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The protocol handler doesn't raise ErrorResponse. So it doesn't
  need to be in this `try..except ErrorResponse` block.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2020

AFFECTED FILES
  mercurial/hgweb/hgweb_mod.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -368,7 +368,6 @@ 
                     raise ErrorResponse(HTTP_NOT_FOUND)
                 if cmd in perms:
                     self.check_perm(rctx, req, perms[cmd])
-                return protohandler['dispatch']()
             except ErrorResponse as inst:
                 # A client that sends unbundle without 100-continue will
                 # break if we respond early.
@@ -383,6 +382,8 @@ 
                             body='0\n%s\n' % inst)
                 return ''
 
+            return protohandler['dispatch']()
+
         # translate user-visible url structure to internal structure
 
         args = query.split('/', 2)