Mercurial > hg

annotate mercurial/templates/map-cmdline.bisect @ 26572:c7850af6bb75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge._merge: drop no longer necessary 'if r:' check Cleanup from an earlier patch to make premerge be directly called from the main filemerge function.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 08 Oct 2015 14:16:19 -0700
parents 7c324f65e4ef
children f4aeb952ab77
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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}")}'