Page MenuHomePhabricator

status: make unresolved files always be in the morestatus structured output
ClosedPublic

Authored by rdamazio on Dec 14 2019, 12:49 AM.

Details

Summary

We don't know the status of those files, only that they're unresolved, so
we don't output the status for those - any code parsing this will have to be
tolerant to that.

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 14 2019, 12:49 AM
rdamazio updated this revision to Diff 18846.Dec 18 2019, 12:17 AM
pulkit added a subscriber: pulkit.Dec 18 2019, 2:21 AM
pulkit added inline comments.
mercurial/cmdutil.py
877

IIUC, if it's in one of the states that were not requested for display, then we should not display the file, right?

rdamazio marked an inline comment as done.Dec 19 2019, 2:46 AM
rdamazio added inline comments.
mercurial/cmdutil.py
877

We don't display its status indeed.
They did request morestatus / verbose output, so plain old hg status still won't output it.

pulkit accepted this revision.Dec 19 2019, 12:09 PM
This revision is now accepted and ready to land.Dec 19 2019, 12:09 PM