This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7294

cmdutil: suppress bogus pytype errors
ClosedPublic

Authored by durin42 on Nov 6 2019, 5:59 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG9391784299e9: cmdutil: suppress bogus pytype errors
Summary

pytype seems to handle our subclass of tuple (scmutil.status)
especially poorly. We should probably file a bug.

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
Mmercurial/cmdutil.py (6 lines)

Diff 17706

mercurial/cmdutil.py

) )
else: else:
recordfn = crecordmod.chunkselector recordfn = crecordmod.chunkselector
return crecordmod.filterpatch( return crecordmod.filterpatch(
ui, originalhunks, recordfn, operation ui, originalhunks, recordfn, operation
) )
except crecordmod.fallbackerror as e: except crecordmod.fallbackerror as e:
ui.warn(b'%s\n' % e.message) ui.warn(b'%s\n' % e.message) # pytype: disable=attribute-error
ui.warn(_(b'falling back to text mode\n')) ui.warn(_(b'falling back to text mode\n'))
return patch.filterpatch(ui, originalhunks, match, operation) return patch.filterpatch(ui, originalhunks, match, operation)
def recordfilter(ui, originalhunks, match, operation=None): def recordfilter(ui, originalhunks, match, operation=None):
""" Prompts the user to filter the originalhunks and return a list of """ Prompts the user to filter the originalhunks and return a list of
selected hunks. selected hunks.
# subrepoutil.precommit() modifies the status # subrepoutil.precommit() modifies the status
tmpstatus = scmutil.status( tmpstatus = scmutil.status(
copymod.copy(status[0]), copymod.copy(status[0]),
copymod.copy(status[1]), copymod.copy(status[1]),
copymod.copy(status[2]), copymod.copy(status[2]),
copymod.copy(status[3]), copymod.copy(status[3]),
copymod.copy(status[4]), copymod.copy(status[4]),
copymod.copy(status[5]), copymod.copy(status[5]),
copymod.copy(status[6]), copymod.copy(status[6]), # pytype: disable=wrong-arg-count
) )
# Force allows -X subrepo to skip the subrepo. # Force allows -X subrepo to skip the subrepo.
subs, commitsubs, newstate = subrepoutil.precommit( subs, commitsubs, newstate = subrepoutil.precommit(
repo.ui, wctx, tmpstatus, match, force=True repo.ui, wctx, tmpstatus, match, force=True
) )
for s in subs: for s in subs:
if s in commitsubs: if s in commitsubs:
r = filelog r = filelog
# Not all storage may be revlogs. If requested, try to return an actual # Not all storage may be revlogs. If requested, try to return an actual
# revlog instance. # revlog instance.
if returnrevlog: if returnrevlog:
if isinstance(r, revlog.revlog): if isinstance(r, revlog.revlog):
pass pass
elif util.safehasattr(r, b'_revlog'): elif util.safehasattr(r, b'_revlog'):
r = r._revlog r = r._revlog # pytype: disable=attribute-error
elif r is not None: elif r is not None:
raise error.Abort(_(b'%r does not appear to be a revlog') % r) raise error.Abort(_(b'%r does not appear to be a revlog') % r)
if not r: if not r:
if not returnrevlog: if not returnrevlog:
raise error.Abort(_(b'cannot give path to non-revlog')) raise error.Abort(_(b'cannot give path to non-revlog'))
if not file_: if not file_: