mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
7a8c1645ce
"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 "merge" as ROUTE, to distinguish merge commits from other. This patch passes bool as "ctxorbool" to "mergeeditform", because working context has always 2 parents at this point. Dropping the second parent of non-merging commits is executed in "concludenode". Unlike other patches in this series (e.g. for "hg commit"), this patch doesn't add "normal.normal"/"normal.merge" style ROUTEs, because there is no "merge" case in "collapse" ROUTE. |
||
|---|---|---|
| .. | ||
| common.txt | ||
| config.txt | ||
| dates.txt | ||
| diffs.txt | ||
| environment.txt | ||
| extensions.txt | ||
| filesets.txt | ||
| glossary.txt | ||
| hg.1.txt | ||
| hgignore.5.txt | ||
| hgignore.txt | ||
| hgrc.5.txt | ||
| hgweb.txt | ||
| merge-tools.txt | ||
| multirevs.txt | ||
| patterns.txt | ||
| phases.txt | ||
| revisions.txt | ||
| revsets.txt | ||
| subrepos.txt | ||
| templates.txt | ||
| urls.txt | ||