comparison mercurial/help/config.txt @ 22252:de783f2403c4

transplant: change "editform" to distinguish merge commits from others "editform" argument for "getcommiteditor" is decided according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND This patch newly adds "normal" and "merge" as ROUTE, to distinguish merge commits from other. This patch adds 4 test patterns to test combination of "merge"(x2) and "--continue"(x2).
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 16 Aug 2014 10:43:59 +0900
parents d0d3e5c6eb3c
children b1fc7ea5bb01
comparison
equal deleted inserted replaced
22251:d0d3e5c6eb3c 22252:de783f2403c4
415 - ``changeset.rebase.merge`` for :hg:`rebase` on merges 415 - ``changeset.rebase.merge`` for :hg:`rebase` on merges
416 - ``changeset.rebase.normal`` for :hg:`rebase` on other 416 - ``changeset.rebase.normal`` for :hg:`rebase` on other
417 - ``changeset.shelve.shelve`` for :hg:`shelve` 417 - ``changeset.shelve.shelve`` for :hg:`shelve`
418 - ``changeset.tag.add`` for :hg:`tag` without ``--remove`` 418 - ``changeset.tag.add`` for :hg:`tag` without ``--remove``
419 - ``changeset.tag.remove`` for :hg:`tag --remove` 419 - ``changeset.tag.remove`` for :hg:`tag --remove`
420 - ``changeset.transplant`` for :hg:`transplant` 420 - ``changeset.transplant.merge`` for :hg:`transplant` on merges
421 - ``changeset.transplant.normal`` for :hg:`transplant` on other
421 422
422 These dot-separated lists of names are treated as hierarchical ones. 423 These dot-separated lists of names are treated as hierarchical ones.
423 For example, ``changeset.tag.remove`` customizes the commit message 424 For example, ``changeset.tag.remove`` customizes the commit message
424 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the 425 only for :hg:`tag --remove`, but ``changeset.tag`` customizes the
425 commit message for :hg:`tag` regardless of ``--remove`` option. 426 commit message for :hg:`tag` regardless of ``--remove`` option.