Extending 'hg resolve --list' output

Siddharth Agarwal sid at less-broken.com
Thu Jan 7 17:18:43 CST 2016


On 1/7/16 14:42, Matt Mackall wrote:
> On Wed, 2016-01-06 at 17:07 -0800, 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.
> Eep, no. We're hopefully eventually going to have a lot of different kinds of
> conflicts (just about everything that is currently a prompt or abort), so we
> definitely don't want to grow conflict-type specific flags.

Makes sense -- just wanted to put it out as a possible direction.

> So we either need to
> add a column to the default view or add a verbose view.

Adding a column to the default view really seems like it would break 
scripts.

By verbose view do you literally mean 'hg resolve --list --verbose'? 
What guarantees do we provide about the output with --verbose anyway? (I 
know that --debug doesn't have any)

A verbose view would otherwise work but then we'd have to figure out an 
appropriate format that we can extend without worrying about scripts 
breaking when we add more types of conflicts.

I'd like to talk about the --info approach a bit. I'll do it in the 
other subthread.


More information about the Mercurial-devel mailing list