##// END OF EJS Templates
statecheck: updated docstrings related to afterresolvedstates...
Taapas Agrawal -
r42777:ceb31d96 default
parent child Browse files
Show More
@@ -3301,8 +3301,9 b' def howtocontinue(repo):'
3301 '''Check for an unfinished operation and return the command to finish
3301 '''Check for an unfinished operation and return the command to finish
3302 it.
3302 it.
3303
3303
3304 afterresolvedstates tuples define a .hg/{file} and the corresponding
3304 statemod._unfinishedstates list is checked for an unfinished operation
3305 command needed to finish it.
3305 and the corresponding message to finish it is generated if a method to
3306 continue is supported by the operation.
3306
3307
3307 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3308 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3308 a boolean.
3309 a boolean.
@@ -3320,8 +3321,8 b' def howtocontinue(repo):'
3320 def checkafterresolved(repo):
3321 def checkafterresolved(repo):
3321 '''Inform the user about the next action after completing hg resolve
3322 '''Inform the user about the next action after completing hg resolve
3322
3323
3323 If there's a matching afterresolvedstates, howtocontinue will yield
3324 If there's a an unfinished operation that supports continue flag,
3324 repo.ui.warn as the reporter.
3325 howtocontinue will yield repo.ui.warn as the reporter.
3325
3326
3326 Otherwise, it will yield repo.ui.note.
3327 Otherwise, it will yield repo.ui.note.
3327 '''
3328 '''
General Comments 0
You need to be logged in to leave comments. Login now