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 wrong -> incorrect

Browse Source
This commit is contained in:
Julia Beliaeva
2017-12-29 15:16:39 +03:00
parent 5a51064b58
commit d55079ff9e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/log/GitBekParentFixer.java
+7 -7
View File
@@ -31,10 +31,10 @@ class GitBekParentFixer {
@NotNull private static final String MAGIC_TEXT = "Merge remote";
@NotNull private static final VcsLogFilterCollection MAGIC_FILTER = createVcsLogFilterCollection();
@NotNull private final Set<Hash> myWrongCommits;
@NotNull private final Set<Hash> myIncorrectCommits;
private GitBekParentFixer(@NotNull Set<Hash> wrongCommits) {
myWrongCommits = wrongCommits;
private GitBekParentFixer(@NotNull Set<Hash> incorrectCommits) {
myIncorrectCommits = incorrectCommits;
}
@NotNull
@@ -42,25 +42,25 @@ class GitBekParentFixer {
if (!BekUtil.isBekEnabled()) {
return new GitBekParentFixer(Collections.emptySet());
}
return new GitBekParentFixer(getWrongCommits(provider, root));
return new GitBekParentFixer(getIncorrectCommits(provider, root));
}
@NotNull
TimedVcsCommit fixCommit(@NotNull TimedVcsCommit commit) {
if (!myWrongCommits.contains(commit.getId())) {
if (!myIncorrectCommits.contains(commit.getId())) {
return commit;
}
return reverseParents(commit);
}
@NotNull
private static Set<Hash> getWrongCommits(@NotNull GitLogProvider provider, @NotNull VirtualFile root) throws VcsException {
private static Set<Hash> getIncorrectCommits(@NotNull GitLogProvider provider, @NotNull VirtualFile root) throws VcsException {
List<TimedVcsCommit> commitsMatchingFilter = provider.getCommitsMatchingFilter(root, MAGIC_FILTER, -1);
return ContainerUtil.map2Set(commitsMatchingFilter, timedVcsCommit -> timedVcsCommit.getId());
}
@NotNull
private static TimedVcsCommit reverseParents(@NotNull final TimedVcsCommit commit) {
private static TimedVcsCommit reverseParents(@NotNull TimedVcsCommit commit) {
return new TimedVcsCommit() {
@Override
public long getTimestamp() {