annotate mercurial/templates/map-cmdline.compact @ 45347:1aef38d973e8

merge: pass mergeresult obj in _forgetremoved() (API) Instead of returning a dict of actions and then updating it, let's pass the object directly and update it there. This makes `updateactions()` on mergeresult unused and this patch removes that. After this patch, we have couple of methods left on mergeresult class which still exposes the internal dict based action storage. Differential Revision: https://phab.mercurial-scm.org/D8889
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 05 Aug 2020 16:52:51 +0530
parents f4aeb952ab77
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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}]'