[PATCH] resolve: updated help with info about merge tools

[Steve Borho]

On Fri, Oct 15, 2010 at 7:18 AM, Martin Geisler <mg at aragost.com> wrote:
> Mads Kiilerich <mads at kiilerich.com> writes:
>
>> The reference to ui.merge is only one side of the story, so it might
>> be a bit misleading to just tell the simple story. I think it would be
>> nice to have more of the information on
>> http://mercurial.selenic.com/wiki/MergeProgram and
>> http://mercurial.selenic.com/wiki/MergeToolConfiguration available in
>> the help or man page - especially regarding how merge tools are
>> chosen.
>
> Yes, I also think we should put that into a help topic instead -- those
> wiki pages are not that bad, but they are still quite unorganized.
> Having what I will call "proper" documents (help topics for now) will be
> much nicer.
>
>> (A slightly related note: The poor windows users don't know what a man
>> page is and we don't have a good cross-platform way to reference it.
>
> The manpages have been online for a very long time:
>
>  http://mercurial.selenic.com/wiki/ManPages
>
>> Perhaps the man pages could be available as help topics too - and thus
>> also in the hgweb help?)
>
> It's getting a bit circular: the hg(1) man page consists almost
> exclusively of content extracted from docstrings and help topics :)
>
> But we could definitely move the content from the hgrc(5) man to a help
> topic and then build hgrc(5) based on that.
>
> In general, I would like to see more things moved to help topics since
> that gives us a nice and powerful system for processing them. One day, I
> hope we can use all that source to generate both a nice manual (with
> Sphinx), terminal output (with minirst) and man pages (with rst2man).

Is it too late to add command line arguments to merge and resolve:

hg merge --tool=internal:fail
hg resolve --tool=kdiff3 [FILE]

Internally they could just do ui.setconfig('ui', 'merge', opts['tool'])

-- 
Steve Borho