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] Rename variables and improve javadoc

Browse Source 
GitOrigin-RevId: 4f8e78b2b3e98eb28091acc526aaee9812d53105
This commit is contained in:
Nikolay Rykunov
2021-05-11 15:29:03 +00:00
committed by intellij-monorepo-bot
parent 71c4f07c81
commit 47ade7eae0
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
+14 -13
View File
@@ -400,29 +400,30 @@ public final class GitAnnotationProvider implements AnnotationProviderEx, Cachea
private Pair<FilePath, VcsRevisionNumber> getPathAndRevision(@NotNull VirtualFile file) {
FilePath filePath = VcsUtil.getLastCommitPath(myProject, VcsUtil.getFilePath(file));
VcsRevisionNumber currentRevision = getCurrentRevision(file);
VcsRevisionNumber revisionNumber = getLastRevision(filePath, currentRevision);
return Pair.create(filePath, revisionNumber);
VcsRevisionNumber lastRevision = getLastRevision(filePath, currentRevision);
return Pair.create(filePath, lastRevision);
}
/**
* @return Last revision file was modified in
* @param currentRevision HEAD revision number
* @return last revision filePath was modified in
*/
@Nullable
private VcsRevisionNumber getLastRevision(@NotNull FilePath filePath, @Nullable VcsRevisionNumber currentRevision) {
VcsKey gitKey = GitVcs.getKey();
if (currentRevision != null) {
VcsRevisionNumber cachedRevisionNumber = myCache.getLastRevision(filePath, gitKey, currentRevision);
if (cachedRevisionNumber != null) {
return cachedRevisionNumber;
VcsRevisionNumber cachedLastRevision = myCache.getLastRevision(filePath, gitKey, currentRevision);
if (cachedLastRevision != null) {
return cachedLastRevision;
}
}
try {
VcsRevisionNumber revisionNumber = GitHistoryUtils.getCurrentRevision(myProject, filePath, GitUtil.HEAD);
if (currentRevision != null && revisionNumber != null) {
myCache.putLastRevision(filePath, gitKey, currentRevision, revisionNumber);
VcsRevisionNumber lastRevision = GitHistoryUtils.getCurrentRevision(myProject, filePath, GitUtil.HEAD);
if (currentRevision != null && lastRevision != null) {
myCache.putLastRevision(filePath, gitKey, currentRevision, lastRevision);
}
return revisionNumber;
return lastRevision;
}
catch (VcsException ignore) {
return null;
@@ -437,10 +438,10 @@ public final class GitAnnotationProvider implements AnnotationProviderEx, Cachea
GitRepository repository = GitRepositoryManager.getInstance(myProject).getRepositoryForFile(file);
if (repository == null) return null;
String revision = repository.getCurrentRevision();
if (revision == null) return null;
String currentRevision = repository.getCurrentRevision();
if (currentRevision == null) return null;
return new GitRevisionNumber(revision);
return new GitRevisionNumber(currentRevision);
}
@NotNull