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

[gig] implement fie history via log tab

Browse Source 
GitOrigin-RevId: a0196b3368ec37fa386c80b62709ca0fa3986844
This commit is contained in:
Ivan Semenov
2025-06-12 16:35:47 +00:00
committed by intellij-monorepo-bot
parent 1fcbd4052f
commit a9f3e5199f
3 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryUtil.kt
+24
View File
@@ -20,6 +20,7 @@ import com.intellij.vcs.log.impl.VcsChangesMerger
import com.intellij.vcs.log.util.VcsLogUtil
import com.intellij.vcs.log.visible.VisiblePack
import com.intellij.vcs.log.visible.filters.VcsLogFilterObject
import com.intellij.vcs.log.visible.filters.matches
import com.intellij.vcsUtil.VcsUtil
import org.jetbrains.annotations.ApiStatus.Internal
@@ -123,6 +124,29 @@ object FileHistoryUtil {
return VcsLogFilterObject.fromRoots(forRootFilter)
}
@Internal
fun getCorrectedPath(project: Project, path: FilePath, isRevisionHistory: Boolean): FilePath {
if (isRevisionHistory) return path
return VcsUtil.getLastCommitPath(project, path)
}
@Internal
fun createHashFilter(hash: Hash?, root: VirtualFile): VcsLogFilter {
if (hash == null) {
return VcsLogFilterObject.fromBranch(VcsLogUtil.HEAD)
}
return VcsLogFilterObject.fromCommit(CommitId(hash, root))
}
@Internal
fun matches(filters: VcsLogFilterCollection, pathsFilter: VcsLogFilter, hashFilter: VcsLogFilter): Boolean {
if (!filters.matches(hashFilter.key, pathsFilter.key)) {
return false
}
return filters.get(pathsFilter.key) == pathsFilter && filters.get(hashFilter.key) == hashFilter
}
private class MyVcsChangesMerger(
private val commit: Hash,
parentCommits: List<Hash>,
platform/vcs-log/impl/src/com/intellij/vcs/log/history/VcsLogFileHistoryUiProvider.kt
+25 -29
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.vcs.history.VcsRevisionNumber
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.vcs.log.*
import com.intellij.vcs.log.data.VcsLogStorage
import com.intellij.vcs.log.history.VcsLogFileHistoryUiProvider.Companion.jumpToNearestCommit
import com.intellij.vcs.log.impl.*
import com.intellij.vcs.log.impl.VcsLogNavigationUtil.jumpToGraphRow
import com.intellij.vcs.log.statistics.VcsLogUsageTriggerCollector
@@ -19,10 +20,10 @@ import com.intellij.vcs.log.util.VcsLogUtil
import com.intellij.vcs.log.visible.VisiblePack
import com.intellij.vcs.log.visible.filters.VcsLogFilterObject
import com.intellij.vcs.log.visible.filters.matches
import com.intellij.vcsUtil.VcsUtil
import org.jetbrains.annotations.ApiStatus
internal interface VcsLogFileHistoryUiProvider {
@ApiStatus.Internal
interface VcsLogFileHistoryUiProvider {
fun canShowFileHistory(project: Project, paths: Collection<FilePath>, revisionNumber: VcsRevisionNumber?): Boolean
fun showFileHistoryUi(project: Project, paths: Collection<FilePath>, revisionNumber: VcsRevisionNumber?, selectRow: Boolean = true): VcsLogUiEx?
@@ -32,6 +33,24 @@ internal interface VcsLogFileHistoryUiProvider {
it.canShowFileHistory(project, paths, revisionNumber)
}
}
fun VcsLogUiEx.jumpToNearestCommit(storage: VcsLogStorage, hash: Hash, root: VirtualFile, silently: Boolean) {
jumpTo(hash, { visiblePack: VisiblePack, h: Hash? ->
if (!storage.containsCommit(CommitId(h!!, root))) return@jumpTo VcsLogUiEx.COMMIT_NOT_FOUND
val commitIndex = storage.getCommitIndex(h, root)
var rowIndex = visiblePack.visibleGraph.getVisibleRowIndex(commitIndex)
if (rowIndex == null) {
rowIndex = findVisibleAncestorRow(commitIndex, visiblePack)
}
rowIndex ?: VcsLogUiEx.COMMIT_DOES_NOT_MATCH
}, SettableFuture.create(), silently, true)
}
fun triggerFileHistoryUsage(project: Project, paths: Collection<FilePath>, hash: Hash?) {
val kind = if (paths.size > 1) "multiple" else if (paths.first().isDirectory) "folder" else "file"
VcsLogUsageTriggerCollector.triggerFileHistoryUsage(project, kind, hash != null)
}
}
}
@@ -48,7 +67,7 @@ private object VcsLogDirectoryHistoryProvider : VcsLogFileHistoryUiProvider {
val hash = revisionNumber?.asString()?.let { HashImpl.build(it) }
val root = VcsLogUtil.getActualRoot(project, paths.first())!!
triggerFileHistoryUsage(project, paths, hash)
VcsLogFileHistoryUiProvider.triggerFileHistoryUsage(project, paths, hash)
val logManager = VcsProjectLog.getInstance(project).logManager as? IdeVcsLogManager ?: return null
@@ -89,7 +108,7 @@ private object VcsLogSingleFileHistoryProvider : VcsLogFileHistoryUiProvider {
if (!isNewHistoryEnabled() || paths.size != 1) return false
val root = VcsLogUtil.getActualRoot(project, paths.single()) ?: return false
val correctedPath = getCorrectedPath(project, paths.single(), revisionNumber != null)
val correctedPath = FileHistoryUtil.getCorrectedPath(project, paths.single(), revisionNumber != null)
if (correctedPath.isDirectory) return false
val logProvider = VcsProjectLog.getInstance(project).dataManager?.logProviders?.get(root)
@@ -100,12 +119,12 @@ private object VcsLogSingleFileHistoryProvider : VcsLogFileHistoryUiProvider {
if (paths.size != 1) return null
val root = VcsLogUtil.getActualRoot(project, paths.first())!!
val path = getCorrectedPath(project, paths.single(), revisionNumber != null)
val path = FileHistoryUtil.getCorrectedPath(project, paths.single(), revisionNumber != null)
if (path.isDirectory) return null
val hash = revisionNumber?.asString()?.let { HashImpl.build(it) }
triggerFileHistoryUsage(project, paths, hash)
VcsLogFileHistoryUiProvider.triggerFileHistoryUsage(project, paths, hash)
val logManager = VcsProjectLog.getInstance(project).logManager!!
@@ -138,27 +157,4 @@ private fun selectRowWhenOpen(logManager: VcsLogManager, hash: Hash?, root: Virt
else if (firstTime) {
ui.jumpToGraphRow(0, true, true)
}
}
private fun VcsLogUiEx.jumpToNearestCommit(storage: VcsLogStorage, hash: Hash, root: VirtualFile, silently: Boolean) {
jumpTo(hash, { visiblePack: VisiblePack, h: Hash? ->
if (!storage.containsCommit(CommitId(h!!, root))) return@jumpTo VcsLogUiEx.COMMIT_NOT_FOUND
val commitIndex = storage.getCommitIndex(h, root)
var rowIndex = visiblePack.visibleGraph.getVisibleRowIndex(commitIndex)
if (rowIndex == null) {
rowIndex = findVisibleAncestorRow(commitIndex, visiblePack)
}
rowIndex ?: VcsLogUiEx.COMMIT_DOES_NOT_MATCH
}, SettableFuture.create(), silently, true)
}
private fun getCorrectedPath(project: Project, path: FilePath, isRevisionHistory: Boolean): FilePath {
if (isRevisionHistory) return path
return VcsUtil.getLastCommitPath(project, path)
}
private fun triggerFileHistoryUsage(project: Project, paths: Collection<FilePath>, hash: Hash?) {
val kind = if (paths.size > 1) "multiple" else if (paths.first().isDirectory) "folder" else "file"
VcsLogUsageTriggerCollector.triggerFileHistoryUsage(project, kind, hash != null)
}
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.kt
+3
View File
@@ -62,10 +62,13 @@ abstract class VcsProjectLog internal constructor() { // not an interface due to
abstract fun showRevisionInMainLog(hash: Hash)
@Internal
abstract fun canShowFileHistory(paths: Collection<FilePath>, revisionNumber: VcsRevisionNumber?): Boolean
@Internal
abstract fun openFileHistory(paths: Collection<FilePath>, revisionNumber: VcsRevisionNumber?)
@Internal
abstract fun openFileHistory(paths: Collection<FilePath>, revisionNumber: VcsRevisionNumber?, revisionToSelect: VcsRevisionNumber)
/**