annotate mercurial/templates/map-cmdline.compact @ 35011:a2dfc723b6b5

bundle: allow bundlerepo to support alternative manifest implementations With our treemanifest logic, the manifests are no longer transported as part of the changegroup and are no longer stored in a revlog. This means the self.manifestlog line in bundlerepo.filestart no longer calls _constructmanifest, and therefore does not consume the manifest portion of the changegroup, which means filestart is not populated and we result in an infinite loop. The fix is to make filestart aware that self.manifestlog might not consume the changegroup part, and consume it manually if necessary. There's currently no way to test this in core, but our treemanifest extension has tests to cover this. Differential Revision: https://phab.mercurial-scm.org/D1329
author Durham Goode <durham@fb.com>
date Tue, 07 Nov 2017 10:16:53 -0800
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}]'