[EGIT PATCH 2/3] Handle NoRemoteRepositoryException in PushOperation especially
From: Marek Zawirski <hidden>
Date: 2016-06-15 22:45:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
We can give user better feedback for this special case, as it is common and not directly related to protocol error. Reported-by: Robert <redacted> Signed-off-by: Marek Zawirski <redacted> --- Beside of this change, we may consider removing URI part of TransportException from message, moving it to the field and providing API for getting this URI. That may allow us showing user cleaner messages. .../src/org/spearce/egit/core/CoreText.java | 3 +++ .../src/org/spearce/egit/core/coretext.properties | 1 + .../org/spearce/egit/core/op/PushOperation.java | 5 +++++ 3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/CoreText.java b/org.spearce.egit.core/src/org/spearce/egit/core/CoreText.java
index 35e17b9..a750117 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/CoreText.java
+++ b/org.spearce.egit.core/src/org/spearce/egit/core/CoreText.java@@ -108,6 +108,9 @@ public static String PushOperation_resultTransportError; /** */ + public static String PushOperation_resultNoServiceError; + + /** */ public static String PushOperation_taskNameDryRun; /** */
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/coretext.properties b/org.spearce.egit.core/src/org/spearce/egit/core/coretext.properties
index 94cf4aa..04ca28f 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/coretext.properties
+++ b/org.spearce.egit.core/src/org/spearce/egit/core/coretext.properties@@ -61,5 +61,6 @@ ListRemoteOperation_title=Getting remote branches information PushOperation_resultCancelled=Operation was cancelled. PushOperation_resultNotSupported=Can't push to {0} PushOperation_resultTransportError=Transport error occured during push operation: {0} +PushOperation_resultNoServiceError=Push service is not available: {0} PushOperation_taskNameDryRun=Trying pushing to remote repositories PushOperation_taskNameNormalRun=Pushing to remote repositories
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperation.java b/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperation.java
index 8811800..a0f2e5c 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperation.java
+++ b/org.spearce.egit.core/src/org/spearce/egit/core/op/PushOperation.java@@ -16,6 +16,7 @@ import org.eclipse.osgi.util.NLS; import org.spearce.egit.core.CoreText; import org.spearce.egit.core.EclipseGitProgressTransformer; +import org.spearce.jgit.errors.NoRemoteRepositoryException; import org.spearce.jgit.errors.NotSupportedException; import org.spearce.jgit.errors.TransportException; import org.spearce.jgit.lib.Repository;
@@ -125,6 +126,10 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException { final PushResult pr = transport.push(gitSubMonitor, specification.getRefUpdates(uri)); operationResult.addOperationResult(uri, pr); + } catch (final NoRemoteRepositoryException e) { + operationResult.addOperationResult(uri, NLS.bind( + CoreText.PushOperation_resultNoServiceError, e + .getMessage())); } catch (final TransportException e) { operationResult.addOperationResult(uri, NLS.bind( CoreText.PushOperation_resultTransportError, e
--
1.5.6.3