Skip to content
  • Katsunori FUJIWARA's avatar
    commit: change "editform" to distinguish merge commits from others · 75618a223e18
    Katsunori FUJIWARA authored
    "editform" argument for "getcommiteditor" is decided according to the
    format below:
    
      COMMAND[.ROUTE]
    
      - COMMAND: name of command
      - ROUTE: name of route, if there are two or more routes in COMMAND
    
    This patch uses "normal.normal" and "normal.merge" as ROUTE of
    "editform" instead of "normal", to distinguish merge commits from
    others in "hg commit" without "--amend" case.
    
    This patch assumes "editform" variations for "hg commit" below:
    
        commit.normal.normal
        commit.normal.merge
        commit.amend.normal
        commit.amend.merge
    
    "mergeeditform" is factored out for subsequent patches. It takes
    "ctxorbool" argument, because context object can't be passed in some
    cases.
    75618a223e18