view mercurial/templates/map-cmdline.show @ 45278:0c849f0166c2

merge: introduce hasconflicts() on mergeresult object

This and upcoming patches will improve the mergeresult object making it more
powerful and provide clean APIs for various things. Doing this will clean up the
core merge code which is present in `update()` a bit.

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

# TODO there are a few deficiencies in this file:
# * The "namespace" of the labels needs to be worked out. We currently
#   piggyback on existing values so color works.

%include map-cmdline.default

[templates]
showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, nodelen)}\n'

showwork = '{cset_shortnode}{namespaces % cset_namespace} {cset_shortdesc}'
showstack = '{showwork}'

cset_shortnode = '{labelcset(shortest(node, nodelen))}'

# Treat branch and tags specially so we don't display "default" or "tip"
cset_namespace = '{ifeq(namespace, "branches", names_branches, ifeq(namespace, "tags", names_tags, names_others))}'
names_branches = '{ifeq(branch, "default", "", " ({label('log.{colorname}', branch)})")}'
names_tags = '{if(filter_tags(names),
                  " ({label('log.{colorname}', join(filter_tags(names), ' '))})")}'
names_others = '{if(names, " ({label('log.{colorname}', join(names, ' '))})")}'

cset_shortdesc = '{label("log.description", desc|firstline)}'

[templatealias]
filter_tags(names) = filter(names, ifeq(name, 'tip', '', name))