From f6df9c59e5ffa3c6e233cc32f5cb2b7b56d92d64 Mon Sep 17 00:00:00 2001 From: Ivan Semenov Date: Fri, 4 Jul 2025 13:15:01 +0200 Subject: [PATCH] [vcs] don't log PCE GitOrigin-RevId: 5b718e426e093c9a5c844a7c5ba1ece3443a75cb --- .../intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java index a2d75b05f257..30a88cae60de 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java @@ -5,6 +5,7 @@ import com.intellij.openapi.components.PathMacroSubstitutor; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diff.impl.patch.FilePatch; import com.intellij.openapi.options.ExternalizableScheme; +import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.NlsSafe; @@ -113,6 +114,9 @@ public final class ShelvedChangeList implements ExternalizableScheme { } myChanges = changes; } + catch (ProcessCanceledException pce) { + throw pce; + } catch (Throwable e) { LOG.warn("Failed to parse the file patch: [" + myPath + "]", e); myChanges = Collections.emptyList();