This is an archive of the discontinued Mercurial Phabricator instance.

status: outputting structured unfinished-operation information
ClosedPublic

Authored by rdamazio on Dec 10 2019, 1:39 AM.

Details

Summary

This adds a new item in the json/template output for morestatus and added item
types to all entries.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

rdamazio created this revision.Dec 10 2019, 1:39 AM
pulkit added inline comments.
mercurial/configitems.py
247 ↗(On Diff #18562)

IMO the whole morestatus functionality is already behind a config option, so lets not have a config option just for that.

But I am not sure whether this change is a BC or not. I believe @yuja might have thoughts here.

rdamazio added inline comments.Dec 10 2019, 1:07 PM
mercurial/configitems.py
247 ↗(On Diff #18562)

I'm fine with removing the config option, but will let yuja reply first.
About being BC or not - it depends on how people are parsing the JSON output :) If they're either turning off morestatus for -Tjson calls, or they're ok with an entry with no path, then it should work, but I won't be surprised if it breaks some callers.

rdamazio updated this revision to Diff 18588.Dec 10 2019, 1:15 PM
durin42 added inline comments.
mercurial/configitems.py
247 ↗(On Diff #18562)

I also support not adding a second config option and just adding content that's from the morestatus config.

rdamazio marked an inline comment as done.Dec 12 2019, 1:38 AM
rdamazio edited the summary of this revision. (Show Details)
rdamazio updated this revision to Diff 18625.
rdamazio marked an inline comment as done.Dec 12 2019, 1:39 AM
pulkit accepted this revision.Dec 12 2019, 7:24 AM
This revision is now accepted and ready to land.Dec 12 2019, 7:24 AM

Applying this on top of D7605 failed. So unfortunately you have to rebase again and resend. Also, I think you are pip install black away from preventing such conflicts.

rdamazio updated this revision to Diff 18638.Dec 12 2019, 12:28 PM

Applying this on top of D7605 failed. So unfortunately you have to rebase again and resend. Also, I think you are pip install black away from preventing such conflicts.

I'll queue this based on Pulkit's approval.