D3988: resolve: add confirm config option

[pulkit (Pulkit Goyal)]

pulkit requested changes to this revision.
pulkit added inline comments.
This revision now requires changes to proceed.

INLINE COMMENTS

> commands.py:4536
>  
> +    if all and confirm and ui.promptchoice(_(b're-merge all unresolved files'
> +                                             b' (yn)?$$ &Yes $$ &No')):

please break this down into two if's. First one `if all and confirm` and the promptchoice in another one.

> configitems.py:193
>  )
> +coreconfigitem('commands', 'resolve.confirm',
> +    default=False,

You need to document this config option. You can have a look at where other options are documented and do something similar.

> test-resolve.t:449
> +  abort: no files or directories specified
> +  (use --all to re-merge all unresolved files)
> +  [255]

this should be user quit rather than this abort.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3988

To: khanchi97, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel