mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[cherry-pick] always auto-commit cherry-pick when changelists are disabled
GitOrigin-RevId: fcdabe9bf7ae50876ba18461d299223b569e896d
This commit is contained in:
committed by
intellij-monorepo-bot
parent
7c88d3f4e2
commit
ada90ecf95
@@ -87,6 +87,7 @@ class GitApplyChangesProcess(private val project: Project,
|
||||
commits: List<VcsFullCommitDetails>,
|
||||
successfulCommits: MutableList<VcsFullCommitDetails>,
|
||||
alreadyPicked: MutableList<VcsFullCommitDetails>): Boolean {
|
||||
val doAutoCommit = autoCommit || !changeListManager.areChangeListsEnabled()
|
||||
for (commit in commits) {
|
||||
val conflictDetector = GitSimpleEventDetector(CHERRY_PICK_CONFLICT)
|
||||
val localChangesOverwrittenDetector = GitSimpleEventDetector(LOCAL_CHANGES_OVERWRITTEN_BY_CHERRY_PICK)
|
||||
@@ -100,11 +101,11 @@ class GitApplyChangesProcess(private val project: Project,
|
||||
try {
|
||||
if (changeListManager.areChangeListsEnabled()) changeListManager.setDefaultChangeList(changeList, true)
|
||||
|
||||
val result = command(repository, commit.id, autoCommit,
|
||||
val result = command(repository, commit.id, doAutoCommit,
|
||||
listOf(conflictDetector, localChangesOverwrittenDetector, untrackedFilesDetector))
|
||||
|
||||
if (result.success()) {
|
||||
if (autoCommit) {
|
||||
if (doAutoCommit) {
|
||||
refreshChangedVfs(repository, startHash)
|
||||
successfulCommits.add(commit)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user