diff --git a/platform/lvcs-impl/api-dump.txt b/platform/lvcs-impl/api-dump.txt index 298f9ad84885..5137e4aba44d 100644 --- a/platform/lvcs-impl/api-dump.txt +++ b/platform/lvcs-impl/api-dump.txt @@ -1,46 +1,3 @@ -f:com.intellij.history.core.ByteContentRetriever -- (com.intellij.history.integration.IdeaGateway,com.intellij.history.core.LocalHistoryFacade,com.intellij.openapi.vfs.VirtualFile,com.intellij.history.FileRevisionTimestampComparator):V -- getResult():B[] -c:com.intellij.history.core.ChangeList -- (com.intellij.history.core.ChangeListStorage):V -- f:accept(com.intellij.history.core.changes.ChangeVisitor):V -- f:addChange(com.intellij.history.core.changes.Change):V -- f:beginChangeSet():V -- f:close():V -- f:endChangeSet(java.lang.String,com.intellij.history.ActivityId):com.intellij.history.core.changes.ChangeSet -- f:force():V -- f:forceBeginChangeSet():com.intellij.history.core.changes.ChangeSet -- f:getChangesInTests():java.util.List -- f:iterChanges():java.lang.Iterable -- f:nextId():J -- f:purgeObsolete(J):V -- f:setIntervalBetweenActivities(I):V -com.intellij.history.core.ChangeListStorage -- a:close():V -- a:force():V -- a:nextId():J -- a:purge(J,I,com.intellij.util.Consumer):V -- a:readPrevious(I,it.unimi.dsi.fastutil.ints.IntSet):com.intellij.history.core.ChangeSetHolder -- a:writeNextSet(com.intellij.history.core.changes.ChangeSet):V -f:com.intellij.history.core.ChangeListStorageImpl -- com.intellij.history.core.ChangeListStorage -- (java.nio.file.Path):V -- close():V -- force():V -- nextId():J -- purge(J,I,com.intellij.util.Consumer):V -- readPrevious(I,it.unimi.dsi.fastutil.ints.IntSet):com.intellij.history.core.ChangeSetHolder -- writeNextSet(com.intellij.history.core.changes.ChangeSet):V -*c:com.intellij.history.core.ChangeProcessorBase -- (java.lang.String,com.intellij.history.core.HistoryPathFilter,kotlin.jvm.functions.Function1):V -- process(com.intellij.history.core.changes.ChangeSet,com.intellij.history.core.changes.Change,java.lang.String):V -f:com.intellij.history.core.ChangeSetHolder -- java.lang.Record -- (I,com.intellij.history.core.changes.ChangeSet):V -- changeSet():com.intellij.history.core.changes.ChangeSet -- f:equals(java.lang.Object):Z -- f:hashCode():I -- id():I a:com.intellij.history.core.Content - ():V - equals(java.lang.Object):Z @@ -50,16 +7,6 @@ a:com.intellij.history.core.Content - a:isAvailable():Z - a:release():V - write(java.io.DataOutput):V -f:com.intellij.history.core.DataStreamUtil -- ():V -- s:readChange(java.io.DataInput):com.intellij.history.core.changes.Change -- s:readEntry(java.io.DataInput):com.intellij.history.core.tree.Entry -- s:readString(java.io.DataInput):java.lang.String -- s:readStringOrNull(java.io.DataInput):java.lang.String -- s:writeChange(java.io.DataOutput,com.intellij.history.core.changes.Change):V -- s:writeEntry(java.io.DataOutput,com.intellij.history.core.tree.Entry):V -- s:writeString(java.io.DataOutput,java.lang.String):V -- s:writeStringOrNull(java.io.DataOutput,java.lang.String):V *f:com.intellij.history.core.HistoryPathFilter - *sf:Companion:com.intellij.history.core.HistoryPathFilter$Companion - f:affectsMatching(java.lang.String):Z @@ -68,27 +15,19 @@ f:com.intellij.history.core.DataStreamUtil - f:getMatcher():com.intellij.psi.codeStyle.MinusculeMatcher *f:com.intellij.history.core.HistoryPathFilter$Companion - f:create(java.lang.String,com.intellij.openapi.project.Project):com.intellij.history.core.HistoryPathFilter -com.intellij.history.core.LabelImpl -- a:getByteContent(com.intellij.history.core.tree.RootEntry,java.lang.String):com.intellij.history.ByteContent -- a:getLabelChangeId():J c:com.intellij.history.core.LocalHistoryFacade - f:accept(com.intellij.history.core.changes.ChangeVisitor):V - f:addChangeInTests(com.intellij.history.core.changes.StructuralChange):V - f:addListener(com.intellij.history.core.LocalHistoryFacade$Listener,com.intellij.openapi.Disposable):V - f:beginChangeSet():V -- f:contentChanged(java.lang.String,com.intellij.history.core.Content,J):V -- p:createStorage():com.intellij.history.core.ChangeListStorage - f:created(java.lang.String,Z):V - f:deleted(java.lang.String,com.intellij.history.core.tree.Entry):V - f:endChangeSet(java.lang.String):V - f:endChangeSet(java.lang.String,com.intellij.history.ActivityId):V - bs:endChangeSet$default(com.intellij.history.core.LocalHistoryFacade,java.lang.String,com.intellij.history.ActivityId,I,java.lang.Object):V - f:forceBeginChangeSet():V -- f:getChangeListInTests():com.intellij.history.core.ChangeList - f:moved(java.lang.String,java.lang.String):V - f:putLabelInTests(com.intellij.history.core.changes.PutLabelChange):V -- f:putSystemLabel(java.lang.String,java.lang.String,I):com.intellij.history.core.LabelImpl -- f:putUserLabel(java.lang.String,java.lang.String):com.intellij.history.core.LabelImpl - f:readOnlyStatusChanged(java.lang.String,Z):V - f:removeListener(com.intellij.history.core.LocalHistoryFacade$Listener):V - f:renamed(java.lang.String,java.lang.String):V @@ -122,20 +61,6 @@ f:com.intellij.history.core.RevisionsCollector - ():V - s:collect(com.intellij.history.core.LocalHistoryFacade,com.intellij.history.core.tree.RootEntry,java.lang.String,java.lang.String):java.util.List - s:collect(com.intellij.history.core.LocalHistoryFacade,com.intellij.history.core.tree.RootEntry,java.lang.String,java.lang.String,com.intellij.history.core.HistoryPathFilter,Z):java.util.List -c:com.intellij.history.core.StoredContent -- com.intellij.history.core.Content -- (I):V -- (java.io.DataInput):V -- s:acquireContent(com.intellij.openapi.vfs.VirtualFile):com.intellij.history.core.StoredContent -- s:acquireContent(B[]):com.intellij.history.core.StoredContent -- equals(java.lang.Object):Z -- getBytes():B[] -- getContentId():I -- hashCode():I -- isAvailable():Z -- release():V -- s:transientContent(com.intellij.openapi.vfs.VirtualFile):com.intellij.history.core.StoredContent -- write(java.io.DataOutput):V a:com.intellij.history.core.changes.Change - p:(J):V - p:(java.io.DataInput):V @@ -335,25 +260,6 @@ a:com.intellij.history.core.revisions.Revision - a:getRoot():com.intellij.history.core.tree.RootEntry - a:getTimestamp():J - isLabel():Z -c:com.intellij.history.core.tree.DirectoryEntry -- com.intellij.history.core.tree.Entry -- (I):V -- (java.io.DataInput,Z):V -- (java.lang.String):V -- addChild(com.intellij.history.core.tree.Entry):V -- addChildren(java.util.Collection):V -- p:checkDoesNotExist(com.intellij.history.core.tree.Entry,java.lang.String):Z -- p:collectCreatedDifferences(java.util.function.BiConsumer):V -- p:collectDeletedDifferences(java.util.function.BiConsumer):V -- collectDifferencesWith(com.intellij.history.core.tree.Entry,java.util.function.BiConsumer):V -- copy():com.intellij.history.core.tree.DirectoryEntry -- p:copyEntry():com.intellij.history.core.tree.DirectoryEntry -- getChildren():java.util.List -- getTimestamp():J -- hasUnavailableContent(java.util.List):Z -- isDirectory():Z -- removeChild(com.intellij.history.core.tree.Entry):V -- write(java.io.DataOutput):V a:com.intellij.history.core.tree.Entry - (I):V - (java.io.DataInput):V @@ -368,7 +274,6 @@ a:com.intellij.history.core.tree.Entry - findChild(java.lang.String):com.intellij.history.core.tree.Entry - findEntry(java.lang.String):com.intellij.history.core.tree.Entry - getChildren():java.util.List -- getContent():com.intellij.history.core.Content - s:getDifferencesBetween(com.intellij.history.core.tree.Entry,com.intellij.history.core.tree.Entry):java.util.List - s:getDifferencesBetween(com.intellij.history.core.tree.Entry,com.intellij.history.core.tree.Entry,Z):java.util.List - getEntry(java.lang.String):com.intellij.history.core.tree.Entry @@ -388,28 +293,12 @@ a:com.intellij.history.core.tree.Entry - nameEquals(java.lang.String):Z - pathEquals(java.lang.String):Z - removeChild(com.intellij.history.core.tree.Entry):V -- setContent(com.intellij.history.core.Content,J):V - setName(java.lang.String):V -- p:setParent(com.intellij.history.core.tree.DirectoryEntry):V - setReadOnly(Z):V - ps:toNameId(java.lang.String):I - write(java.io.DataOutput):V -f:com.intellij.history.core.tree.FileEntry -- com.intellij.history.core.tree.Entry -- (I,com.intellij.history.core.Content,J,Z):V -- (java.io.DataInput,Z):V -- (java.lang.String,com.intellij.history.core.Content,J,Z):V -- collectDifferencesWith(com.intellij.history.core.tree.Entry,java.util.function.BiConsumer):V -- copy():com.intellij.history.core.tree.FileEntry -- getContent():com.intellij.history.core.Content -- getTimestamp():J -- hasUnavailableContent(java.util.List):Z -- isReadOnly():Z -- setContent(com.intellij.history.core.Content,J):V -- setReadOnly(Z):V -- write(java.io.DataOutput):V f:com.intellij.history.core.tree.RootEntry -- com.intellij.history.core.tree.DirectoryEntry +- com.intellij.history.core.tree.Entry - ():V - copy():com.intellij.history.core.tree.RootEntry - ensureDirectoryExists(java.lang.String):com.intellij.history.core.tree.Entry @@ -447,11 +336,6 @@ pf:com.intellij.history.integration.IdeaGateway$VersionedFilterData f:com.intellij.history.integration.LocalHistoryBundle - s:message(java.lang.String,java.lang.Object[]):java.lang.String - s:messagePointer(java.lang.String,java.lang.Object[]):java.util.function.Supplier -a:com.intellij.history.integration.LocalHistoryEx -- com.intellij.history.LocalHistory -- com.intellij.openapi.Disposable -- ():V -- a:getFacade():com.intellij.history.core.LocalHistoryFacade f:com.intellij.history.integration.revertion.DifferenceReverter - com.intellij.history.integration.revertion.Reverter - (com.intellij.openapi.project.Project,com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,java.util.List,com.intellij.history.core.revisions.Revision):V @@ -469,32 +353,11 @@ a:com.intellij.history.integration.revertion.Reverter - pa:getFilesToClearROStatus():java.util.List - s:getRevertCommandName(com.intellij.history.core.revisions.Revision):java.lang.String - revert():V -f:com.intellij.history.integration.revertion.SelectionReverter -- com.intellij.history.integration.revertion.Reverter -- (com.intellij.openapi.project.Project,com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,com.intellij.history.integration.ui.models.SelectionCalculator,com.intellij.history.core.revisions.Revision,com.intellij.history.core.tree.Entry,I,I):V -- (com.intellij.openapi.project.Project,com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,com.intellij.history.integration.ui.models.SelectionCalculator,com.intellij.platform.lvcs.impl.RevisionId,java.lang.String,I,I,java.util.function.Supplier):V -f:com.intellij.history.integration.revertion.UndoChangeRevertingVisitor -- com.intellij.history.core.changes.ChangeVisitor -- (com.intellij.history.integration.IdeaGateway,java.lang.Long,java.lang.Long):V -- finished():V -- visit(com.intellij.history.core.changes.ContentChange):V -- visit(com.intellij.history.core.changes.CreateEntryChange):V -- visit(com.intellij.history.core.changes.DeleteChange):V -- visit(com.intellij.history.core.changes.MoveChange):V -- visit(com.intellij.history.core.changes.ROStatusChange):V -- visit(com.intellij.history.core.changes.RenameChange):V -f:com.intellij.history.integration.revertion.UndoChangeRevertingVisitor$RuntimeIOException -- java.lang.RuntimeException -- (java.lang.Throwable):V c:com.intellij.history.integration.ui.models.DirectoryHistoryDialogModel - com.intellij.history.integration.ui.models.HistoryDialogModel - (com.intellij.openapi.project.Project,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.LocalHistoryFacade,com.intellij.openapi.vfs.VirtualFile):V -- p:createChange(com.intellij.history.core.revisions.Difference):com.intellij.history.integration.ui.views.DirectoryChange - createReverter():com.intellij.history.integration.revertion.Reverter - createRevisionReverter(java.util.List):com.intellij.history.integration.revertion.Reverter -f:com.intellij.history.integration.ui.models.EntireFileDifferenceModel -- com.intellij.history.integration.ui.models.FileDifferenceModel -- (com.intellij.openapi.project.Project,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.tree.Entry,com.intellij.history.core.tree.Entry,Z):V c:com.intellij.history.integration.ui.models.EntireFileHistoryDialogModel - com.intellij.history.integration.ui.models.FileHistoryDialogModel - (com.intellij.openapi.project.Project,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.LocalHistoryFacade,com.intellij.openapi.vfs.VirtualFile):V @@ -531,7 +394,6 @@ a:com.intellij.history.integration.ui.models.HistoryDialogModel - (com.intellij.openapi.project.Project,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.LocalHistoryFacade,com.intellij.openapi.vfs.VirtualFile):V - canPerformCreatePatch():Z - clearRevisions():V -- p:collectRevisionData():com.intellij.history.integration.ui.models.RevisionData - p:createChange(com.intellij.history.core.revisions.Difference):com.intellij.openapi.vcs.changes.Change - a:createReverter():com.intellij.history.integration.revertion.Reverter - p:createRootEntry():com.intellij.history.core.tree.RootEntry @@ -540,7 +402,6 @@ a:com.intellij.history.integration.ui.models.HistoryDialogModel - p:getDifferences():java.util.List - p:getLeftEntry():com.intellij.history.core.tree.Entry - getLeftRevision():com.intellij.history.core.revisions.Revision -- p:getRevisionData():com.intellij.history.integration.ui.models.RevisionData - getRevisions():java.util.List - p:getRightEntry():com.intellij.history.core.tree.Entry - getRightRevision():com.intellij.history.core.revisions.Revision @@ -553,33 +414,11 @@ a:com.intellij.history.integration.ui.models.HistoryDialogModel - resetSelection():Z - selectRevisions(I,I):Z - setFilter(java.lang.String):V -com.intellij.history.integration.ui.models.Progress -- sf:EMPTY:com.intellij.history.integration.ui.models.Progress -- a:processed(I):V -c:com.intellij.history.integration.ui.models.Progress$Empty -- com.intellij.history.integration.ui.models.Progress -- ():V -- processed(I):V -f:com.intellij.history.integration.ui.models.RevisionData -- (com.intellij.history.core.revisions.Revision,java.util.List):V -- f:component1():com.intellij.history.core.revisions.Revision -- f:component2():java.util.List -- f:copy(com.intellij.history.core.revisions.Revision,java.util.List):com.intellij.history.integration.ui.models.RevisionData -- bs:copy$default(com.intellij.history.integration.ui.models.RevisionData,com.intellij.history.core.revisions.Revision,java.util.List,I,java.lang.Object):com.intellij.history.integration.ui.models.RevisionData -- equals(java.lang.Object):Z -- f:getCurrentRevision():com.intellij.history.core.revisions.Revision -- f:getRevisions():java.util.List -- hashCode():I -f:com.intellij.history.integration.ui.models.RevisionDataKt -- sf:filterContents(com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,com.intellij.openapi.vfs.VirtualFile,java.util.List,java.lang.String,Z):java.util.Set -- sf:filterContents(com.intellij.history.integration.ui.models.SelectionCalculator,java.lang.String):java.util.Set -- sf:getAllRevisions(com.intellij.history.integration.ui.models.RevisionData):java.util.List f:com.intellij.history.integration.ui.models.RevisionItem - f:labels:java.util.LinkedList - f:revision:com.intellij.history.core.revisions.Revision - (com.intellij.history.core.revisions.Revision):V com.intellij.history.integration.ui.models.RevisionProcessingProgress -- com.intellij.history.integration.ui.models.Progress - sf:EMPTY:com.intellij.history.integration.ui.models.RevisionProcessingProgress - a:processingLeftRevision():V - a:processingRightRevision():V @@ -589,40 +428,6 @@ c:com.intellij.history.integration.ui.models.RevisionProcessingProgress$Empty - processed(I):V - processingLeftRevision():V - processingRightRevision():V -f:com.intellij.history.integration.ui.models.RevisionSelectionCalculator -- com.intellij.history.integration.ui.models.SelectionCalculator -- (com.intellij.history.integration.IdeaGateway,java.util.List,I,I):V -- f:canCalculateFor(com.intellij.history.core.revisions.Revision,com.intellij.history.integration.ui.models.Progress):Z -a:com.intellij.history.integration.ui.models.SelectionCalculator -- sf:Companion:com.intellij.history.integration.ui.models.SelectionCalculator$Companion -- (com.intellij.history.integration.IdeaGateway,java.util.List,I,I):V -- f:canCalculateFor(com.intellij.platform.lvcs.impl.RevisionId,com.intellij.history.integration.ui.models.Progress):Z -- sf:create(com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.tree.RootEntry,java.lang.String,java.util.List,I,I):com.intellij.history.integration.ui.models.SelectionCalculator -- sf:create(com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.tree.RootEntry,java.lang.String,java.util.List,I,I,Z):com.intellij.history.integration.ui.models.SelectionCalculator -- pa:getEntry(com.intellij.platform.lvcs.impl.RevisionId):com.intellij.history.core.tree.Entry -- f:getSelectionFor(com.intellij.platform.lvcs.impl.RevisionId,com.intellij.history.integration.ui.models.Progress):com.intellij.diff.Block -- f:processContents(kotlin.jvm.functions.Function2):V -f:com.intellij.history.integration.ui.models.SelectionCalculator$Companion -- f:create(com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.tree.RootEntry,java.lang.String,java.util.List,I,I):com.intellij.history.integration.ui.models.SelectionCalculator -- f:create(com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.tree.RootEntry,java.lang.String,java.util.List,I,I,Z):com.intellij.history.integration.ui.models.SelectionCalculator -- bs:create$default(com.intellij.history.integration.ui.models.SelectionCalculator$Companion,com.intellij.history.core.LocalHistoryFacade,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.tree.RootEntry,java.lang.String,java.util.List,I,I,Z,I,java.lang.Object):com.intellij.history.integration.ui.models.SelectionCalculator -f:com.intellij.history.integration.ui.models.SelectionDifferenceModel -- com.intellij.history.integration.ui.models.FileDifferenceModel -- (com.intellij.openapi.project.Project,com.intellij.history.integration.IdeaGateway,com.intellij.history.integration.ui.models.RevisionSelectionCalculator,com.intellij.history.core.revisions.Revision,com.intellij.history.core.revisions.Revision,I,I,Z):V -c:com.intellij.history.integration.ui.models.SelectionHistoryDialogModel -- com.intellij.history.integration.ui.models.FileHistoryDialogModel -- (com.intellij.openapi.project.Project,com.intellij.history.integration.IdeaGateway,com.intellij.history.core.LocalHistoryFacade,com.intellij.openapi.vfs.VirtualFile,I,I):V -- p:collectRevisionData():com.intellij.history.integration.ui.models.RevisionData -- createReverter():com.intellij.history.integration.revertion.Reverter -- filterContents(java.lang.String):java.util.Set -- getDifferenceModel():com.intellij.history.integration.ui.models.FileDifferenceModel -f:com.intellij.history.integration.ui.views.DirectoryChange -- com.intellij.openapi.vcs.changes.Change -- (com.intellij.history.integration.IdeaGateway,com.intellij.history.core.revisions.Difference):V -- canShowFileDifference():Z -- getDifference():com.intellij.history.core.revisions.Difference -- getLeftEntry():com.intellij.history.core.tree.Entry -- getRightEntry():com.intellij.history.core.tree.Entry c:com.intellij.history.integration.ui.views.DirectoryHistoryDialog - com.intellij.history.integration.ui.views.HistoryDialog - (com.intellij.openapi.project.Project,com.intellij.history.integration.IdeaGateway,com.intellij.openapi.vfs.VirtualFile):V @@ -698,17 +503,11 @@ f:com.intellij.history.integration.ui.views.RevisionsList$MyCellRenderer - getTableCellRendererComponent(javax.swing.JTable,java.lang.Object,Z,Z,I,I):java.awt.Component com.intellij.history.integration.ui.views.RevisionsList$SelectionListener - a:revisionsSelected(I,I):V -f:com.intellij.history.integration.ui.views.SelectionHistoryDialog -- com.intellij.history.integration.ui.views.FileHistoryDialog -- (com.intellij.openapi.project.Project,com.intellij.history.integration.IdeaGateway,com.intellij.openapi.vfs.VirtualFile,I,I):V a:com.intellij.history.utils.RunnableAdapter - java.lang.Runnable - ():V - a:doRun():V - run():V -f:com.intellij.openapi.command.impl.ChangeRange -- (com.intellij.history.integration.IdeaGateway,com.intellij.history.core.LocalHistoryFacade,java.lang.Long):V -- revert(com.intellij.openapi.command.impl.ChangeRange):com.intellij.openapi.command.impl.ChangeRange f:com.intellij.openapi.command.impl.FileUndoProvider - com.intellij.openapi.command.impl.UndoProvider - com.intellij.openapi.vfs.newvfs.BulkFileListener @@ -718,156 +517,3 @@ f:com.intellij.openapi.command.impl.FileUndoProvider - before(java.util.List):V - commandFinished(com.intellij.openapi.project.Project):V - commandStarted(com.intellij.openapi.project.Project):V -*f:com.intellij.platform.lvcs.impl.ActivityData -- com.intellij.openapi.util.UserDataHolderBase -- *sf:Companion:com.intellij.platform.lvcs.impl.ActivityData$Companion -- (java.util.List):V -- f:component1():java.util.List -- f:copy(java.util.List):com.intellij.platform.lvcs.impl.ActivityData -- bs:copy$default(com.intellij.platform.lvcs.impl.ActivityData,java.util.List,I,java.lang.Object):com.intellij.platform.lvcs.impl.ActivityData -- equals(java.lang.Object):Z -- f:getItems():java.util.List -- hashCode():I -*f:com.intellij.platform.lvcs.impl.ActivityData$Companion -- f:getEMPTY():com.intellij.platform.lvcs.impl.ActivityData -*f:com.intellij.platform.lvcs.impl.ActivityDiffData -- (java.lang.Iterable,com.intellij.platform.lvcs.impl.DirectoryDiffMode,Z):V -- f:component1():java.lang.Iterable -- f:component2():com.intellij.platform.lvcs.impl.DirectoryDiffMode -- f:component3():Z -- f:copy(java.lang.Iterable,com.intellij.platform.lvcs.impl.DirectoryDiffMode,Z):com.intellij.platform.lvcs.impl.ActivityDiffData -- bs:copy$default(com.intellij.platform.lvcs.impl.ActivityDiffData,java.lang.Iterable,com.intellij.platform.lvcs.impl.DirectoryDiffMode,Z,I,java.lang.Object):com.intellij.platform.lvcs.impl.ActivityDiffData -- equals(java.lang.Object):Z -- f:getDiffMode():com.intellij.platform.lvcs.impl.DirectoryDiffMode -- f:getPresentableChanges():java.lang.Iterable -- hashCode():I -- f:isSingleSelection():Z -*:com.intellij.platform.lvcs.impl.ActivityFileChange -- com.intellij.openapi.vcs.changes.ui.PresentableChange -- a:createProducer(com.intellij.openapi.project.Project):com.intellij.openapi.vcs.changes.ui.ChangeDiffRequestChain$Producer -*:com.intellij.platform.lvcs.impl.ActivityItem -- a:getTimestamp():J -*f:com.intellij.platform.lvcs.impl.ActivityPresentation -- (java.lang.String,javax.swing.Icon):V -- f:component1():java.lang.String -- f:component2():javax.swing.Icon -- f:copy(java.lang.String,javax.swing.Icon):com.intellij.platform.lvcs.impl.ActivityPresentation -- bs:copy$default(com.intellij.platform.lvcs.impl.ActivityPresentation,java.lang.String,javax.swing.Icon,I,java.lang.Object):com.intellij.platform.lvcs.impl.ActivityPresentation -- equals(java.lang.Object):Z -- f:getIcon():javax.swing.Icon -- f:getText():java.lang.String -- hashCode():I -*:com.intellij.platform.lvcs.impl.ActivityProvider -- a:filterActivityList(com.intellij.platform.lvcs.impl.ActivityScope,com.intellij.platform.lvcs.impl.ActivityData,java.lang.String):java.util.Set -- a:getActivityItemsChanged(com.intellij.platform.lvcs.impl.ActivityScope):kotlinx.coroutines.flow.Flow -- a:getPresentation(com.intellij.platform.lvcs.impl.ActivityItem):com.intellij.platform.lvcs.impl.ActivityPresentation -- a:getSupportedFilterKindFor(com.intellij.platform.lvcs.impl.ActivityScope):com.intellij.platform.lvcs.impl.FilterKind -- a:loadActivityList(com.intellij.platform.lvcs.impl.ActivityScope,java.lang.String):com.intellij.platform.lvcs.impl.ActivityData -- a:loadDiffData(com.intellij.platform.lvcs.impl.ActivityScope,com.intellij.platform.lvcs.impl.ActivitySelection,com.intellij.platform.lvcs.impl.DirectoryDiffMode):com.intellij.platform.lvcs.impl.ActivityDiffData -- a:loadSingleDiff(com.intellij.platform.lvcs.impl.ActivityScope,com.intellij.platform.lvcs.impl.ActivitySelection):com.intellij.diff.chains.DiffRequestProducer -*:com.intellij.platform.lvcs.impl.ActivityScope -- *sf:Companion:com.intellij.platform.lvcs.impl.ActivityScope$Companion -- s:fromFile(com.intellij.openapi.vfs.VirtualFile):com.intellij.platform.lvcs.impl.ActivityScope -- s:fromFiles(java.util.Collection):com.intellij.platform.lvcs.impl.ActivityScope -*f:com.intellij.platform.lvcs.impl.ActivityScope$Companion -- f:fromFile(com.intellij.openapi.vfs.VirtualFile):com.intellij.platform.lvcs.impl.ActivityScope -- f:fromFiles(java.util.Collection):com.intellij.platform.lvcs.impl.ActivityScope -*f:com.intellij.platform.lvcs.impl.ActivityScope$Directory -- com.intellij.platform.lvcs.impl.ActivityScope$File -- (com.intellij.openapi.vfs.VirtualFile):V -- f:component1():com.intellij.openapi.vfs.VirtualFile -- f:copy(com.intellij.openapi.vfs.VirtualFile):com.intellij.platform.lvcs.impl.ActivityScope$Directory -- bs:copy$default(com.intellij.platform.lvcs.impl.ActivityScope$Directory,com.intellij.openapi.vfs.VirtualFile,I,java.lang.Object):com.intellij.platform.lvcs.impl.ActivityScope$Directory -- equals(java.lang.Object):Z -- getFile():com.intellij.openapi.vfs.VirtualFile -- hashCode():I -*:com.intellij.platform.lvcs.impl.ActivityScope$File -- com.intellij.platform.lvcs.impl.ActivityScope -- a:getFile():com.intellij.openapi.vfs.VirtualFile -*f:com.intellij.platform.lvcs.impl.ActivityScope$Files -- com.intellij.platform.lvcs.impl.ActivityScope -- (java.util.Collection):V -- f:component1():java.util.Collection -- f:copy(java.util.Collection):com.intellij.platform.lvcs.impl.ActivityScope$Files -- bs:copy$default(com.intellij.platform.lvcs.impl.ActivityScope$Files,java.util.Collection,I,java.lang.Object):com.intellij.platform.lvcs.impl.ActivityScope$Files -- equals(java.lang.Object):Z -- f:getFiles():java.util.Collection -- hashCode():I -*f:com.intellij.platform.lvcs.impl.ActivityScope$Recent -- com.intellij.platform.lvcs.impl.ActivityScope -- sf:INSTANCE:com.intellij.platform.lvcs.impl.ActivityScope$Recent -- equals(java.lang.Object):Z -- hashCode():I -*f:com.intellij.platform.lvcs.impl.ActivityScope$Selection -- com.intellij.platform.lvcs.impl.ActivityScope$File -- (com.intellij.openapi.vfs.VirtualFile,I,I):V -- f:component1():com.intellij.openapi.vfs.VirtualFile -- f:component2():I -- f:component3():I -- f:copy(com.intellij.openapi.vfs.VirtualFile,I,I):com.intellij.platform.lvcs.impl.ActivityScope$Selection -- bs:copy$default(com.intellij.platform.lvcs.impl.ActivityScope$Selection,com.intellij.openapi.vfs.VirtualFile,I,I,I,java.lang.Object):com.intellij.platform.lvcs.impl.ActivityScope$Selection -- equals(java.lang.Object):Z -- getFile():com.intellij.openapi.vfs.VirtualFile -- f:getFrom():I -- f:getTo():I -- hashCode():I -*f:com.intellij.platform.lvcs.impl.ActivityScope$SingleFile -- com.intellij.platform.lvcs.impl.ActivityScope$File -- (com.intellij.openapi.vfs.VirtualFile):V -- f:component1():com.intellij.openapi.vfs.VirtualFile -- f:copy(com.intellij.openapi.vfs.VirtualFile):com.intellij.platform.lvcs.impl.ActivityScope$SingleFile -- bs:copy$default(com.intellij.platform.lvcs.impl.ActivityScope$SingleFile,com.intellij.openapi.vfs.VirtualFile,I,java.lang.Object):com.intellij.platform.lvcs.impl.ActivityScope$SingleFile -- equals(java.lang.Object):Z -- getFile():com.intellij.openapi.vfs.VirtualFile -- hashCode():I -f:com.intellij.platform.lvcs.impl.ActivityScopeKt -- sf:getFilePath(com.intellij.platform.lvcs.impl.ActivityScope$File):com.intellij.openapi.vcs.FilePath -- sf:getHasMultipleFiles(com.intellij.platform.lvcs.impl.ActivityScope):Z -- sf:getPresentableName(com.intellij.platform.lvcs.impl.ActivityScope):java.lang.String -*f:com.intellij.platform.lvcs.impl.ActivitySelection -- (java.util.List,com.intellij.platform.lvcs.impl.ActivityData):V -- f:component1():java.util.List -- f:component2():com.intellij.platform.lvcs.impl.ActivityData -- f:copy(java.util.List,com.intellij.platform.lvcs.impl.ActivityData):com.intellij.platform.lvcs.impl.ActivitySelection -- bs:copy$default(com.intellij.platform.lvcs.impl.ActivitySelection,java.util.List,com.intellij.platform.lvcs.impl.ActivityData,I,java.lang.Object):com.intellij.platform.lvcs.impl.ActivitySelection -- equals(java.lang.Object):Z -- f:getData():com.intellij.platform.lvcs.impl.ActivityData -- f:getSelectedItems():java.util.List -- hashCode():I -*e:com.intellij.platform.lvcs.impl.DirectoryDiffMode -- java.lang.Enum -- sf:WithLocal:com.intellij.platform.lvcs.impl.DirectoryDiffMode -- sf:WithNext:com.intellij.platform.lvcs.impl.DirectoryDiffMode -- s:getEntries():kotlin.enums.EnumEntries -- s:valueOf(java.lang.String):com.intellij.platform.lvcs.impl.DirectoryDiffMode -- s:values():com.intellij.platform.lvcs.impl.DirectoryDiffMode[] -*e:com.intellij.platform.lvcs.impl.FilterKind -- java.lang.Enum -- sf:CONTENT:com.intellij.platform.lvcs.impl.FilterKind -- sf:FILE:com.intellij.platform.lvcs.impl.FilterKind -- s:getEntries():kotlin.enums.EnumEntries -- s:valueOf(java.lang.String):com.intellij.platform.lvcs.impl.FilterKind -- s:values():com.intellij.platform.lvcs.impl.FilterKind[] -f:com.intellij.platform.lvcs.impl.LocalHistoryActivityProviderKt -- sf:getACTIVITY_PRESENTATION_PROVIDER_EP():com.intellij.openapi.extensions.ExtensionPointName -a:com.intellij.platform.lvcs.impl.RevisionId -f:com.intellij.platform.lvcs.impl.RevisionId$ChangeSet -- com.intellij.platform.lvcs.impl.RevisionId -- (J):V -- f:component1():J -- f:copy(J):com.intellij.platform.lvcs.impl.RevisionId$ChangeSet -- bs:copy$default(com.intellij.platform.lvcs.impl.RevisionId$ChangeSet,J,I,java.lang.Object):com.intellij.platform.lvcs.impl.RevisionId$ChangeSet -- equals(java.lang.Object):Z -- f:getId():J -- hashCode():I -f:com.intellij.platform.lvcs.impl.RevisionId$Current -- com.intellij.platform.lvcs.impl.RevisionId -- sf:INSTANCE:com.intellij.platform.lvcs.impl.RevisionId$Current -- equals(java.lang.Object):Z -- hashCode():I -*f:com.intellij.platform.lvcs.impl.ui.ActivityViewDataKeys -- sf:INSTANCE:com.intellij.platform.lvcs.impl.ui.ActivityViewDataKeys -- f:getDIRECTORY_DIFF_MODE():com.intellij.openapi.actionSystem.DataKey -- f:getSCOPE():com.intellij.openapi.actionSystem.DataKey -- f:getSELECTED_DIFFERENCES():com.intellij.openapi.actionSystem.DataKey -- f:getSELECTION():com.intellij.openapi.actionSystem.DataKey diff --git a/platform/lvcs-impl/exposed-third-party-api.txt b/platform/lvcs-impl/exposed-third-party-api.txt deleted file mode 100644 index 1b18e64d59ee..000000000000 --- a/platform/lvcs-impl/exposed-third-party-api.txt +++ /dev/null @@ -1 +0,0 @@ -it/unimi/dsi/fastutil/ints/IntSet diff --git a/platform/lvcs-impl/src/com/intellij/history/core/ByteContentRetriever.java b/platform/lvcs-impl/src/com/intellij/history/core/ByteContentRetriever.java index 4478d685befe..918436330bb1 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/ByteContentRetriever.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/ByteContentRetriever.java @@ -24,6 +24,7 @@ import com.intellij.history.core.changes.ContentChange; import com.intellij.history.core.tree.Entry; import com.intellij.history.integration.IdeaGateway; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -33,6 +34,7 @@ import java.util.List; // correct number of timestamps for each possible revision for comparator. // Therefore we have to move along the changelist, revert only content changes // and record file and changeset timestamps to call comparator with. +@ApiStatus.Internal public final class ByteContentRetriever { private final LocalHistoryFacade myVcs; private final FileRevisionTimestampComparator myComparator; diff --git a/platform/lvcs-impl/src/com/intellij/history/core/ChangeList.kt b/platform/lvcs-impl/src/com/intellij/history/core/ChangeList.kt index 6bb7bc268bb8..1c7442fb7c4e 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/ChangeList.kt +++ b/platform/lvcs-impl/src/com/intellij/history/core/ChangeList.kt @@ -11,8 +11,10 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.util.Clock import com.intellij.openapi.util.NlsContexts import it.unimi.dsi.fastutil.ints.IntOpenHashSet +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.TestOnly +@ApiStatus.Internal open class ChangeList(private val storage: ChangeListStorage) { private var changeSetDepth = 0 private var currentChangeSet: ChangeSet? = null diff --git a/platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorage.java b/platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorage.java index ff0ec23c9c66..a439429a1acf 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorage.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorage.java @@ -4,8 +4,10 @@ package com.intellij.history.core; import com.intellij.history.core.changes.ChangeSet; import com.intellij.util.Consumer; import it.unimi.dsi.fastutil.ints.IntSet; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; +@ApiStatus.Internal public interface ChangeListStorage { void close(); diff --git a/platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorageImpl.java b/platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorageImpl.java index 90d8cafb9a35..cede06944690 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorageImpl.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorageImpl.java @@ -15,6 +15,7 @@ import com.intellij.util.io.ClosedStorageException; import com.intellij.util.io.storage.AbstractStorage; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,6 +30,7 @@ import java.text.MessageFormat; import static com.intellij.history.core.LocalHistoryNotificationIdsHolder.STORAGE_CORRUPTED; import static com.intellij.history.core.LocalHistoryNotificationIdsHolderKt.getLocalHistoryNotificationGroup; +@ApiStatus.Internal public final class ChangeListStorageImpl implements ChangeListStorage { private static final int VERSION = 7; private static final @NonNls String STORAGE_FILE = "changes"; diff --git a/platform/lvcs-impl/src/com/intellij/history/core/ChangeSetHolder.java b/platform/lvcs-impl/src/com/intellij/history/core/ChangeSetHolder.java index 8f802c1c9b87..2d5020bf6ae6 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/ChangeSetHolder.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/ChangeSetHolder.java @@ -16,6 +16,8 @@ package com.intellij.history.core; import com.intellij.history.core.changes.ChangeSet; +import org.jetbrains.annotations.ApiStatus; +@ApiStatus.Internal public record ChangeSetHolder(int id, ChangeSet changeSet) { } diff --git a/platform/lvcs-impl/src/com/intellij/history/core/DataStreamUtil.java b/platform/lvcs-impl/src/com/intellij/history/core/DataStreamUtil.java index 93f018503878..f291df52030b 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/DataStreamUtil.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/DataStreamUtil.java @@ -8,6 +8,7 @@ import com.intellij.history.core.tree.Entry; import com.intellij.history.core.tree.FileEntry; import com.intellij.util.io.DataInputOutputUtil; import com.intellij.util.io.IOUtil; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,6 +16,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +@ApiStatus.Internal public final class DataStreamUtil { public static Entry readEntry(DataInput in) throws IOException { int type = DataInputOutputUtil.readINT(in); diff --git a/platform/lvcs-impl/src/com/intellij/history/core/LabelImpl.java b/platform/lvcs-impl/src/com/intellij/history/core/LabelImpl.java index c75131c62f08..f2350cc79429 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/LabelImpl.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/LabelImpl.java @@ -17,7 +17,9 @@ package com.intellij.history.core; import com.intellij.history.ByteContent; import com.intellij.history.core.tree.RootEntry; +import org.jetbrains.annotations.ApiStatus; +@ApiStatus.Internal public interface LabelImpl { long getLabelChangeId(); diff --git a/platform/lvcs-impl/src/com/intellij/history/core/LocalHistoryFacade.kt b/platform/lvcs-impl/src/com/intellij/history/core/LocalHistoryFacade.kt index f43461c9eeda..5c595c9d9352 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/LocalHistoryFacade.kt +++ b/platform/lvcs-impl/src/com/intellij/history/core/LocalHistoryFacade.kt @@ -41,6 +41,7 @@ open class LocalHistoryFacade internal constructor() { changeList = ChangeList(createStorage()) } + @ApiStatus.Internal protected open fun createStorage(): ChangeListStorage { var storage: ChangeListStorage try { @@ -56,6 +57,7 @@ open class LocalHistoryFacade internal constructor() { private val listeners: MutableList = ContainerUtil.createLockFreeCopyOnWriteList() + @get:ApiStatus.Internal @get:TestOnly val changeListInTests get() = changeList internal val changes: Iterable get() = changeList.iterChanges() @@ -84,6 +86,7 @@ open class LocalHistoryFacade internal constructor() { else CreateFileChange(changeList.nextId(), path)) } + @ApiStatus.Internal fun contentChanged(path: String, oldContent: Content, oldTimestamp: Long) { addChange(ContentChange(changeList.nextId(), path, oldContent, oldTimestamp)) } @@ -104,10 +107,12 @@ open class LocalHistoryFacade internal constructor() { addChange(DeleteChange(changeList.nextId(), path, deletedEntry)) } + @ApiStatus.Internal fun putSystemLabel(name: @NlsContexts.Label String, projectId: String, color: Int): LabelImpl { return putLabel(PutSystemLabelChange(changeList.nextId(), name, projectId, color)) } + @ApiStatus.Internal fun putUserLabel(name: @NlsContexts.Label String, projectId: String): LabelImpl { return putLabel(PutLabelChange(changeList.nextId(), name, projectId)) } @@ -214,6 +219,7 @@ interface ChangeProcessor { fun process(changeSet: ChangeSet, change: Change, changePath: String) } +@ApiStatus.Internal @ApiStatus.Experimental open class ChangeProcessorBase( private val projectId: String?, diff --git a/platform/lvcs-impl/src/com/intellij/history/core/StoredContent.java b/platform/lvcs-impl/src/com/intellij/history/core/StoredContent.java index 4102c3a02fdd..81c180a7953c 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/StoredContent.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/StoredContent.java @@ -6,12 +6,14 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS; import com.intellij.util.ArrayUtilRt; import com.intellij.util.io.DataInputOutputUtil; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.TestOnly; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +@ApiStatus.Internal public class StoredContent extends Content { private static final int UNAVAILABLE = 0; diff --git a/platform/lvcs-impl/src/com/intellij/history/core/tree/DirectoryEntry.java b/platform/lvcs-impl/src/com/intellij/history/core/tree/DirectoryEntry.java index 52cb9f19ee9c..68bda2367c5b 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/tree/DirectoryEntry.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/tree/DirectoryEntry.java @@ -9,6 +9,7 @@ import com.intellij.util.io.DataInputOutputUtil; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.io.DataInput; @@ -20,6 +21,7 @@ import java.util.List; import java.util.Map; import java.util.function.BiConsumer; +@ApiStatus.Internal public class DirectoryEntry extends Entry { private final ArrayList myChildren; diff --git a/platform/lvcs-impl/src/com/intellij/history/core/tree/Entry.java b/platform/lvcs-impl/src/com/intellij/history/core/tree/Entry.java index ea20540d307a..3ae935fbc90a 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/tree/Entry.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/tree/Entry.java @@ -24,6 +24,7 @@ import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.newvfs.persistent.FSRecords; import com.intellij.util.SmartList; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -141,6 +142,7 @@ public abstract class Entry { return getTimestamp() != timestamp; } + @ApiStatus.Internal public Content getContent() { throw new UnsupportedOperationException(formatPath()); } @@ -157,6 +159,7 @@ public abstract class Entry { return myParent; } + @ApiStatus.Internal protected void setParent(DirectoryEntry parent) { myParent = parent; } @@ -228,6 +231,7 @@ public abstract class Entry { myNameHash = calcNameHash(newName); } + @ApiStatus.Internal public void setContent(Content newContent, long timestamp) { throw new UnsupportedOperationException(formatPath()); } diff --git a/platform/lvcs-impl/src/com/intellij/history/core/tree/FileEntry.java b/platform/lvcs-impl/src/com/intellij/history/core/tree/FileEntry.java index caf326afdfa8..4e0610d8e8b3 100644 --- a/platform/lvcs-impl/src/com/intellij/history/core/tree/FileEntry.java +++ b/platform/lvcs-impl/src/com/intellij/history/core/tree/FileEntry.java @@ -18,6 +18,7 @@ package com.intellij.history.core.tree; import com.intellij.history.core.Content; import com.intellij.history.core.StoredContent; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.io.DataInput; @@ -26,6 +27,7 @@ import java.io.IOException; import java.util.List; import java.util.function.BiConsumer; +@ApiStatus.Internal public final class FileEntry extends Entry { private long myTimestamp; private boolean isReadOnly; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryEx.kt b/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryEx.kt index 3d9a31aecded..10f2909ed7e0 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryEx.kt +++ b/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryEx.kt @@ -4,10 +4,12 @@ package com.intellij.history.integration import com.intellij.history.LocalHistory import com.intellij.history.core.LocalHistoryFacade import com.intellij.openapi.Disposable +import org.jetbrains.annotations.ApiStatus /** * Provides API access to [LocalHistoryImpl] */ +@ApiStatus.Internal abstract class LocalHistoryEx : LocalHistory(), Disposable { /** * return null if [LocalHistoryImpl] disabled or not initialized diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/revertion/SelectionReverter.java b/platform/lvcs-impl/src/com/intellij/history/integration/revertion/SelectionReverter.java index 5c91bd07da51..6c999f9b7dbc 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/revertion/SelectionReverter.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/revertion/SelectionReverter.java @@ -16,12 +16,14 @@ import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.platform.lvcs.impl.RevisionId; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; import java.util.function.Supplier; +@ApiStatus.Internal public final class SelectionReverter extends Reverter { private final SelectionCalculator myCalculator; private final @NotNull RevisionId myTargetRevisionId; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/revertion/UndoChangeRevertingVisitor.java b/platform/lvcs-impl/src/com/intellij/history/integration/revertion/UndoChangeRevertingVisitor.java index b46e16603a2e..8311148b334c 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/revertion/UndoChangeRevertingVisitor.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/revertion/UndoChangeRevertingVisitor.java @@ -16,6 +16,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.io.ReadOnlyAttributeUtil; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -25,6 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +@ApiStatus.Internal public final class UndoChangeRevertingVisitor extends ChangeVisitor { private static final Logger LOG = Logger.getInstance(UndoChangeRevertingVisitor.class); diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/DirectoryHistoryDialogModel.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/DirectoryHistoryDialogModel.java index b0d820d30146..17eec1b5009f 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/DirectoryHistoryDialogModel.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/DirectoryHistoryDialogModel.java @@ -21,6 +21,7 @@ public class DirectoryHistoryDialogModel extends HistoryDialogModel { super(p, gw, vcs, f); } + @ApiStatus.Internal @Override protected DirectoryChange createChange(@NotNull Difference d) { return new DirectoryChange(myGateway, d); diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/EntireFileDifferenceModel.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/EntireFileDifferenceModel.java index b0fb08d5229e..1fd4481ee0af 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/EntireFileDifferenceModel.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/EntireFileDifferenceModel.java @@ -6,9 +6,11 @@ import com.intellij.history.core.tree.Entry; import com.intellij.history.integration.IdeaGateway; import com.intellij.openapi.project.Project; import com.intellij.platform.lvcs.impl.diff.EntryDiffContentKt; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +@ApiStatus.Internal public final class EntireFileDifferenceModel extends FileDifferenceModel { private final @Nullable Entry myLeft; private final @Nullable Entry myRight; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/HistoryDialogModel.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/HistoryDialogModel.java index 5c8fc40d80e9..f923981debd7 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/HistoryDialogModel.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/HistoryDialogModel.java @@ -52,6 +52,7 @@ public abstract class HistoryDialogModel { return FileUtil.toSystemDependentName(myFile.getPath()); } + @ApiStatus.Internal protected @NotNull RevisionData getRevisionData() { if (myRevisionData == null) { myRevisionData = collectRevisionData(); @@ -67,6 +68,7 @@ public abstract class HistoryDialogModel { return getRevisionData().getCurrentRevision(); } + @ApiStatus.Internal protected @NotNull RevisionData collectRevisionData() { return RevisionDataKt.collectRevisionData(myProject, myGateway, myVcs, createRootEntry(), myFile, myFilter, myBefore); } diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/Progress.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/Progress.java index 30967e8a5a56..898d4c29ac8b 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/Progress.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/Progress.java @@ -16,6 +16,9 @@ package com.intellij.history.integration.ui.models; +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Internal public interface Progress { Progress EMPTY = new Empty(); diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/RevisionData.kt b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/RevisionData.kt index 7c9655a60c31..1bbd8f08fe43 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/RevisionData.kt +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/RevisionData.kt @@ -13,10 +13,12 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.platform.lvcs.impl.RevisionId import com.intellij.util.PairProcessor +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal data class RevisionData(val currentRevision: Revision, val revisions: List) -val RevisionData.allRevisions get() = listOf(currentRevision) + revisions.map { it.revision } +internal val RevisionData.allRevisions get() = listOf(currentRevision) + revisions.map { it.revision } internal fun Revision.toRevisionId() = if (changeSetId == null) RevisionId.Current else RevisionId.ChangeSet(changeSetId!!) @@ -50,8 +52,8 @@ private fun mergeLabelsWithRevisions(revisions: List): List, filter: String, - before: Boolean): Set { +internal fun LocalHistoryFacade.filterContents(gateway: IdeaGateway, file: VirtualFile, revisions: List, filter: String, + before: Boolean): Set { val result = mutableSetOf() processContents(gateway, file, revisions, before) { revision, content -> if (Thread.currentThread().isInterrupted) return@processContents false @@ -64,7 +66,7 @@ fun LocalHistoryFacade.filterContents(gateway: IdeaGateway, file: VirtualFile, r return result } -fun filterContents(selectionCalculator: SelectionCalculator, filter: String): MutableSet { +internal fun filterContents(selectionCalculator: SelectionCalculator, filter: String): MutableSet { val result = mutableSetOf() selectionCalculator.processContents { id, contents -> if (Thread.currentThread().isInterrupted) return@processContents false diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/RevisionSelectionCalculator.kt b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/RevisionSelectionCalculator.kt index c6e0c57e1a43..5e00fe3ee863 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/RevisionSelectionCalculator.kt +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/RevisionSelectionCalculator.kt @@ -5,7 +5,9 @@ import com.intellij.history.core.revisions.Revision import com.intellij.history.core.tree.Entry import com.intellij.history.integration.IdeaGateway import com.intellij.platform.lvcs.impl.RevisionId +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal class RevisionSelectionCalculator(gateway: IdeaGateway, revisions: List, fromLine: Int, toLine: Int) : SelectionCalculator(gateway, revisions.map { it.toRevisionId() }, fromLine, toLine) { diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.kt b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.kt index d02a38eed4e4..0b3dc3b48cf5 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.kt +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.kt @@ -9,7 +9,9 @@ import com.intellij.history.core.tree.RootEntry import com.intellij.history.integration.IdeaGateway import com.intellij.platform.lvcs.impl.RevisionId import com.intellij.platform.lvcs.impl.diff.findEntry +import org.jetbrains.annotations.ApiStatus +@ApiStatus.Internal abstract class SelectionCalculator(private val gateway: IdeaGateway, internal val revisions: List, private val fromLine: Int, diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionDifferenceModel.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionDifferenceModel.java index b07ae34954a2..d550c3508e57 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionDifferenceModel.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionDifferenceModel.java @@ -22,9 +22,11 @@ import com.intellij.history.core.tree.Entry; import com.intellij.history.integration.IdeaGateway; import com.intellij.openapi.project.Project; import com.intellij.platform.lvcs.impl.diff.EntryDiffContentKt; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +@ApiStatus.Internal public final class SelectionDifferenceModel extends FileDifferenceModel { private final RevisionSelectionCalculator myCalculator; private final Revision myLeftRevision; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionHistoryDialogModel.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionHistoryDialogModel.java index 0a511f2e42a1..ebeb79bf0891 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionHistoryDialogModel.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionHistoryDialogModel.java @@ -14,6 +14,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Set; +@ApiStatus.Internal public class SelectionHistoryDialogModel extends FileHistoryDialogModel { private RevisionSelectionCalculator myCalculatorCache; private final int myFrom; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/DirectoryChange.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/DirectoryChange.java index 0a585a7d6a43..a8bd21cea969 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/DirectoryChange.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/DirectoryChange.java @@ -6,9 +6,11 @@ import com.intellij.history.core.revisions.Difference; import com.intellij.history.core.tree.Entry; import com.intellij.history.integration.IdeaGateway; import com.intellij.openapi.vcs.changes.Change; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +@ApiStatus.Internal public final class DirectoryChange extends Change { private final @NotNull IdeaGateway myGateway; private final @NotNull Difference myDifference; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/SelectionHistoryDialog.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/SelectionHistoryDialog.java index 246f873106f6..869afd95724e 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/SelectionHistoryDialog.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/SelectionHistoryDialog.java @@ -8,8 +8,10 @@ import com.intellij.history.integration.ui.models.FileHistoryDialogModel; import com.intellij.history.integration.ui.models.SelectionHistoryDialogModel; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +@ApiStatus.Internal public final class SelectionHistoryDialog extends FileHistoryDialog { private final int myFrom; private final int myTo; diff --git a/platform/lvcs-impl/src/com/intellij/openapi/command/impl/ChangeRange.java b/platform/lvcs-impl/src/com/intellij/openapi/command/impl/ChangeRange.java index 6200025eba5b..01768eff0364 100644 --- a/platform/lvcs-impl/src/com/intellij/openapi/command/impl/ChangeRange.java +++ b/platform/lvcs-impl/src/com/intellij/openapi/command/impl/ChangeRange.java @@ -8,11 +8,13 @@ import com.intellij.history.integration.IdeaGateway; import com.intellij.history.integration.revertion.UndoChangeRevertingVisitor; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Ref; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; +@ApiStatus.Internal public final class ChangeRange { private static final Logger LOG = Logger.getInstance(ChangeRange.class); diff --git a/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/package-info.java b/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/package-info.java new file mode 100644 index 000000000000..43775eed0ec9 --- /dev/null +++ b/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/package-info.java @@ -0,0 +1,4 @@ +@Internal +package com.intellij.platform.lvcs.impl; + +import org.jetbrains.annotations.ApiStatus.Internal; diff --git a/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/ui/package-info.java b/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/ui/package-info.java new file mode 100644 index 000000000000..b0a70bbe5f5f --- /dev/null +++ b/platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/ui/package-info.java @@ -0,0 +1,4 @@ +@Internal +package com.intellij.platform.lvcs.impl.ui; + +import org.jetbrains.annotations.ApiStatus.Internal;