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 a more correct method to calculate number of updated files: IDEA-215906

Browse Source 
It already exists to collect the UpdatedFiles.

GitOrigin-RevId: b8fc3917f84872e5ef5bf55948b1da260c6116e9
This commit is contained in:
Kirill Likhodedov
2019-07-02 06:52:16 +03:00
committed by intellij-monorepo-bot
parent 818660d1a7
commit c4fc27c44e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java
+11
View File
@@ -80,6 +80,17 @@ public class MergeChangeCollector {
addAll(updatedFiles, FileGroup.REMOVED_FROM_REPOSITORY_ID, removed);
}
public int calcUpdatedFilesCount() throws VcsException {
String revisionsForDiff = getRevisionsForDiff();
if (revisionsForDiff == null) {
return 0;
}
Set<String> updated = new HashSet<>();
getChangedFilesExceptUnmerged(updated, updated, updated, revisionsForDiff);
return updated.size() + getUnmergedPaths().size();
}
/**
* Returns absolute paths to files which are currently unmerged, and also populates myUnmergedPaths with relative paths.
*/
plugins/git4idea/src/git4idea/update/GitUpdateInfoAsLog.kt
+3 -2
View File
@@ -33,8 +33,9 @@ import com.intellij.vcs.log.visible.VisiblePack
import com.intellij.vcs.log.visible.VisiblePackChangeListener
import com.intellij.vcs.log.visible.VisiblePackRefresherImpl
import com.intellij.vcs.log.visible.filters.VcsLogFilterObject
import git4idea.changes.GitChangeUtils
import git4idea.GitRevisionNumber
import git4idea.history.GitHistoryUtils
import git4idea.merge.MergeChangeCollector
import git4idea.repo.GitRepository
import org.jetbrains.annotations.CalledInAwt
import java.util.*
@@ -156,7 +157,7 @@ class GitUpdateInfoAsLog(private val project: Project,
private fun calcUpdatedFilesCount(): Int {
return calcCount { repository, range ->
GitChangeUtils.getDiffWithWorkingDir(project, repository.root, range.start.asString(), null, false, false).size
MergeChangeCollector(project, repository.root, GitRevisionNumber(range.start.asString())).calcUpdatedFilesCount()
}
}