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

vcs: simplify ChangeListsIndexes

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-03-02 15:19:14 +03:00
committed by Aleksey Pivovarov
parent aaf09df8cb
commit f8b88e8c3c
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java
+22 -18
View File
@@ -121,33 +121,37 @@ public class ChangeListsIndexes {
* (for RemoteRevisionsCache and annotation listener)
*/
public void getDelta(final ChangeListsIndexes newIndexes,
final Set<BaseRevision> toRemove,
Set<BaseRevision> toRemove,
Set<BaseRevision> toAdd,
Set<BeforeAfter<BaseRevision>> toModify) {
// this is old
final Set<FilePath> oldKeySet = newHashSet(myMap.keySet());
final Set<FilePath> toRemoveSet = newHashSet(oldKeySet);
final Set<FilePath> newKeySet = newIndexes.myMap.keySet();
final Set<FilePath> toAddSet = newHashSet(newKeySet);
toRemoveSet.removeAll(newKeySet);
toAddSet.removeAll(oldKeySet);
// those that modified
oldKeySet.removeAll(toRemoveSet);
TreeMap<FilePath, Data> oldMap = myMap;
TreeMap<FilePath, Data> newMap = newIndexes.myMap;
Set<FilePath> oldFiles = oldMap.keySet();
Set<FilePath> newFiles = newMap.keySet();
final Set<FilePath> toRemoveSet = newHashSet(oldFiles);
toRemoveSet.removeAll(newFiles);
final Set<FilePath> toAddSet = newHashSet(newFiles);
toAddSet.removeAll(oldFiles);
final Set<FilePath> toModifySet = newHashSet(oldFiles);
toModifySet.removeAll(toRemoveSet);
for (FilePath s : toRemoveSet) {
final Data data = myMap.get(s);
final Data data = oldMap.get(s);
toRemove.add(fromPairAndPath(s, data));
}
for (FilePath s : toAddSet) {
final Data data = newIndexes.myMap.get(s);
final Data data = newMap.get(s);
toAdd.add(fromPairAndPath(s, data));
}
for (FilePath s : oldKeySet) {
final Data old = myMap.get(s);
final Data newOne = newIndexes.myMap.get(s);
assert old != null && newOne != null;
if (!old.sameRevisions(newOne)) {
toModify.add(new BeforeAfter<>(fromPairAndPath(s, old), fromPairAndPath(s, newOne)));
for (FilePath s : toModifySet) {
final Data oldData = oldMap.get(s);
final Data newData = newMap.get(s);
assert oldData != null && newData != null;
if (!oldData.sameRevisions(newData)) {
toModify.add(new BeforeAfter<>(fromPairAndPath(s, oldData), fromPairAndPath(s, newData)));
}
}
}