view mercurial/templates/map-cmdline.compact @ 43114:8197b395710e

destutil: provide hint on rebase+merge for how to specify destination/rev

Without a destination specified, rebase and merge attempt to identify a good
candidate; this fails if there's too many heads, the heads have a bookmark, or
other reasons.

Complicating the issue, users may have specified -t, thinking it means target,
and are confused when the error message says that they need to specify an
explicit rev or explicit destination - they feel like they already have.

Differential Revision: https://phab.mercurial-scm.org/D7024

[templates]
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}]'