Skip to content
  • Katsunori FUJIWARA's avatar
    rebase: use "commitforceeditor" instead of "ui.edit()" for "--collapse" · 95aab23a806b
    Katsunori FUJIWARA authored
    Before this patch, "rebase --collapse --edit" without "--message" and
    "--logfile" invokes editor twice unexpectedly:
    
      1. explicit "ui.edit()" invocation in rebase extension itself
    
      2. indirect invocation in "localrepository.commit()" with "editor =
         commitforceeditor" assigned by "--edit" option
    
    This patch uses indirect "commitforceeditor" invocation instead of
    "ui.edit()" for "--collapse" without "--message" and "--logfile" to:
    
      - suppress redundant the former invocation
      - ensure editor invocation even when "--edit" is not specified
    95aab23a806b