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

[cherry-pick] do not attempt changelists operations when changelists are disabled

Browse Source 
GitOrigin-RevId: a3486d25ea4b45acb44522273803b86346c3732e
This commit is contained in:
Julia Beliaeva
2020-10-21 21:16:53 +00:00
committed by intellij-monorepo-bot
parent 50a04bcbc0
commit 7c88d3f4e2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
+6 -3
View File
@@ -98,7 +98,7 @@ class GitApplyChangesProcess(private val project: Project,
val startHash = GitUtil.getHead(repository)
try {
changeListManager.setDefaultChangeList(changeList, true)
if (changeListManager.areChangeListsEnabled()) changeListManager.setDefaultChangeList(changeList, true)
val result = command(repository, commit.id, autoCommit,
listOf(conflictDetector, localChangesOverwrittenDetector, untrackedFilesDetector))
@@ -157,14 +157,17 @@ class GitApplyChangesProcess(private val project: Project,
}
}
finally {
changeListManager.setDefaultChangeList(previousDefaultChangelist, true)
changeListManager.scheduleAutomaticEmptyChangeListDeletion(changeList, true)
if (changeListManager.areChangeListsEnabled()) {
changeListManager.setDefaultChangeList(previousDefaultChangelist, true)
changeListManager.scheduleAutomaticEmptyChangeListDeletion(changeList, true)
}
}
}
return true
}
private fun createChangeList(commitMessage: String, commit: VcsFullCommitDetails): LocalChangeList {
if (!changeListManager.areChangeListsEnabled()) return changeListManager.defaultChangeList
val changeListName = createNameForChangeList(project, commitMessage)
val changeListData = if (preserveCommitMetadata) createChangeListData(commit) else null
return changeListManager.addChangeList(changeListName, commitMessage, changeListData)