Extending 'hg resolve --list' output

[Pierre-Yves David]

On 01/07/2016 11:22 PM, Siddharth Agarwal wrote:
> On 1/7/16 13:54, Pierre-Yves David wrote:
>>
>>
>> On 01/07/2016 01:07 AM, Siddharth Agarwal wrote:
>>> Now that 'hg resolve --list' also lists change/delete conflicts, it
>>> would be cool for 'hg resolve --list' to be able to tell you when a
>>> conflict is a change/delete one.
>>>
>>> What should the UI for that look like?
>>>
>>> We need to still use the 'U' and 'R' letters since whether the conflict
>>> is a change/delete conflict is completely orthogonal to that.
>>>
>>> One idea is to just add a flag like --changedelete, similar to hg status
>>> --copies.
>>>
>>> Eric Sumner had the idea that maybe hg resolve --list should have an
>>> extended output (maybe with corresponding JSON template?) that prints
>>> out (partial?) file nodes as well, plus possibly additional flags,
>>> information about renames, etc.
>>
>>
>> This looks like something that could belong to the "merge info" idea.
>
> Hmm, maybe.
>
> Will 'hg resolve --info --all' work? I assume it would.

I can't see why it would not. probably not very digestable for human, 
but machine would LOVE it.

> How rigid/parseable do we want the output to be there? Seems like the
> current proposal for 'hg resolve --info' is more like 'hg summary' than
> 'hg resolve --list'. 'hg summary' isn't very parser-friendly.
>
> Would adding a JSON template be enough here?

we definitly want to json al the things anyway. Json formater are 
already quite mature and can do both text and json easy. I remember 
converting the perf extension to it easily.

Cheers,

-- 
Pierre-Yves David