From 7c88d3f4e227a448edd377548eb10a45e1e29af1 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 20 Oct 2020 01:43:06 +0300 Subject: [PATCH] [cherry-pick] do not attempt changelists operations when changelists are disabled GitOrigin-RevId: a3486d25ea4b45acb44522273803b86346c3732e --- plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt index 39fa6b393958..b9c3ab4960f4 100644 --- a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt +++ b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt @@ -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)