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

Revert "[git] Fix equals & hashcode for GitRepoInfo"

Browse Source 
This reverts commit b612a915b0.
Better fix will follow
This commit is contained in:
Kirill Likhodedov
2013-07-11 15:22:12 +04:00
parent 1e2a6bb877
commit b3b079fbe2
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/repo/GitRepoInfo.java
+8 -17
View File
@@ -16,7 +16,6 @@
package git4idea.repo;
import com.intellij.dvcs.repo.Repository;
import com.intellij.openapi.util.Comparing;
import git4idea.GitLocalBranch;
import git4idea.GitRemoteBranch;
import org.jetbrains.annotations.NotNull;
@@ -94,10 +93,10 @@ public class GitRepoInfo {
if (myState != info.myState) return false;
if (myCurrentRevision != null ? !myCurrentRevision.equals(info.myCurrentRevision) : info.myCurrentRevision != null) return false;
if (myCurrentBranch != null ? !myCurrentBranch.equals(info.myCurrentBranch) : info.myCurrentBranch != null) return false;
if (!Comparing.haveEqualElements(myRemotes, info.myRemotes)) return false;
if (!Comparing.haveEqualElements(myBranchTrackInfos, info.myBranchTrackInfos)) return false;
if (!Comparing.haveEqualElements(myLocalBranches, info.myLocalBranches)) return false;
if (!Comparing.haveEqualElements(myRemoteBranches, info.myRemoteBranches)) return false;
if (!myRemotes.equals(info.myRemotes)) return false;
if (!myBranchTrackInfos.equals(info.myBranchTrackInfos)) return false;
if (!myLocalBranches.equals(info.myLocalBranches)) return false;
if (!myRemoteBranches.equals(info.myRemoteBranches)) return false;
return true;
}
@@ -107,21 +106,13 @@ public class GitRepoInfo {
int result = myCurrentBranch != null ? myCurrentBranch.hashCode() : 0;
result = 31 * result + (myCurrentRevision != null ? myCurrentRevision.hashCode() : 0);
result = 31 * result + myState.hashCode();
result = 31 * result + hashCodeForCollectionComparison(myRemotes);
result = 31 * result + hashCodeForCollectionComparison(myLocalBranches);
result = 31 * result + hashCodeForCollectionComparison(myRemoteBranches);
result = 31 * result + hashCodeForCollectionComparison(myBranchTrackInfos);
result = 31 * result + myRemotes.hashCode();
result = 31 * result + myLocalBranches.hashCode();
result = 31 * result + myRemoteBranches.hashCode();
result = 31 * result + myBranchTrackInfos.hashCode();
return result;
}
private static <T> int hashCodeForCollectionComparison(@NotNull Collection<T> collection) {
int i = 0;
for (T element : collection) {
i += element.hashCode();
}
return i;
}
@Override
public String toString() {
return String.format("GitRepoInfo{current=%s, remotes=%s, localBranches=%s, remoteBranches=%s, trackInfos=%s}",