scmutil: move construction of instability count message to separate fn
When the commad we are running, introduces new instabilities, we show a message
like `5 new orphan changesets`, `2 new content-divergent changesets`, `1 new
phase-divergent changesets` etc which is very nice.
Now taking a step ahead, we want users to show how to fix them too. Something
like:
`5 new orphan changesets (run 'hg evolve' to resolve/stabilize them)`
`2 new content-divergent changesets (run 'hg evolve --content-divergent' to
resolve them)`
and maybe telling user a way to understand more about those new instabilities
like `hg evolve --list` or `hg log -r 'orphan()'` something like that.
The idea came from issue5855 which I want to fix because fixing that will result
in a nice UI.
Taking the construction logic out will allow extensions like evolve (maybe
rebase too) to wrap that and add information about how to resolve and how to
understand the instability more.
Differential Revision: https://phab.mercurial-scm.org/D3734
--- a/mercurial/scmutil.py Mon Jun 25 16:36:14 2018 +0200
+++ b/mercurial/scmutil.py Fri Jun 15 00:50:48 2018 +0530
@@ -1522,9 +1522,9 @@
for instability, revset in instabilitytypes:
delta = (newinstabilitycounts[instability] -
oldinstabilitycounts[instability])
- if delta > 0:
- repo.ui.warn(_('%i new %s changesets\n') %
- (delta, instability))
+ msg = getinstabilitymessage(delta, instability)
+ if msg:
+ repo.ui.warn(msg)
if txmatch(_reportnewcssource):
@reportsummary
@@ -1566,6 +1566,14 @@
repo.ui.status(_('%d local changesets published\n')
% len(published))
+def getinstabilitymessage(delta, instability):
+ """function to return the message to show warning about new instabilities
+
+ exists as a separate function so that extension can wrap to show more
+ information like how to fix instabilities"""
+ if delta > 0:
+ return _('%i new %s changesets\n') % (delta, instability)
+
def nodesummaries(repo, nodes, maxnumnodes=4):
if len(nodes) <= maxnumnodes or repo.ui.verbose:
return ' '.join(short(h) for h in nodes)