mercurial/templates/map-cmdline.bisect
author Andrew Zwicky <andrew.zwicky@gmail.com>
Wed, 17 May 2017 20:51:17 -0500
changeset 32360 0e29ce16ec38
parent 25007 7c324f65e4ef
child 34714 f4aeb952ab77
permissions -rw-r--r--
diffstat: properly count lines starting in '--' or '++' (issue5479) Lines that start in '--' or '++' were previously not counted as deletions or additions in diffstat, resulting in incorrect addition/deletion counts. The bug was present if the start of the line, combined with the diff character resulted in '---' or '+++'. diffstatdata will now track, for each file, if it has moved pas the header section by looking for a line beginning with '@@'. Once that has happened, lines beginning with '-' or '+' will be counted for deletions and additions. Once a line beginning with 'diff' is found, the process starts over.
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
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     3
changeset = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{user}{ldate}{summary}\n'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     4
changeset_quiet = '{lshortbisect} {rev}:{node|short}\n'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     5
changeset_verbose = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     6
changeset_debug = '{fullcset}{lbisect}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     7
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
     8
# 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
     9
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
    10
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
    11
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
    12
                                "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
    13
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
    14
                                    "{bisect|shortbisect}")}'