mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
git tests: add debug logs for test failures "no commit dialog was shown"
This commit is contained in:
@@ -138,6 +138,7 @@ class GitApplyChangesProcess(private val project: Project,
|
||||
waitForChangeListManagerUpdate()
|
||||
|
||||
if (mergeCompleted) {
|
||||
LOG.debug("All conflicts resolved, will show commit dialog.")
|
||||
val committed = commit(repository, commit, commitMessage, changeList, successfulCommits,
|
||||
alreadyPicked)
|
||||
if (!committed) return false
|
||||
@@ -198,10 +199,12 @@ class GitApplyChangesProcess(private val project: Project,
|
||||
}
|
||||
val changes = actualList.changes
|
||||
if (changes.isEmpty()) {
|
||||
LOG.debug("No changes in the $actualList. All changes in the CLM: ${changeListManager.allChanges}")
|
||||
alreadyPicked.add(commit)
|
||||
return true
|
||||
}
|
||||
|
||||
LOG.debug("Showing commit dialog for changes: ${changes}")
|
||||
val committed = showCommitDialogAndWaitForCommit(repository, changeList, commitMessage, changes)
|
||||
if (committed) {
|
||||
refreshVfsAndMarkDirty(changes)
|
||||
|
||||
@@ -74,6 +74,7 @@ class GitCherryPickAutoCommitTest : GitCherryPickTest() {
|
||||
cherryPick(commit)
|
||||
|
||||
`assert merge dialog was shown`()
|
||||
`assert commit dialog was shown`()
|
||||
changeListManager.assertChangeListExists("on_master\n\n(cherry picked from commit ${shortHash(commit)})")
|
||||
assertNoNotification()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user