This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10459

cmdutil: fix an uninitialize variable usage in clearunfinished()
ClosedPublic

Authored by mharbison72 on Apr 17 2021, 1:12 AM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd9531094cf8e: cmdutil: fix an uninitialize variable usage in clearunfinished()
Summary

I happened to notice that PyCharm flagged this while looking for something else.
I'm pretty sure it meant to check the current state in the iteration, and not
keep reusing the last one in the previous iteration.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Apr 17 2021, 1:12 AM
marmoute accepted this revision.Apr 17 2021, 4:53 AM
marmoute added a subscriber: marmoute.

good spotting here…

pulkit accepted this revision.Apr 17 2021, 4:46 PM
This revision is now accepted and ready to land.Apr 17 2021, 4:46 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 26971

mercurial/cmdutil.py

""" """
for state in statemod._unfinishedstates: for state in statemod._unfinishedstates:
if state._reportonly: if state._reportonly:
continue continue
if not state._clearable and state.isunfinished(repo): if not state._clearable and state.isunfinished(repo):
raise error.StateError(state.msg(), hint=state.hint()) raise error.StateError(state.msg(), hint=state.hint())
for s in statemod._unfinishedstates: for s in statemod._unfinishedstates:
if s._opname == b'merge' or state._reportonly: if s._opname == b'merge' or s._reportonly:
continue continue
if s._clearable and s.isunfinished(repo): if s._clearable and s.isunfinished(repo):
util.unlink(repo.vfs.join(s._fname)) util.unlink(repo.vfs.join(s._fname))
def getunfinishedstate(repo): def getunfinishedstate(repo):
"""Checks for unfinished operations and returns statecheck object """Checks for unfinished operations and returns statecheck object
for it""" for it"""