# HG changeset patch # User Augie Fackler # Date 1625672822 14400 # Node ID db31bafa4ae3c3b5ba92217e0b956d153410356d # Parent e972077600e53cbd6bc7f8c76c533f1f5d9bfad1 shallowutil: narrow scope of try/except block This will make this code easier to understand in the future. Differential Revision: https://phab.mercurial-scm.org/D11007 diff -r e972077600e5 -r db31bafa4ae3 hgext/remotefilelog/shallowutil.py --- a/hgext/remotefilelog/shallowutil.py Wed Jul 07 11:45:17 2021 -0400 +++ b/hgext/remotefilelog/shallowutil.py Wed Jul 07 11:47:02 2021 -0400 @@ -247,6 +247,11 @@ size = None try: index = raw.index(b'\0') + except ValueError: + raise BadRemotefilelogHeader( + "unexpected remotefilelog header: illegal format" + ) + if True: header = raw[:index] if header.startswith(b'v'): # v1 and above, header starts with 'v' @@ -263,10 +268,6 @@ else: # v0, str(int(size)) is the header size = int(header) - except ValueError: - raise BadRemotefilelogHeader( - "unexpected remotefilelog header: illegal format" - ) if size is None: raise BadRemotefilelogHeader( "unexpected remotefilelog header: no size found"