Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into
Browse files Browse the repository at this point in the history 
JENKINS-25444-fetch-clean

Conflicts:
	src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java
	src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java
  • Loading branch information
@pauxus
pauxus committed Nov 7, 2014
2 parents 4c59a74 + 797f600 commit b8725a5
Show file tree
Hide file tree
Showing 5 changed files with 327 additions and 134 deletions.
10 changes: 5 additions & 5 deletions src/main/java/hudson/plugins/git/Branch.java
View file
@@ -1,25 +1,25 @@
package hudson.plugins.git;

import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;

public class Branch extends GitObject {
private static final long serialVersionUID = 1L;

public Branch(String name, ObjectId sha1) {
super(name, sha1);
}

public Branch(Ref candidate) {
super(strip(candidate.getName()), candidate.getObjectId());
}

private static String strip(String name) {
return name.substring(name.indexOf('/', 5) + 1);
}

public @Override String toString() {
return "Branch " + name + "(" + sha1 + ")";
}

}
15 changes: 11 additions & 4 deletions src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
View file
Expand Up @@ -400,6 +400,16 @@ public void execute() throws GitException, InterruptedException {
// this allows launchCommandWithCredentials() to pass credentials via a local gitconfig

init_().workspace(workspace.getAbsolutePath()).execute();

if (shared) {
if (reference == null || reference.isEmpty()) {
// we use origin as reference
reference = url;
} else {
listener.getLogger().println("[WARNING] Both shared and reference is used, shared is ignored.");
}
}

if (reference != null && !reference.isEmpty()) {
File referencePath = new File(reference);
if (!referencePath.exists())
Expand Down Expand Up @@ -429,9 +439,6 @@ else if (!referencePath.isDirectory())
}
}

if (shared)
throw new UnsupportedOperationException("shared is unsupported, and considered dangerous");

RefSpec refSpec = new RefSpec("+refs/heads/*:refs/remotes/"+origin+"/*");
fetch_().from(urIish, Collections.singletonList(refSpec))
.shallow(shallow)
Expand Down Expand Up @@ -1324,7 +1331,7 @@ private File getFileFromEnv(String envVar, String suffix) {
if (envValue == null) {
return null;
}
return new File(envValue + suffix);
return new File(envValue + suffix);
}

private File getSSHExeFromGitExeParentDir(String userGitExe) {
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/org/jenkinsci/plugins/gitclient/CloneCommand.java
View file
@@ -1,6 +1,9 @@
package org.jenkinsci.plugins.gitclient;

/**
* Command to clone a repository. This command behaves differently from CLI clone command, it never actually checks out
* into the workspace.
*
* @author Kohsuke Kawaguchi
*/
public interface CloneCommand extends GitCommand {
Expand All @@ -20,11 +23,13 @@ public interface CloneCommand extends GitCommand {
CloneCommand shared();

CloneCommand reference(String reference);

CloneCommand timeout(Integer timeout);

/**
* When we just need to clone repository without populating the workspace (for instance when sparse checkouts are used)
* When we just need to clone repository without populating the workspace (for instance when sparse checkouts are used).
* This parameter does not do anything, a checkout will never be performed.
*/
@Deprecated
CloneCommand noCheckout();
}
210 changes: 166 additions & 44 deletions src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java
View file
@@ -1,10 +1,15 @@
package org.jenkinsci.plugins.gitclient;

import com.cloudbees.plugins.credentials.common.StandardCredentials;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;

import edu.umd.cs.findbugs.annotations.NonNull;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.removeStart;
import static org.eclipse.jgit.api.ResetCommand.ResetType.HARD;
import static org.eclipse.jgit.api.ResetCommand.ResetType.MIXED;
import static org.eclipse.jgit.lib.Constants.CHARSET;
import static org.eclipse.jgit.lib.Constants.HEAD;
import static org.eclipse.jgit.lib.Constants.R_HEADS;
import static org.eclipse.jgit.lib.Constants.R_REMOTES;
import static org.eclipse.jgit.lib.Constants.R_TAGS;
import static org.eclipse.jgit.lib.Constants.typeString;
import hudson.FilePath;
import hudson.Util;
import hudson.model.TaskListener;
Expand All @@ -15,9 +20,32 @@
import hudson.plugins.git.Revision;
import hudson.util.IOUtils;

import org.apache.commons.lang.StringUtils;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;

import javax.annotation.Nullable;

import org.eclipse.jgit.api.AddNoteCommand;
import org.eclipse.jgit.api.CommitCommand;
import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode;
import org.eclipse.jgit.api.FetchCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.ListBranchCommand;
Expand All @@ -37,8 +65,19 @@
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.fnmatch.FileNameMatcher;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.*;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefDatabase;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryBuilder;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.merge.MergeStrategy;
import org.eclipse.jgit.notes.Note;
import org.eclipse.jgit.revwalk.RevCommit;
Expand All @@ -64,31 +103,11 @@
import org.jenkinsci.plugins.gitclient.trilead.SmartCredentialsProvider;
import org.jenkinsci.plugins.gitclient.trilead.TrileadSessionFactory;

import javax.annotation.Nullable;

import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import com.cloudbees.plugins.credentials.common.StandardCredentials;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;

import static org.apache.commons.lang.StringUtils.*;
import static org.eclipse.jgit.api.ResetCommand.ResetType.*;
import static org.eclipse.jgit.lib.Constants.*;
import edu.umd.cs.findbugs.annotations.NonNull;

/**
* GitClient pure Java implementation using JGit.
Expand Down Expand Up @@ -238,7 +257,36 @@ private void doCheckout(String ref) throws GitException {
}
}

git(repo).checkout().setName(ref).call();
if (repo.resolve(ref) != null) {
// ref is either an existing reference or a shortcut to a tag or branch (without refs/heads/)
git(repo).checkout().setName(ref).setForce(true).call();
return;
}

List<String> remoteTrackingBranches = new ArrayList<String>();
for (String remote : repo.getRemoteNames()) {
// look for exactly ONE remote tracking branch
String matchingRemoteBranch = Constants.R_REMOTES + remote + "/" + ref;
if (repo.getRef(matchingRemoteBranch) != null) {
remoteTrackingBranches.add(matchingRemoteBranch);
}
}

if (remoteTrackingBranches.isEmpty()) {
throw new GitException("No matching revision for " + ref + " found.");
}
if (remoteTrackingBranches.size() > 1) {
throw new GitException("Found more than one matching remote tracking branches for " + ref + " : " + remoteTrackingBranches);
}

String matchingRemoteBranch = remoteTrackingBranches.get(0);
listener.getLogger().format("[WARNING] Automatically creating a local branch '%s' tracking remote branch '%s'", ref, removeStart(matchingRemoteBranch, Constants.R_REMOTES));

git(repo).checkout()
.setCreateBranch(true)
.setName(ref)
.setUpstreamMode(SetupUpstreamMode.SET_UPSTREAM)
.setStartPoint(matchingRemoteBranch).call();
return;
} catch (CheckoutConflictException e) {
if (repo != null) {
Expand All @@ -261,6 +309,8 @@ private void doCheckout(String ref) throws GitException {
}
}
}
} catch (IOException e) {
throw new GitException("Could not checkout " + ref, e);
} catch (GitAPIException e) {
throw new GitException("Could not checkout " + ref, e);
} catch (JGitInternalException e) {
Expand Down Expand Up @@ -1101,20 +1151,21 @@ public void clean() throws GitException {
}

public CloneCommand clone_() {
final org.eclipse.jgit.api.CloneCommand base = new org.eclipse.jgit.api.CloneCommand();
base.setDirectory(workspace);
base.setProgressMonitor(new JGitProgressMonitor(listener));
base.setCredentialsProvider(getProvider());

return new CloneCommand() {
String url;
String remote = Constants.DEFAULT_REMOTE_NAME;
String reference;
Integer timeout;
boolean shared;

public CloneCommand url(String url) {
base.setURI(url);
this.url = url;
return this;
}

public CloneCommand repositoryName(String name) {
base.setRemote(name);
this.remote = name;
return this;
}

Expand All @@ -1124,38 +1175,109 @@ public CloneCommand shallow() {
}

public CloneCommand shared() {
listener.getLogger().println("[WARNING] JGit doesn't support shared flag. This flag is ignored");
this.shared = true;
return this;
}

public CloneCommand reference(String reference) {
listener.getLogger().println("[WARNING] JGit doesn't support reference repository. This flag is ignored.");
this.reference = reference;
return this;
}

public CloneCommand timeout(Integer timeout) {
// noop in jgit
this.timeout = timeout;
return this;
}

public CloneCommand noCheckout() {
base.setNoCheckout(true);
// this.noCheckout = true; ignored, we never do a checkout
return this;
}

public void execute() throws GitException, InterruptedException {
Repository repository = null;

try {
// the directory needs to be clean or else JGit complains
if (workspace.exists())
Util.deleteContentsRecursive(workspace);

base.call();
// since jgit clone/init commands do not support object references (e.g. alternates),
// we build the repository directly using the RepositoryBuilder

RepositoryBuilder builder = new RepositoryBuilder();
builder.readEnvironment().setGitDir(new File(workspace, Constants.DOT_GIT));

if (shared) {
if (reference == null || reference.isEmpty()) {
// we use origin as reference
reference = url;
} else {
listener.getLogger().println("[WARNING] Both 'shared' and 'reference' is used, shared is ignored.");
}
}

if (reference != null && !reference.isEmpty())
builder.addAlternateObjectDirectory(new File(reference));

repository = builder.build();
repository.create();

// the repository builder does not create the alternates file
if (reference != null && !reference.isEmpty()) {
File referencePath = new File(reference);
if (!referencePath.exists())
listener.error("Reference path does not exist: " + reference);
else if (!referencePath.isDirectory())
listener.error("Reference path is not a directory: " + reference);
else {
// reference path can either be a normal or a base repository
File objectsPath = new File(referencePath, ".git/objects");
if (!objectsPath.isDirectory()) {
// reference path is bare repo
objectsPath = new File(referencePath, "objects");
}
if (!objectsPath.isDirectory())
listener.error("Reference path does not contain an objects directory (no git repo?): " + objectsPath);
else {
try {
File alternates = new File(workspace, ".git/objects/info/alternates");
PrintWriter w = new PrintWriter(alternates, "UTF-8");
// git implementations on windows also use
w.print(objectsPath.getAbsolutePath().replace('\\', '/'));
w.close();
} catch (FileNotFoundException e) {
listener.error("Failed to setup reference");
}
}
}
}

// Jgit repository has alternates directory set, but seems to ignore them
// Workaround: close this repo and create a new one
repository.close();
repository = getRepository();

RefSpec refSpec = new RefSpec("+refs/heads/*:refs/remotes/"+remote+"/*");
FetchCommand fetch = new Git(repository).fetch()
.setProgressMonitor(new JGitProgressMonitor(listener))
.setRemote(url)
.setCredentialsProvider(getProvider())
.setRefSpecs(refSpec);
if (timeout != null) fetch.setTimeout(timeout);
fetch.call();

StoredConfig config = repository.getConfig();
config.setString("remote", remote, "url", url);
config.setString("remote", remote, "fetch", refSpec.toString());
config.save();

} catch (GitAPIException e) {
throw new GitException(e);
} catch (IOException e) {
throw new GitException(e);
} finally {
if (base.getRepository() != null) base.getRepository().close();
if (repository != null) repository.close();
}
}
};
Expand Down

0 comments on commit b8725a5

Please sign in to comment.