From d2777df1d4364b5cc244dabbede51b543d5bbc53 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 8 Jul 2013 14:54:44 +0200 Subject: [PATCH] update jgit to 3.0.0.201306101825-r --- pom.xml | 2 +- .../scm/repository/GitRepositoryHandler.java | 11 +++-- .../scm/repository/spi/GitPullCommand.java | 3 +- .../client/GitRepositoryClient.java | 41 +++++++++---------- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index 8eec6ed8d6..48d3fccedd 100644 --- a/pom.xml +++ b/pom.xml @@ -430,7 +430,7 @@ 1.2.2 - 2.3.1.201302201838-r + 3.0.0.201306101825-r 1.7.9-scm2 diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java index 6db4473f7c..713e589f8c 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java @@ -38,7 +38,6 @@ package sonia.scm.repository; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.jgit.storage.file.FileRepository; import org.eclipse.jgit.storage.file.FileRepositoryBuilder; import sonia.scm.Type; @@ -259,19 +258,19 @@ public class GitRepositoryHandler protected void create(Repository repository, File directory) throws RepositoryException, IOException { - FileRepository fr = null; + org.eclipse.jgit.lib.Repository gitRepository = null; try { - fr = new FileRepositoryBuilder().setGitDir( + gitRepository = new FileRepositoryBuilder().setGitDir( directory).readEnvironment().findGitDir().build(); - fr.create(true); + gitRepository.create(true); } finally { - if (fr != null) + if (gitRepository != null) { - fr.close(); + gitRepository.close(); } } } diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java index 8315c7484d..fd458ffddb 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java @@ -30,13 +30,14 @@ */ + package sonia.scm.repository.spi; //~--- non-JDK imports -------------------------------------------------------- import com.google.common.base.Preconditions; -import org.eclipse.jgit.storage.file.FileRepository; +import org.eclipse.jgit.internal.storage.file.FileRepository; import sonia.scm.repository.GitRepositoryHandler; import sonia.scm.repository.GitUtil; diff --git a/scm-test/src/main/java/sonia/scm/repository/client/GitRepositoryClient.java b/scm-test/src/main/java/sonia/scm/repository/client/GitRepositoryClient.java index cdb61783db..9f73fcb21a 100644 --- a/scm-test/src/main/java/sonia/scm/repository/client/GitRepositoryClient.java +++ b/scm-test/src/main/java/sonia/scm/repository/client/GitRepositoryClient.java @@ -46,6 +46,7 @@ import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.NoRemoteRepositoryException; import org.eclipse.jgit.errors.NotSupportedException; import org.eclipse.jgit.errors.TransportException; +import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefComparator; @@ -53,7 +54,6 @@ import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.TextProgressMonitor; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.storage.file.FileRepository; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.FetchResult; import org.eclipse.jgit.transport.PushResult; @@ -100,8 +100,8 @@ public class GitRepositoryClient extends AbstractRepositoryClient * @throws URISyntaxException */ GitRepositoryClient(File localRepository, String remoteRepository, - String username, String password) - throws URISyntaxException, IOException + String username, String password) + throws URISyntaxException, IOException { super(localRepository, remoteRepository); uri = new URIish(remoteRepository); @@ -111,11 +111,11 @@ public class GitRepositoryClient extends AbstractRepositoryClient uri.setUser(username); uri.setPass(password); credentialsProvider = new UsernamePasswordCredentialsProvider(username, - password); + password); } this.repository = new FileRepository(new File(localRepository, - Constants.DOT_GIT)); + Constants.DOT_GIT)); } //~--- methods -------------------------------------------------------------- @@ -131,7 +131,7 @@ public class GitRepositoryClient extends AbstractRepositoryClient */ @Override public void add(String file, String... others) - throws RepositoryClientException + throws RepositoryClientException { AddCommand cmd = new Git(repository).add(); @@ -172,7 +172,7 @@ public class GitRepositoryClient extends AbstractRepositoryClient case REJECTED : case REJECTED_CURRENT_BRANCH : throw new RepositoryClientException("could not checkout, status " - + ru.getResult().name()); + + ru.getResult().name()); } } @@ -253,9 +253,8 @@ public class GitRepositoryClient extends AbstractRepositoryClient case REJECTED_REMOTE_CHANGED : case REJECTED_OTHER_REASON : throw new RepositoryClientException( - "could not update ref ".concat( - refUpdate.getSrcRef()).concat( - " status ".concat(refUpdate.getStatus().toString()))); + "could not update ref ".concat(refUpdate.getSrcRef()).concat( + " status ".concat(refUpdate.getStatus().toString()))); } } } @@ -288,7 +287,7 @@ public class GitRepositoryClient extends AbstractRepositoryClient { repository.create(false); addRemote("origin", new URIish(remoteRepository), "master", null, true, - null); + null); } catch (Exception ex) { @@ -311,10 +310,9 @@ public class GitRepositoryClient extends AbstractRepositoryClient * @throws URISyntaxException */ private void addRemote(final String remoteName, final URIish uri, - final String branchName, final String tagName, - final boolean allSelected, - final Collection selectedBranches) - throws URISyntaxException, IOException + final String branchName, final String tagName, final boolean allSelected, + final Collection selectedBranches) + throws URISyntaxException, IOException { // add remote configuration @@ -349,18 +347,18 @@ public class GitRepositoryClient extends AbstractRepositoryClient // setup the default remote branch for branchName repository.getConfig().setString("branch", branchName, "remote", - remoteName); + remoteName); if (branchName != null) { repository.getConfig().setString("branch", branchName, "merge", - Constants.R_HEADS + branchName); + Constants.R_HEADS + branchName); } if (tagName != null) { repository.getConfig().setString("branch", branchName, "merge", - Constants.R_TAGS + branchName); + Constants.R_TAGS + branchName); } repository.getConfig().save(); @@ -476,8 +474,7 @@ public class GitRepositoryClient extends AbstractRepositoryClient * @throws MissingObjectException */ private RevCommit parseCommit(Ref branch) - throws MissingObjectException, IncorrectObjectTypeException, - IOException + throws MissingObjectException, IncorrectObjectTypeException, IOException { final RevWalk rw = new RevWalk(repository); final RevCommit commit; @@ -506,8 +503,8 @@ public class GitRepositoryClient extends AbstractRepositoryClient * @throws URISyntaxException */ private FetchResult runFetch() - throws NotSupportedException, URISyntaxException, TransportException, - RepositoryClientException + throws NotSupportedException, URISyntaxException, TransportException, + RepositoryClientException { FetchResult r = null;