public void deleteChangeList(final ShelvedChangeList changeList) {
deleteListImpl(changeList);
if (!changeList.isRecycled()) {
myShelvedChangeLists.remove(changeList);
} else {
myRecycledShelvedChangeLists.remove(changeList);
}
notifyStateChanged();
}
private <V extends FilePatch, T extends ApplyFilePatchBase<V>> ApplyPatchStatus applyList(
final List<Pair<VirtualFile, T>> patches,
final ApplyPatchContext context,
ApplyPatchStatus status,
CommitContext commiContext)
throws IOException {
for (Pair<VirtualFile, T> patch : patches) {
ApplyPatchStatus patchStatus =
ApplyPatchAction.applyOnly(
myProject,
patch.getSecond(),
context,
patch.getFirst(),
commiContext,
myReverseConflict,
myLeftConflictPanelTitle,
myRightConflictPanelTitle);
if (patchStatus == ApplyPatchStatus.ABORT) return patchStatus;
status = ApplyPatchStatus.and(status, patchStatus);
if (patchStatus == ApplyPatchStatus.FAILURE) {
myFailedPatches.add(patch.getSecond().getPatch());
continue;
}
if (patchStatus != ApplyPatchStatus.SKIP) {
myVerifier.doMoveIfNeeded(patch.getFirst());
myRemainingPatches.remove(patch.getSecond().getPatch());
}
}
return status;
}
private void recycleChangeList(final ShelvedChangeList changeList) {
recycleChangeList(changeList, null);
myShelvedChangeLists.remove(changeList);
notifyStateChanged();
}
public void restoreList(final ShelvedChangeList changeList) {
myShelvedChangeLists.add(changeList);
myRecycledShelvedChangeLists.remove(changeList);
changeList.setRecycled(false);
notifyStateChanged();
}
