view mercurial/templates/map-cmdline.compact @ 32255:7e35d31b41fd

filemerge: add internal merge tool to dump files forcibly

Internal merge tool :dump implies premerge. Therefore, files aren't
dumped, if premerge runs successfully.

This undocumented behavior might confuse users, if they want to always
dump files. But just making :dump omit premerge might cause backward
compatibility issue for existing automation.

This patch adds new internal merge tool :forcedump, which works as
same as :dump, but omits premerge always.

Internal tools annotated with "nomerge" should merge "change and
delete" correctly, but _forcedump() can't. Therefore, it is annotated
with "mergeonly" to always omit premerge, even though it doesn't merge
files actually.

This patch also adds explanation about premerge to :dump, to clarify
how :dump actually works.

BTW, this patch specifies internal tools with "internal:" prefix in
newly added test scenario in test-merge-tools.t, even though this
prefix is already deprecated. This is only for similarity to other
tests in test-merge-tools.t.

ldate = '{label("log.date",
                "{date|isodate}")}'

ldesc = '{label('ui.note log.description',
                      '{desc|strip}')}'
ldescfirst = '{label('ui.note log.description',
                     '{desc|firstline|strip}')}'

changeset = '{lrev}{tags}{bookmarks}{parents}   {lnode}   {ldate}   {luser}\n  {ldescfirst}\n\n'
changeset_quiet = '{lrev}:{lnode}\n'
changeset_verbose = '{lrev}{tags}{parents}   {lnode}   {ldate}   {lauthor}\n  {ldesc}\n\n'
lrev = '{label("log.changeset changeset.{phase}",
              "{rev}")}'
lnode = '{label("log.node",
                "{node|short}")}'
lauthor = '{label("log.user",
                  "{author}")}'
luser = '{label("log.user",
                "{author|user}")}'
start_tags = '['
tag = '{label("log.tag",
              "{tag},")}'
last_tag = '{tag}]'
start_parents = ':'
parent = '{lrev},'
last_parent = '{lrev}'
start_bookmarks = '['
bookmark = '{label("log.bookmark",
                   "{bookmark},")}'
last_bookmark = '{bookmark}]'