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] Use DiffEditorTitleCustomizer instead of simple titles in GitDefaultMergeDialogCustomizer

Browse Source 
GitOrigin-RevId: a19a62d19f54a61dcc5ba4f5d20050a547599c05
This commit is contained in:
Nikolay Rykunov
2019-11-07 02:40:58 +00:00
committed by intellij-monorepo-bot
parent 199f106c07
commit c6bc09a938
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitDefaultMergeDialogCustomizer.kt
-33
View File
@@ -13,7 +13,6 @@ import com.intellij.openapi.vcs.VcsException
import com.intellij.openapi.vcs.changes.Change
import com.intellij.openapi.vcs.changes.committed.CommittedChangesTreeBrowser
import com.intellij.openapi.vcs.changes.ui.ChangeListViewerDialog
import com.intellij.openapi.vcs.history.VcsRevisionNumber
import com.intellij.openapi.vcs.merge.MergeDialogCustomizer
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.ui.components.JBCheckBox
@@ -91,38 +90,6 @@ open class GitDefaultMergeDialogCustomizer(
return super.getMultipleFileMergeDescription(files)
}
override fun getLeftPanelTitle(file: VirtualFile): String {
val currentBranch = GitRepositoryManager.getInstance(project).getRepositoryForFile(file)?.currentBranchName
return if (currentBranch != null) getDefaultLeftPanelTitleForBranch(currentBranch)
else super.getLeftPanelTitle(file)
}
override fun getRightPanelTitle(file: VirtualFile, revisionNumber: VcsRevisionNumber?): String {
val repository = GitRepositoryManager.getInstance(project).getRepositoryForFile(file)
?: return super.getRightPanelTitle(file, revisionNumber)
val branchBeingMerged = resolveMergeBranch(repository) ?: resolveRebaseOntoBranch(repository)
if (branchBeingMerged != null) {
return getDefaultRightPanelTitleForBranch(branchBeingMerged.branchName, branchBeingMerged.hash)
}
val cherryPickHead = try {
GitRevisionNumber.resolve(project, repository.root, CHERRY_PICK_HEAD)
}
catch (e: VcsException) {
null
}
if (cherryPickHead != null) {
return "<html>Changes from cherry-pick <code>${cherryPickHead.shortRev}</code>"
}
if (revisionNumber is GitRevisionNumber) {
return DiffBundle.message("merge.version.title.their.with.revision", revisionNumber.shortRev)
}
return super.getRightPanelTitle(file, revisionNumber)
}
override fun getTitleCustomizerList(file: FilePath): DiffEditorTitleCustomizerList {
val repository = GitRepositoryManager.getInstance(project).getRepositoryForFile(file) ?: return DEFAULT_CUSTOMIZER_LIST
return when (repository.state) {