This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3734

scmutil: move construction of instability count message to separate fn
ClosedPublic

Authored by pulkit on Jun 14 2018, 3:55 PM.

Details

Reviewers
lothiraldan
durin42
Group Reviewers
hg-reviewers
Commits
rHG1cac2e8c7624: scmutil: move construction of instability count message to separate fn
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jun 14 2018, 3:55 PM
pulkit updated this revision to Diff 9061.Jun 14 2018, 4:28 PM
lothiraldan accepted this revision.Jun 15 2018, 3:54 AM
lothiraldan added a subscriber: lothiraldan.
lothiraldan added inline comments.
mercurial/scmutil.py
1506

Small typo seprate -> separate

pulkit updated this revision to Diff 9272.Jun 24 2018, 3:42 PM
durin42 accepted this revision.Jun 25 2018, 10:48 AM
This revision is now accepted and ready to land.Jun 25 2018, 10:48 AM
Closed by commit rHG1cac2e8c7624: scmutil: move construction of instability count message to separate fn (authored by pulkit). · Explain WhyJun 25 2018, 11:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (10 lines)

Diff 9060

mercurial/scmutil.py

oldinstabilitycounts = getinstabilitycounts(repo) oldinstabilitycounts = getinstabilitycounts(repo)
@reportsummary @reportsummary
def reportnewinstabilities(repo, tr): def reportnewinstabilities(repo, tr):
newinstabilitycounts = getinstabilitycounts(repo) newinstabilitycounts = getinstabilitycounts(repo)
for instability, revset in instabilitytypes: for instability, revset in instabilitytypes:
delta = (newinstabilitycounts[instability] - delta = (newinstabilitycounts[instability] -
oldinstabilitycounts[instability]) oldinstabilitycounts[instability])
if delta > 0: msg = getinstabilitymessage(delta, instability)
repo.ui.warn(_('%i new %s changesets\n') % if msg:
(delta, instability)) repo.ui.warn(msg)
if txmatch(_reportnewcssource): if txmatch(_reportnewcssource):
@reportsummary @reportsummary
def reportnewcs(repo, tr): def reportnewcs(repo, tr):
"""Report the range of new revisions pulled/unbundled.""" """Report the range of new revisions pulled/unbundled."""
newrevs = tr.changes.get('revs', xrange(0, 0)) newrevs = tr.changes.get('revs', xrange(0, 0))
if not newrevs: if not newrevs:
return return
rev for rev, (old, new) in phasetracking.iteritems() rev for rev, (old, new) in phasetracking.iteritems()
if new == phases.public and rev not in newrevs if new == phases.public and rev not in newrevs
] ]
if not published: if not published:
return return
repo.ui.status(_('%d local changesets published\n') repo.ui.status(_('%d local changesets published\n')
% len(published)) % len(published))
def getinstabilitymessage(delta, instability):
if delta > 0:
return _('%i new %s changesets\n') % (delta, instability)
lothiraldanUnsubmitted
Not Done

Small typo seprate -> separate

lothiraldan: Small typo `seprate` -> `separate`
def nodesummaries(repo, nodes, maxnumnodes=4): def nodesummaries(repo, nodes, maxnumnodes=4):
if len(nodes) <= maxnumnodes or repo.ui.verbose: if len(nodes) <= maxnumnodes or repo.ui.verbose:
return ' '.join(short(h) for h in nodes) return ' '.join(short(h) for h in nodes)
first = ' '.join(short(h) for h in nodes[:maxnumnodes]) first = ' '.join(short(h) for h in nodes[:maxnumnodes])
return _("%s and %d others") % (first, len(nodes) - maxnumnodes) return _("%s and %d others") % (first, len(nodes) - maxnumnodes)
def enforcesinglehead(repo, tr, desc): def enforcesinglehead(repo, tr, desc):
"""check that no named branch has multiple heads""" """check that no named branch has multiple heads"""