MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Allow to reword/rebase in the detached HEAD state

Browse Source
This commit is contained in:
Kirill Likhodedov
2017-08-29 18:18:57 +03:00
parent 76c1f21f1e
commit b681e943f3
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/rebase/GitCommitEditingAction.kt
+12 -8
View File
@@ -15,9 +15,10 @@
*/
package git4idea.rebase
import com.intellij.dvcs.repo.Repository
import com.intellij.dvcs.repo.Repository.State.*
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.project.DumbAwareAction
import com.intellij.openapi.ui.Messages
@@ -34,6 +35,7 @@ import git4idea.GitUtil.getRepositoryManager
*/
abstract class GitCommitEditingAction : DumbAwareAction() {
private val LOG = logger<GitCommitEditingAction>()
private val COMMIT_NOT_IN_HEAD = "The commit is not in the current branch"
override fun update(e: AnActionEvent) {
@@ -138,13 +140,15 @@ abstract class GitCommitEditingAction : DumbAwareAction() {
protected fun prohibitRebaseDuringRebase(e: AnActionEvent, operation: String) {
if (e.presentation.isEnabledAndVisible) {
val state = getRepository(e).state
if (state != Repository.State.NORMAL) {
e.presentation.isEnabled = false
e.presentation.description = when (state) {
Repository.State.REBASING -> "Can't $operation during rebase"
Repository.State.MERGING -> "Can't $operation during merge"
Repository.State.DETACHED -> "Can't $operation in detached HEAD state"
else -> throw IllegalStateException("Unexpected state: $state")
if (state == NORMAL || state == DETACHED) return
e.presentation.isEnabled = false
e.presentation.description = when (state) {
REBASING -> "Can't $operation during rebase"
MERGING -> "Can't $operation during merge"
else -> {
LOG.error(IllegalStateException("Unexpected state: $state"))
"Can't $operation during $state"
}
}
}