Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 27624:d46db4390715
resolve: suggest the next action
Expose afterresolvedstates to allow graft and similar to
suggest a message when resolving results in no unresolved
files.
If there isn't a matching state in afterresolvedstates,
then if verbose, suggest commiting.
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 19:25:44 +0000 |
| parents | 0bc71f45d362 |
| children | cdb9493a7e2f |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Jan 04 21:52:44 2016 -0800 +++ b/mercurial/cmdutil.py Thu Dec 24 19:25:44 2015 +0000 @@ -3363,6 +3363,17 @@ if clearable and repo.vfs.exists(f): util.unlink(repo.join(f)) +afterresolvedstates = [ + ] + +def checkafterresolved(repo): + contmsg = _("continue: %s\n") + for f, msg in afterresolvedstates: + if repo.vfs.exists(f): + repo.ui.warn(contmsg % msg) + return + repo.ui.note(contmsg % _("hg commit")) + class dirstateguard(object): '''Restore dirstate at unexpected failure.