mercurial/templates/map-cmdline.compact
author Pulkit Goyal <pulkit@yandex-team.ru>
Wed, 10 Oct 2018 17:36:59 +0300
changeset 40337 cb516a854bc7
parent 34714 f4aeb952ab77
permissions -rw-r--r--
narrow: only send the narrowspecs back if ACL in play I am unable to think why we need to send narrowspecs back from the server. The current state adds a 'narrow:spec' part to each changegroup which is generated when narrow extension is enabled. So we are sending narrowspecs on pull also. There is a problem with sending the narrowspecs the way we are doing it right now. We add include and exclude as parameter of the 'narrow:spec' bundle2 part. The the len of include or exclude string increase 255 which is obvious while working on large repos, bundle2 generation code breaks. For more on that refer issue5952 on bugzilla. I was thinking why we need to send the narrowspecs back, and deleted the 'narrow:spec' bundle2 part generation code and found that only narrow-acl test has some failure. With this patch, we will only send the 'narrow:spec' bundle2 part if ACL is enabled because the original narrowspecs in those cases can be a subset of narrowspecs user requested. There are phase related output change in couple of tests. The output change shows that we are now dealing in public phases completely. So maybe sending the narrow:spec bundle2 part was preventing phases being exchanged or phase bundle2 data being applied. Differential Revision: https://phab.mercurial-scm.org/D4931
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}]'