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: do not report error for changes without mappings

Browse Source 
* related PartialChangeTracker could've been removed during update
This commit is contained in:
Aleksey Pivovarov
2018-01-25 18:56:56 +03:00
parent a60796f66d
commit 22d093003a
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+23 -1
View File
@@ -552,6 +552,8 @@ public class ChangeListWorker {
public void applyChangesFromUpdate(@NotNull ChangeListWorker updatedWorker,
@NotNull PlusMinusModify<BaseRevision> deltaListener) {
HashMap<Change, ListData> oldChangeMappings = new HashMap<>(myChangeMappings);
boolean somethingChanged = notifyPathsChanged(myIdx, updatedWorker.myIdx, deltaListener);
myIdx.copyFrom(updatedWorker.myIdx);
@@ -563,7 +565,27 @@ public class ChangeListWorker {
PartialChangeTracker tracker = getChangeTrackerFor(change);
if (tracker == null) {
ListData oldList = updatedWorker.myChangeMappings.get(change);
ListData newList = notNullList(listMapping.get(oldList));
ListData newList = null;
if (oldList == null) {
if (updatedWorker.myPartialChangeTrackers.isEmpty()) {
LOG.error("Change mapping not found");
}
}
else {
newList = listMapping.get(oldList);
if (newList == null) {
LOG.error("List mapping not found");
}
}
if (newList == null) {
ListData oldMappedList = oldChangeMappings.get(change);
if (oldMappedList != null) newList = getDataById(oldMappedList.id);
}
if (newList == null) newList = myDefault;
myChangeMappings.put(change, newList);
}
}