Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 42577:ceb31d96d3ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
statecheck: updated docstrings related to afterresolvedstates Differential Revision: https://phab.mercurial-scm.org/D6606
author Taapas Agrawal <taapas2897@gmail.com>
date Fri, 05 Jul 2019 00:17:26 +0530
parents f9da9d5f3f5a
children b8d54f4625cb
comparison
equal deleted inserted replaced
42576:ea6558db1011 42577:ceb31d96d3ae
3299 3299
3300 def howtocontinue(repo): 3300 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.
3309 ''' 3310 '''
3310 contmsg = _("continue: %s") 3311 contmsg = _("continue: %s")
3318 return None, None 3319 return None, None
3319 3320
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 '''
3328 msg, warning = howtocontinue(repo) 3329 msg, warning = howtocontinue(repo)
3329 if msg is not None: 3330 if msg is not None: