Patchwork D6606: statecheck: updated docstrings related to afterresolvedstates

login
register
mail settings
Submitter phabricator
Date July 8, 2019, 10:05 p.m.
Message ID <13161d8a6f3a118a49bdcf94664ee650@localhost.localdomain>
Download mbox | patch
Permalink /patch/40845/
State Not Applicable
Headers show

Comments

phabricator - July 8, 2019, 10:05 p.m.
Closed by commit rHGceb31d96d3ae: statecheck: updated docstrings related to afterresolvedstates (authored by taapas1128).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6606?vs=15763&id=15826

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6606/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6606

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




To: taapas1128, #hg-reviewers, pulkit
Cc: av6, mercurial-devel

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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.
     '''