This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11007

shallowutil: narrow scope of try/except block
ClosedPublic

Authored by durin42 on Jul 7 2021, 2:12 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdb31bafa4ae3: shallowutil: narrow scope of try/except block
rHGc0830cbfe674: shallowutil: narrow scope of try/except block
Summary

This will make this code easier to understand in the future.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/shallowutil.py (9 lines)

Diff 28975

hgext/remotefilelog/shallowutil.py

see remotefilelogserver.createfileblob for the format. see remotefilelogserver.createfileblob for the format.
raise RuntimeError if the content is illformed. raise RuntimeError if the content is illformed.
""" """
flags = revlog.REVIDX_DEFAULT_FLAGS flags = revlog.REVIDX_DEFAULT_FLAGS
size = None size = None
try: try:
index = raw.index(b'\0') index = raw.index(b'\0')
except ValueError:
raise BadRemotefilelogHeader(
"unexpected remotefilelog header: illegal format"
)
if True:
header = raw[:index] header = raw[:index]
if header.startswith(b'v'): if header.startswith(b'v'):
# v1 and above, header starts with 'v' # v1 and above, header starts with 'v'
if header.startswith(b'v1\n'): if header.startswith(b'v1\n'):
for s in header.split(b'\n'): for s in header.split(b'\n'):
if s.startswith(constants.METAKEYSIZE): if s.startswith(constants.METAKEYSIZE):
size = int(s[len(constants.METAKEYSIZE) :]) size = int(s[len(constants.METAKEYSIZE) :])
elif s.startswith(constants.METAKEYFLAG): elif s.startswith(constants.METAKEYFLAG):
flags = int(s[len(constants.METAKEYFLAG) :]) flags = int(s[len(constants.METAKEYFLAG) :])
else: else:
raise BadRemotefilelogHeader( raise BadRemotefilelogHeader(
b'unsupported remotefilelog header: %s' % header b'unsupported remotefilelog header: %s' % header
) )
else: else:
# v0, str(int(size)) is the header # v0, str(int(size)) is the header
size = int(header) size = int(header)
except ValueError:
raise BadRemotefilelogHeader(
"unexpected remotefilelog header: illegal format"
)
if size is None: if size is None:
raise BadRemotefilelogHeader( raise BadRemotefilelogHeader(
"unexpected remotefilelog header: no size found" "unexpected remotefilelog header: no size found"
) )
return index + 1, size, flags return index + 1, size, flags
def buildfileblobheader(size, flags, version=None): def buildfileblobheader(size, flags, version=None):