Mercurial > public > mercurial-scm > hg
view mercurial/templates/map-cmdline.bisect @ 27102:f97bb61b51e6 stable
localrepo.commit: check all files for resolve state (issue4972)
Previously we were only checking modified files for their resolve state. But a
file might be unresolved yet not in the modified state. Handle all such cases
properly.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Mon, 30 Nov 2015 16:31:28 -0800 |
parents | 7c324f65e4ef |
children | f4aeb952ab77 |
line wrap: on
line source
%include map-cmdline.default 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}")}'