Re: [EGIT PATCH 2/3] Handle NoRemoteRepositoryException in PushOperation especially
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:45:14
Marek Zawirski [off-list ref] wrote:
quoted hunk ↗ jump to hunk
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 repositoriesdiff --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@@ -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()));
Isn't this when combined with the prior patch going to result in a message like: Push service is not available: git://repo.or.cz/egit.git push service is not available which is sort of redundant and confusingly redundant, isn't it? -- Shawn.