mercurial/templates/map-cmdline.bisect
author Gregory Szorc <gregory.szorc@gmail.com>
Sat, 02 Nov 2019 14:17:48 -0700
branchstable
changeset 43394 d359dfc15aca
parent 38947 f9a98075a37e
permissions -rw-r--r--
fsmonitor: handle unicode keys in tuples In Python 3, keys in the bset tuple are typically str, not bytes. PyBytes_AsString() would return NULL. But we weren't checking the return value and this would lead to a segfault. This commit makes the code type and Python version aware. The Python version specific code is to allow us to utilize a modern API for converting str -> char* without having to allocate an extra PyObject. FWIW I wanted to assume that keys were always str. However, there appear to be some bytes keys in some cases. I haven't debugged this further. Differential Revision: https://phab.mercurial-scm.org/D7210
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25007
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     1
%include map-cmdline.default
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     2
34714
f4aeb952ab77 templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents: 25007
diff changeset
     3
[templates]
38947
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34714
diff changeset
     4
changeset = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{luser}{ldate}{summary}\n'
25007
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     5
changeset_quiet = '{lshortbisect} {rev}:{node|short}\n'
38947
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34714
diff changeset
     6
changeset_verbose = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{luser}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34714
diff changeset
     7
changeset_debug = '{fullcset}{lbisect}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{luser}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n'
25007
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     8
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     9
# We take the zeroth word in order to omit "(implicit)" in the label
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
    10
bisectlabel = ' bisect.{word('0', bisect)}'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
    11
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
    12
lbisect ='{label("log.bisect{if(bisect, bisectlabel)}",
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
    13
                                "bisect:      {bisect}\n")}'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
    14
lshortbisect ='{label("log.bisect{if(bisect, bisectlabel)}",
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
    15
                                    "{bisect|shortbisect}")}'