This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2341

scmutil: fix requires-file isalnum() check on first byte
ClosedPublic

Authored by durin42 on Feb 18 2018, 3:54 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG3f98634b6572: scmutil: fix requires-file isalnum() check on first byte
rHGcd15577f5bee: scmutil: fix requires-file isalnum() check on first byte
Summary

Slice instead of subscript to get a bytes from a bytes.

  1. skip-blame just a py3 slice-instead-of-subscript change

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.

Event Timeline

durin42 created this revision.Feb 18 2018, 3:54 PM
indygreg accepted this revision.Feb 18 2018, 9:02 PM
This revision is now accepted and ready to land.Feb 18 2018, 9:02 PM
Closed by commit rHGcd15577f5bee: scmutil: fix requires-file isalnum() check on first byte (authored by durin42). · Explain WhyFeb 18 2018, 9:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (2 lines)

Diff 5909

mercurial/scmutil.py

def readrequires(opener, supported): def readrequires(opener, supported):
'''Reads and parses .hg/requires and checks if all entries found '''Reads and parses .hg/requires and checks if all entries found
are in the list of supported features.''' are in the list of supported features.'''
requirements = set(opener.read("requires").splitlines()) requirements = set(opener.read("requires").splitlines())
missings = [] missings = []
for r in requirements: for r in requirements:
if r not in supported: if r not in supported:
if not r or not r[0].isalnum(): if not r or not r[0:1].isalnum():
raise error.RequirementError(_(".hg/requires file is corrupt")) raise error.RequirementError(_(".hg/requires file is corrupt"))
missings.append(r) missings.append(r)
missings.sort() missings.sort()
if missings: if missings:
raise error.RequirementError( raise error.RequirementError(
_("repository requires features unknown to this Mercurial: %s") _("repository requires features unknown to this Mercurial: %s")
% " ".join(missings), % " ".join(missings),
hint=_("see https://mercurial-scm.org/wiki/MissingRequirement" hint=_("see https://mercurial-scm.org/wiki/MissingRequirement"