mercurial/templates/map-cmdline.compact
author Pulkit Goyal <7895pulkit@gmail.com>
Wed, 09 Sep 2020 16:49:19 +0530
changeset 45524 6877b0ee5f9d
parent 34714 f4aeb952ab77
permissions -rw-r--r--
mergestate: introduce a new ACTION_KEEP_NEW `ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this KEEP, what was the state of things. In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files which are kept absent in the working directory. There is another special case where we keep the file when it's not present on both ancestor and remote side. We introduce a dedicated action for that. The goal is to use these information to make bid merge smarter. Differential Revision: https://phab.mercurial-scm.org/D9002
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
34714
f4aeb952ab77 templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents: 28827
diff changeset
     1
[templates]
28827
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
     2
ldate = '{label("log.date",
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
     3
                "{date|isodate}")}'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
     4
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
     5
ldesc = '{label('ui.note log.description',
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
     6
                      '{desc|strip}')}'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
     7
ldescfirst = '{label('ui.note log.description',
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
     8
                     '{desc|firstline|strip}')}'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
     9
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    10
changeset = '{lrev}{tags}{bookmarks}{parents}   {lnode}   {ldate}   {luser}\n  {ldescfirst}\n\n'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    11
changeset_quiet = '{lrev}:{lnode}\n'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    12
changeset_verbose = '{lrev}{tags}{parents}   {lnode}   {ldate}   {lauthor}\n  {ldesc}\n\n'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    13
lrev = '{label("log.changeset changeset.{phase}",
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    14
              "{rev}")}'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    15
lnode = '{label("log.node",
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    16
                "{node|short}")}'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    17
lauthor = '{label("log.user",
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    18
                  "{author}")}'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    19
luser = '{label("log.user",
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    20
                "{author|user}")}'
1908
be71c04d62c0 print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1907
diff changeset
    21
start_tags = '['
28827
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    22
tag = '{label("log.tag",
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    23
              "{tag},")}'
1908
be71c04d62c0 print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1907
diff changeset
    24
last_tag = '{tag}]'
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    25
start_parents = ':'
28827
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    26
parent = '{lrev},'
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    27
last_parent = '{lrev}'
13933
3d83c7d70a98 compact style: show bookmarks in the same manner as tags
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset
    28
start_bookmarks = '['
28827
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    29
bookmark = '{label("log.bookmark",
1e184241de51 compact: add color labels to -Tcompact
timeless <timeless@mozdev.org>
parents: 13933
diff changeset
    30
                   "{bookmark},")}'
13933
3d83c7d70a98 compact style: show bookmarks in the same manner as tags
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset
    31
last_bookmark = '{bookmark}]'