mercurial: mercurial/templates/map-cmdline.phases@c4dbbaecaad3 (annotated)

rewriteutil: adapt "cannot %s while merging" to work with "change branch of" `rewriteutil.precheck()` creates error messages by inserting a given verb into a sentence. The `hg branch -r` command passes in "change branch of" as the verb. That doesn't work well with "cannot %s while merging" (making it "cannot change branch of while merging"). Let's insert a "changeset" there to make it work better. Building sentences like this seems obviously bad for i18n, but fixing that is out of scope for this series, IMO. Differential Revision: https://phab.mercurial-scm.org/D10530

24907 9570587b6986 template-phases: extend default style instead of duplicating it Yuya Nishihara <yuya@tcha.org> parents: 24853 diff changeset	1	%include map-cmdline.default
34714 f4aeb952ab77 templater: load template fragments from [templates] section in map file Yuya Nishihara <yuya@tcha.org> parents: 24907 diff changeset	2
f4aeb952ab77 templater: load template fragments from [templates] section in map file Yuya Nishihara <yuya@tcha.org> parents: 24907 diff changeset	3	[templates]
38947 f9a98075a37e templates: rename "user" to "luser" defined in default map file (API) Yuya Nishihara <yuya@tcha.org> parents: 34714 diff changeset	4	changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{luser}{ldate}{summary}\n'
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API) Yuya Nishihara <yuya@tcha.org> parents: 34714 diff changeset	5	changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{luser}{ldate}{lfiles}{lfile_copies_switch}{description}\n'

author	Martin von Zweigbergk <martinvonz@google.com>
	Wed, 28 Apr 2021 08:48:10 -0700
changeset 47019	c4dbbaecaad3
parent 38947	f9a98075a37e
permissions	-rw-r--r--