view mercurial/templates/map-cmdline.bisect @ 38220:ad50f0399e1e

graft: correct documentation about options can be reapplied Now options --user and --date can be reapplied after we hit a conflict. Differential Revision: https://phab.mercurial-scm.org/D3678
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 02 Jun 2018 15:55:28 +0530
parents f4aeb952ab77
children f9a98075a37e
line wrap: on
line source

%include map-cmdline.default

[templates]
changeset = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{user}{ldate}{summary}\n'
changeset_quiet = '{lshortbisect} {rev}:{node|short}\n'
changeset_verbose = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
changeset_debug = '{fullcset}{lbisect}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n'

# We take the zeroth word in order to omit "(implicit)" in the label
bisectlabel = ' bisect.{word('0', bisect)}'

lbisect ='{label("log.bisect{if(bisect, bisectlabel)}",
                                "bisect:      {bisect}\n")}'
lshortbisect ='{label("log.bisect{if(bisect, bisectlabel)}",
                                    "{bisect|shortbisect}")}'