This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7381

cmdutil: add a pytype annotation to help out some callsites
ClosedPublic

Authored by durin42 on Nov 13 2019, 10:51 PM.

Details

Reviewers
dlax
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa58d2361b231: cmdutil: add a pytype annotation to help out some callsites
Summary

I think we could constrain the values here more than Any, but this
lets us move forward with typechecking commands.py.

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.Nov 13 2019, 10:51 PM
dlax added a subscriber: dlax.Nov 14 2019, 4:12 AM
dlax added inline comments.
mercurial/cmdutil.py
3971

Wouldn't -> Dict[bytes, List[bytes]] be okay? (Not sure why "Any" you're referering to in commit message, though I understand Dict[bytes, Any] comes from state.cmdstate.read() return type in D7383.)

dlax accepted this revision.Nov 14 2019, 4:12 AM
durin42 marked an inline comment as done.Nov 14 2019, 4:15 PM
durin42 added inline comments.
mercurial/cmdutil.py
3971

I'm pretty sure that some of the dict values are booleans at the very least?

dlax accepted this revision.Nov 15 2019, 6:07 AM
indygreg accepted this revision.Nov 18 2019, 10:43 PM
This revision is now accepted and ready to land.Nov 18 2019, 10:43 PM
durin42 marked an inline comment as done.Nov 18 2019, 10:49 PM
durin42 added a commit: rHGa58d2361b231: cmdutil: add a pytype annotation to help out some callsites.
Closed by commit rHGa58d2361b231: cmdutil: add a pytype annotation to help out some callsites (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (10 lines)

Diff 18223

mercurial/cmdutil.py

vfs as vfsmod, vfs as vfsmod,
) )
from .utils import ( from .utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
if not globals():
from typing import (
Any,
Dict,
)
for t in (Any, Dict):
assert t
stringio = util.stringio stringio = util.stringio
# templates of common command options # templates of common command options
dryrunopts = [ dryrunopts = [
(b'n', b'dry-run', None, _(b'do not perform actions, just print output')), (b'n', b'dry-run', None, _(b'do not perform actions, just print output')),
] ]
ui.status(_(b"graft aborted\n")) ui.status(_(b"graft aborted\n"))
ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12]) ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12])
graftstate.delete() graftstate.delete()
return 0 return 0
def readgraftstate(repo, graftstate): def readgraftstate(repo, graftstate):
# type: (Any, statemod.cmdstate) -> Dict[bytes, Any]
dlaxUnsubmitted
Done

Wouldn't -> Dict[bytes, List[bytes]] be okay? (Not sure why "Any" you're referering to in commit message, though I understand Dict[bytes, Any] comes from state.cmdstate.read() return type in D7383.)

dlax: Wouldn't `-> Dict[bytes, List[bytes]]` be okay? (Not sure why "Any" you're referering to in…
durin42AuthorUnsubmitted
Done

I'm pretty sure that some of the dict values are booleans at the very least?

durin42: I'm pretty sure that some of the dict values are booleans at the very least?
"""read the graft state file and return a dict of the data stored in it""" """read the graft state file and return a dict of the data stored in it"""
try: try:
return graftstate.read() return graftstate.read()
except error.CorruptedState: except error.CorruptedState:
nodes = repo.vfs.read(b'graftstate').splitlines() nodes = repo.vfs.read(b'graftstate').splitlines()
return {b'nodes': nodes} return {b'nodes': nodes}
def hgabortgraft(ui, repo): def hgabortgraft(ui, repo):
""" abort logic for aborting graft using 'hg abort'""" """ abort logic for aborting graft using 'hg abort'"""
with repo.wlock(): with repo.wlock():
graftstate = statemod.cmdstate(repo, b'graftstate') graftstate = statemod.cmdstate(repo, b'graftstate')
return abortgraft(ui, repo, graftstate) return abortgraft(ui, repo, graftstate)