Browse Source

Allow to set a CredentialsProvider on relevant API commands

This is needed for commands that use Transport internally.

Change-Id: I9417c85255b160723968c647063b9c7e05995ea4
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
stable-0.11
Mathias Kinzler 14 years ago committed by Chris Aniszczyk
parent
commit
920ac08777
  1. 11
      org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java
  2. 11
      org.eclipse.jgit/src/org/eclipse/jgit/api/PushCommand.java

11
org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java

@ -56,6 +56,7 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.FetchResult; import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.Transport; import org.eclipse.jgit.transport.Transport;
@ -86,6 +87,8 @@ public class FetchCommand extends GitCommand<FetchResult> {
private int timeout; private int timeout;
private CredentialsProvider credentialsProvider;
/** /**
* @param repo * @param repo
@ -121,6 +124,7 @@ public class FetchCommand extends GitCommand<FetchResult> {
transport.setTimeout(timeout); transport.setTimeout(timeout);
transport.setDryRun(dryRun); transport.setDryRun(dryRun);
transport.setFetchThin(thin); transport.setFetchThin(thin);
transport.setCredentialsProvider(credentialsProvider);
try { try {
FetchResult result = transport.fetch(monitor, refSpecs); FetchResult result = transport.fetch(monitor, refSpecs);
@ -318,4 +322,11 @@ public class FetchCommand extends GitCommand<FetchResult> {
return this; return this;
} }
/**
* @param credentialsProvider
* the {@link CredentialsProvider} to use
*/
public void setCredentialsProvider(CredentialsProvider credentialsProvider) {
this.credentialsProvider = credentialsProvider;
}
} }

11
org.eclipse.jgit/src/org/eclipse/jgit/api/PushCommand.java

@ -59,6 +59,7 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.PushResult; import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.RemoteConfig;
@ -91,6 +92,8 @@ public class PushCommand extends GitCommand<Iterable<PushResult>> {
private int timeout; private int timeout;
private CredentialsProvider credentialsProvider;
/** /**
* @param repo * @param repo
*/ */
@ -136,6 +139,7 @@ public class PushCommand extends GitCommand<Iterable<PushResult>> {
if (receivePack != null) if (receivePack != null)
transport.setOptionReceivePack(receivePack); transport.setOptionReceivePack(receivePack);
transport.setDryRun(dryRun); transport.setDryRun(dryRun);
transport.setCredentialsProvider(credentialsProvider);
final Collection<RemoteRefUpdate> toPush = transport final Collection<RemoteRefUpdate> toPush = transport
.findRemoteRefUpdatesFor(refSpecs); .findRemoteRefUpdatesFor(refSpecs);
@ -346,4 +350,11 @@ public class PushCommand extends GitCommand<Iterable<PushResult>> {
return this; return this;
} }
/**
* @param credentialsProvider
* the {@link CredentialsProvider} to use
*/
public void setCredentialsProvider(CredentialsProvider credentialsProvider) {
this.credentialsProvider = credentialsProvider;
}
} }

Loading…
Cancel
Save