diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java index 285233e6ceee..c87579a17ccc 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java @@ -234,17 +234,15 @@ public class ChangeListWorker implements ChangeListsWriteOperations { LOG.debug("[addChangeToCorrespondingList] for change " + path + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null)); assert myDefault != null; for (LocalChangeListImpl list : myMap.values()) { - if (list.isDefault()) { - LOG.debug("[addChangeToCorrespondingList] skip default list: " + list.getName() + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null)); - continue; - } - if (list.processChange(change)) { - LOG.debug("[addChangeToCorrespondingList] matched: " + list.getName() + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null)); + if (list.hadChangeBeforeUpdate(change)) { + LOG.debug("[addChangeToCorrespondingList] matched: " + list.getName()); + list.addChange(change); myIdx.changeAdded(change, vcsKey); return; } } - myDefault.processChange(change); + LOG.debug("[addChangeToCorrespondingList] added to default list"); + myDefault.addChange(change); myIdx.changeAdded(change, vcsKey); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java index 671dc46f5ea8..400594eb82f1 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java @@ -195,22 +195,8 @@ public class LocalChangeListImpl extends LocalChangeList { }); } - boolean processChange(@NotNull Change change) { - LOG.debug("[process change] for '" + myName + "' isDefault: " + myIsDefault + " change: " + - ChangesUtil.getFilePath(change).getPath()); - if (myIsDefault) { - LOG.debug("[process change] adding because default"); - addChange(change); - return true; - } - - if (myChangesBeforeUpdate.contains(change)) { - LOG.debug("[process change] adding because equal to old: " + ChangesUtil.getFilePath(change).getPath()); - addChange(change); - return true; - } - LOG.debug("[process change] not found"); - return false; + boolean hadChangeBeforeUpdate(@NotNull Change change) { + return myChangesBeforeUpdate.contains(change); } boolean doneProcessingChanges(final List removedChanges, final List addedChanges) {