Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
ceb31d96
Commit
ceb31d96
authored
5 years ago
by
Taapas Agrawal
Browse files
Options
Downloads
Patches
Plain Diff
statecheck: updated docstrings related to afterresolvedstates
Differential Revision:
https://phab.mercurial-scm.org/D6606
parent
ea6558db
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mercurial/cmdutil.py
+5
-4
5 additions, 4 deletions
mercurial/cmdutil.py
with
5 additions
and
4 deletions
mercurial/cmdutil.py
+
5
−
4
View file @
ceb31d96
...
...
@@ -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.
'''
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment