|
|
|
@ -70,6 +70,7 @@ import org.eclipse.jgit.lib.ProgressMonitor;
|
|
|
|
|
import org.eclipse.jgit.lib.Ref; |
|
|
|
|
import org.eclipse.jgit.lib.Repository; |
|
|
|
|
import org.eclipse.jgit.lib.RepositoryState; |
|
|
|
|
import org.eclipse.jgit.transport.CredentialsProvider; |
|
|
|
|
import org.eclipse.jgit.transport.FetchResult; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@ -85,6 +86,8 @@ public class PullCommand extends GitCommand<PullResult> {
|
|
|
|
|
|
|
|
|
|
private ProgressMonitor monitor = NullProgressMonitor.INSTANCE; |
|
|
|
|
|
|
|
|
|
private CredentialsProvider credentialsProvider; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @param repo |
|
|
|
|
*/ |
|
|
|
@ -112,6 +115,18 @@ public class PullCommand extends GitCommand<PullResult> {
|
|
|
|
|
return this; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @param credentialsProvider |
|
|
|
|
* the {@link CredentialsProvider} to use |
|
|
|
|
* @return this instance |
|
|
|
|
*/ |
|
|
|
|
public PullCommand setCredentialsProvider( |
|
|
|
|
CredentialsProvider credentialsProvider) { |
|
|
|
|
checkCallable(); |
|
|
|
|
this.credentialsProvider = credentialsProvider; |
|
|
|
|
return this; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Executes the {@code Pull} command with all the options and parameters |
|
|
|
|
* collected by the setter methods (e.g. |
|
|
|
@ -206,6 +221,7 @@ public class PullCommand extends GitCommand<PullResult> {
|
|
|
|
|
fetch.setRemote(remote); |
|
|
|
|
fetch.setProgressMonitor(monitor); |
|
|
|
|
fetch.setTimeout(this.timeout); |
|
|
|
|
fetch.setCredentialsProvider(credentialsProvider); |
|
|
|
|
|
|
|
|
|
fetchRes = fetch.call(); |
|
|
|
|
} else { |
|
|
|
@ -293,4 +309,5 @@ public class PullCommand extends GitCommand<PullResult> {
|
|
|
|
|
monitor.endTask(); |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|