# HG changeset patch # User Taapas Agrawal # Date 1562266046 -19800 # Node ID ceb31d96d3ae6b8d3af2b35a16f915deb8694123 # Parent ea6558db10114c144ee2d6613c2329a71e904cda statecheck: updated docstrings related to afterresolvedstates Differential Revision: https://phab.mercurial-scm.org/D6606 diff -r ea6558db1011 -r ceb31d96d3ae mercurial/cmdutil.py --- a/mercurial/cmdutil.py Mon Jul 08 14:01:01 2019 -0400 +++ b/mercurial/cmdutil.py Fri Jul 05 00:17:26 2019 +0530 @@ -3301,8 +3301,9 @@ '''Check for an unfinished operation and return the command to finish it. - afterresolvedstates tuples define a .hg/{file} and the corresponding - command needed to finish it. + statemod._unfinishedstates list is checked for an unfinished operation + and the corresponding message to finish it is generated if a method to + continue is supported by the operation. Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is a boolean. @@ -3320,8 +3321,8 @@ def checkafterresolved(repo): '''Inform the user about the next action after completing hg resolve - If there's a matching afterresolvedstates, howtocontinue will yield - repo.ui.warn as the reporter. + If there's a an unfinished operation that supports continue flag, + howtocontinue will yield repo.ui.warn as the reporter. Otherwise, it will yield repo.ui.note. '''