view mercurial/templates/map-cmdline.status @ 27039:d7517deedf86

filemerge._picktool: only pick from nomerge tools for change/delete conflicts

For --tool or HGMERGE, we could have either:
(a) proceeded with the particular tool, then failed the merge.
(b) chosen to prompt regardless.

We're explicitly choosing (b) here, because it's effectively what we've been
doing so far and helps maintain an easier-to-use interface.

However, in future patches we're going to change the default selection from
'pick changed version' to 'leave unresolved'. That fixes most of the brokenness
involved with choice (b).

%include map-cmdline.default

# Override base templates
changeset = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{summary}{lfiles}\n'
changeset_verbose = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{description}{lfiles}\n'
changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{extras}{description}{lfiles}\n'

# Override the file templates
lfiles = '{if(files,
              label('ui.note log.files',
                    'files:\n'))}{lfile_mods}{lfile_adds}{lfile_copies_switch}{lfile_dels}'

# Exclude copied files, will display those in lfile_copies_switch
lfile_adds  = '{file_adds % "{ifcontains(file, file_copies_switch,
                                         '',
                                         '{lfile_add}')}"}'
lfile_add = '{label("status.added", "A {file}\n")}'

lfile_copies_switch = '{file_copies_switch % "{lfile_copy_orig}{lfile_copy_dest}"}'
lfile_copy_orig = '{label("status.added", "A {name}\n")}'
lfile_copy_dest = '{label("status.copied", "  {source}\n")}'

lfile_mods = '{file_mods % "{label('status.modified', 'M {file}\n')}"}'

lfile_dels = '{file_dels % "{label('status.removed', 'R {file}\n')}"}'