diff options
Diffstat (limited to 'org.eclipse.egit.core/src')
12 files changed, 27 insertions, 62 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AddToIndexOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AddToIndexOperation.java index 028abc96e1..054532a8f6 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AddToIndexOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/AddToIndexOperation.java @@ -27,7 +27,7 @@ import org.eclipse.egit.core.internal.job.RuleUtil; import org.eclipse.egit.core.project.RepositoryMapping; import org.eclipse.jgit.api.AddCommand; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.errors.NoFilepatternException; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Repository; /** @@ -79,7 +79,7 @@ public class AddToIndexOperation implements IEGitOperation { } } catch (RuntimeException e) { throw new CoreException(Activator.error(CoreText.AddToIndexOperation_failed, e)); - } catch (NoFilepatternException e) { + } catch (GitAPIException e) { throw new CoreException(Activator.error(CoreText.AddToIndexOperation_failed, e)); } finally { for (final RepositoryMapping rm : addCommands.keySet()) diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java index 8b0435f9aa..e662f2c96a 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java @@ -31,13 +31,8 @@ import org.eclipse.egit.core.project.RepositoryMapping; import org.eclipse.jgit.api.AddCommand; import org.eclipse.jgit.api.CommitCommand; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; -import org.eclipse.jgit.api.errors.NoFilepatternException; -import org.eclipse.jgit.api.errors.NoHeadException; -import org.eclipse.jgit.api.errors.NoMessageException; -import org.eclipse.jgit.api.errors.WrongRepositoryStateException; -import org.eclipse.jgit.errors.UnmergedPathException; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -217,13 +212,12 @@ public class CommitOperation implements IEGitOperation { addCommand.addFilepattern(path); fileAdded = true; } - if (fileAdded) { + if (fileAdded) try { addCommand.call(); - } catch (NoFilepatternException e) { + } catch (Exception e) { throw new CoreException(Activator.error(e.getMessage(), e)); } - } } public ISchedulingRule getSchedulingRule() { @@ -253,20 +247,9 @@ public class CommitOperation implements IEGitOperation { for(String path:commitFileList) commitCommand.setOnly(path); commit = commitCommand.call(); - } catch (NoHeadException e) { - throw new TeamException(e.getLocalizedMessage(), e); - } catch (NoMessageException e) { - throw new TeamException(e.getLocalizedMessage(), e); - } catch (UnmergedPathException e) { - throw new TeamException(e.getLocalizedMessage(), e); - } catch (ConcurrentRefUpdateException e) { - throw new TeamException( - CoreText.MergeOperation_InternalError, e); - } catch (JGitInternalException e) { + } catch (Exception e) { throw new TeamException( CoreText.MergeOperation_InternalError, e); - } catch (WrongRepositoryStateException e) { - throw new TeamException(e.getLocalizedMessage(), e); } } @@ -316,17 +299,9 @@ public class CommitOperation implements IEGitOperation { new PersonIdent(committerIdent, commitDate, timeZone)).setMessage(message) .setInsertChangeId(createChangeId).call(); - } catch (NoHeadException e) { - throw new TeamException(e.getLocalizedMessage(), e); - } catch (NoMessageException e) { - throw new TeamException(e.getLocalizedMessage(), e); - } catch (UnmergedPathException e) { - throw new TeamException(e.getLocalizedMessage(), e); - } catch (ConcurrentRefUpdateException e) { - throw new TeamException(CoreText.MergeOperation_InternalError, e); } catch (JGitInternalException e) { throw new TeamException(CoreText.MergeOperation_InternalError, e); - } catch (WrongRepositoryStateException e) { + } catch (GitAPIException e) { throw new TeamException(e.getLocalizedMessage(), e); } } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java index 65957eb9ec..1b06d24c50 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java @@ -24,6 +24,7 @@ import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.CoreText; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.CannotDeleteCurrentBranchException; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.NotMergedException; import org.eclipse.jgit.lib.Ref; @@ -129,6 +130,8 @@ public class DeleteBranchOperation implements IEGitOperation { break; } catch (JGitInternalException e) { throw new CoreException(Activator.error(e.getMessage(), e)); + } catch (GitAPIException e) { + throw new CoreException(Activator.error(e.getMessage(), e)); } actMonitor.worked(1); } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteTagOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteTagOperation.java index afbc5291f1..b9c706dd6e 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteTagOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteTagOperation.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.CoreText; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Repository; /** @@ -42,7 +42,7 @@ public class DeleteTagOperation implements IEGitOperation { public void execute(IProgressMonitor monitor) throws CoreException { try { Git.wrap(repository).tagDelete().setTags(tag).call(); - } catch (JGitInternalException e) { + } catch (GitAPIException e) { throw new CoreException(Activator.error( CoreText.DeleteTagOperation_exceptionMessage, e)); } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/FetchOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/FetchOperation.java index 56281d308a..fa6950ed94 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/FetchOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/FetchOperation.java @@ -17,7 +17,6 @@ import org.eclipse.egit.core.CoreText; import org.eclipse.egit.core.EclipseGitProgressTransformer; import org.eclipse.jgit.api.FetchCommand; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.errors.InvalidRemoteException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.CredentialsProvider; @@ -129,7 +128,7 @@ public class FetchOperation { } catch (JGitInternalException e) { throw new InvocationTargetException(e.getCause() != null ? e .getCause() : e); - } catch (InvalidRemoteException e) { + } catch (Exception e) { throw new InvocationTargetException(e); } } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java index 35839fc286..f33ae1d04d 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java @@ -21,7 +21,6 @@ import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.CoreText; import org.eclipse.egit.core.EclipseGitProgressTransformer; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.errors.InvalidRemoteException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.CredentialsProvider; @@ -29,8 +28,8 @@ import org.eclipse.jgit.transport.PushResult; import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.RemoteRefUpdate; -import org.eclipse.jgit.transport.URIish; import org.eclipse.jgit.transport.RemoteRefUpdate.Status; +import org.eclipse.jgit.transport.URIish; import org.eclipse.osgi.util.NLS; /** @@ -205,7 +204,7 @@ public class PushOperation { CoreText.PushOperation_InternalExceptionOccurredMessage, errorMessage); handleException(uri, e, userMessage); - } catch (InvalidRemoteException e) { + } catch (Exception e) { handleException(uri, e, e.getMessage()); } @@ -236,7 +235,7 @@ public class PushOperation { errorMessage); URIish uri = getPushURIForErrorHandling(); handleException(uri, e, userMessage); - } catch (InvalidRemoteException e) { + } catch (Exception e) { URIish uri = getPushURIForErrorHandling(); handleException(uri, e, e.getMessage()); } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RemoveFromIndexOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RemoveFromIndexOperation.java index 8947f96344..e048b82bb1 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RemoveFromIndexOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RemoveFromIndexOperation.java @@ -12,7 +12,6 @@ package org.eclipse.egit.core.op; import static org.eclipse.egit.core.project.RepositoryMapping.findRepositoryMapping; import static org.eclipse.jgit.lib.Constants.HEAD; -import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -74,7 +73,7 @@ public class RemoveFromIndexOperation implements IEGitOperation { try { resetCommand.call(); monitor.worked(1); - } catch (IOException e) { + } catch (Exception e) { Activator.logError(e.getMessage(), e); } finally { monitor.done(); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RenameBranchOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RenameBranchOperation.java index c0c3ed6f39..f55b43fe07 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RenameBranchOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RenameBranchOperation.java @@ -17,11 +17,8 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.CoreText; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.errors.DetachedHeadException; -import org.eclipse.jgit.api.errors.InvalidRefNameException; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; -import org.eclipse.jgit.api.errors.RefAlreadyExistsException; -import org.eclipse.jgit.api.errors.RefNotFoundException; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.osgi.util.NLS; @@ -68,13 +65,7 @@ public class RenameBranchOperation implements IEGitOperation { branch.getName()).setNewName(newName).call(); } catch (JGitInternalException e) { throw new CoreException(Activator.error(e.getMessage(), e)); - } catch (RefNotFoundException e) { - throw new CoreException(Activator.error(e.getMessage(), e)); - } catch (InvalidRefNameException e) { - throw new CoreException(Activator.error(e.getMessage(), e)); - } catch (RefAlreadyExistsException e) { - throw new CoreException(Activator.error(e.getMessage(), e)); - } catch (DetachedHeadException e) { + } catch (GitAPIException e) { throw new CoreException(Activator.error(e.getMessage(), e)); } actMonitor.worked(1); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ResetOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ResetOperation.java index bb6b97e9c2..6693f225a5 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ResetOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ResetOperation.java @@ -11,8 +11,6 @@ *******************************************************************************/ package org.eclipse.egit.core.op; -import java.io.IOException; - import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; @@ -26,6 +24,7 @@ import org.eclipse.egit.core.internal.util.ProjectUtil; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ResetCommand; import org.eclipse.jgit.api.ResetCommand.ResetType; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Repository; import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; @@ -93,7 +92,7 @@ public class ResetOperation implements IEGitOperation { reset.setRef(refName); try { reset.call(); - } catch (IOException e) { + } catch (GitAPIException e) { throw new TeamException(e.getLocalizedMessage(), e.getCause()); } monitor.worked(1); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleAddOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleAddOperation.java index 780fcaf033..5d1860db13 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleAddOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleAddOperation.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.egit.core.EclipseGitProgressTransformer; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.SubmoduleAddCommand; -import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Repository; import org.eclipse.team.core.TeamException; @@ -59,7 +59,7 @@ public class SubmoduleAddOperation implements IEGitOperation { try { if (add.call() != null) repo.notifyIndexChanged(); - } catch (JGitInternalException e) { + } catch (GitAPIException e) { throw new TeamException(e.getLocalizedMessage(), e.getCause()); } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleSyncOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleSyncOperation.java index d95755583c..d2108fd4ac 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleSyncOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleSyncOperation.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.SubmoduleSyncCommand; -import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Repository; import org.eclipse.team.core.TeamException; @@ -68,7 +68,7 @@ public class SubmoduleSyncOperation implements IEGitOperation { for (String path : paths) sync.addPath(path); updates = sync.call(); - } catch (JGitInternalException e) { + } catch (GitAPIException e) { throw new TeamException(e.getLocalizedMessage(), e.getCause()); } finally { diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleUpdateOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleUpdateOperation.java index 2ce9326272..724ffc0251 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleUpdateOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/SubmoduleUpdateOperation.java @@ -26,7 +26,7 @@ import org.eclipse.egit.core.internal.util.ProjectUtil; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.SubmoduleInitCommand; import org.eclipse.jgit.api.SubmoduleUpdateCommand; -import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.submodule.SubmoduleWalk; import org.eclipse.team.core.TeamException; @@ -97,7 +97,7 @@ public class SubmoduleUpdateOperation implements IEGitOperation { refreshMonitor.worked(1); } refreshMonitor.done(); - } catch (JGitInternalException e) { + } catch (GitAPIException e) { throw new TeamException(e.getLocalizedMessage(), e.getCause()); } catch (IOException e) { |