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

git tests: add debug logs for test failures "no changelist for conflicts created"

Browse Source
This commit is contained in:
Kirill Likhodedov
2017-11-19 16:48:30 +03:00
parent d9be11b9db
commit af905259e4
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
@@ -199,8 +199,7 @@ class GitApplyChangesProcess(private val project: Project,
}
val changes = actualList.changes
if (changes.isEmpty()) {
val changesString = changeListManager.changeLists.map { it -> "[${it.name}] ${it.changes}" }
LOG.debug("No changes in the $actualList. All changes in the CLM: $changesString")
LOG.debug("No changes in the $actualList. All changes in the CLM: ${getAllChangesInLogFriendlyPresentation(changeListManager)}")
alreadyPicked.add(commit)
return true
}
@@ -220,6 +219,9 @@ class GitApplyChangesProcess(private val project: Project,
}
}
private fun getAllChangesInLogFriendlyPresentation(changeListManagerEx: ChangeListManagerEx) =
changeListManagerEx.changeLists.map { it -> "[${it.name}] ${it.changes}" }
private fun waitForChangeListManagerUpdate() {
val waiter = CountDownLatch(1)
changeListManager.invokeAfterUpdate({
@@ -252,7 +254,8 @@ class GitApplyChangesProcess(private val project: Project,
private fun removeChangeListIfEmpty(changeList: LocalChangeList) {
val actualList = changeListManager.getChangeList(changeList.id)
if (actualList != null && actualList.changes.isEmpty()) {
LOG.debug("Changelist $actualList is empty, removing.")
LOG.debug("Changelist $actualList is empty, removing. " +
"All changes in the CLM: ${getAllChangesInLogFriendlyPresentation(changeListManager)}")
changeListManager.removeChangeList(actualList)
}
}