##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816
Yuya Nishihara - - Load All Authors

File last commit:

r38982:f9a98075 default
r45835:0c849f01 default
Show More
map-cmdline.bisect
15 lines | 864 B | text/plain | TextLexer
/ mercurial / templates / map-cmdline.bisect
History | Source | Raw |Copy content |Copy permalink
Jordi Gutiérrez Hermoso
map-cmdline.bisect: rewrite to just %include the default template...
 r25007 %include map-cmdline.default
Yuya Nishihara
templater: load template fragments from [templates] section in map file...
 r34715 [templates]
Yuya Nishihara
templates: rename "user" to "luser" defined in default map file (API)...
 r38982 changeset = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{luser}{ldate}{summary}\n'
Jordi Gutiérrez Hermoso
map-cmdline.bisect: rewrite to just %include the default template...
 r25007 changeset_quiet = '{lshortbisect} {rev}:{node|short}\n'
Yuya Nishihara
templates: rename "user" to "luser" defined in default map file (API)...
 r38982 changeset_verbose = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{luser}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
changeset_debug = '{fullcset}{lbisect}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{luser}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n'
Jordi Gutiérrez Hermoso
map-cmdline.bisect: rewrite to just %include the default template...
 r25007
# 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}")}'