diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -646,14 +646,14 @@ if state in skip: continue if statedetectionpredicate(repo): - return (state, statedetectionpredicate, msgfn) + return (state, msgfn) def morestatus(repo, fm): statetuple = _getrepostate(repo) label = 'status.morestatus' if statetuple: fm.startitem() - state, statedetectionpredicate, helpfulmsg = statetuple + state, helpfulmsg = statetuple statemsg = _('The repository is in an unfinished *%s* state.') % state fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label) conmsg = _conflictsmsg(repo)