From aabade4c40ea1b4845bc31eb352c4fdec3236a2e Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 12 Feb 2018 15:21:56 +0300
Subject: [PATCH] vcs: do not log PCE

EA-115992 - assert: GitAnnotationProvider.parseAnnotations
---
 .../git4idea/src/git4idea/annotate/GitAnnotationProvider.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
index f0db3115ae49..db8b48a9e0a1 100644
--- a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
+++ b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Attachment;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.util.BackgroundTaskUtil;
@@ -327,6 +328,9 @@ public class GitAnnotationProvider implements AnnotationProviderEx {
       }
       return new GitFileAnnotation(myProject, file, revision, lines);
     }
+    catch (ProcessCanceledException e) {
+      throw e;
+    }
     catch (Exception e) {
       LOG.error("Couldn't parse annotation: " + e, new Attachment("output.txt", output));
       throw new VcsException(e);