Browse Source

Bump JGit version to 3.0.0-SNAPSHOT

tags/v1.3.0
David Ostrovsky 11 years ago
parent
commit
2b76826802

+ 2
- 2
build.moxie View File

description: pure Java Git solution description: pure Java Git solution
groupId: com.gitblit groupId: com.gitblit
artifactId: gitblit artifactId: gitblit
version: 1.3.0-SNAPSHOT
version: 1.4.0-SNAPSHOT
inceptionYear: 2011 inceptionYear: 2011


# Current stable release # Current stable release
jetty.version : 7.6.8.v20121106 jetty.version : 7.6.8.v20121106
wicket.version : 1.4.21 wicket.version : 1.4.21
lucene.version : 3.6.1 lucene.version : 3.6.1
jgit.version : 2.3.1.201302201838-r
jgit.version : 3.0.0-SNAPSHOT
groovy.version : 1.8.8 groovy.version : 1.8.8
bouncycastle.version : 1.47 bouncycastle.version : 1.47
selenium.version : 2.28.0 selenium.version : 2.28.0

+ 4
- 2
src/main/java/com/gitblit/AddIndexedBranch.java View File

import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryCache.FileKey; import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS;
import com.beust.jcommander.JCommander; import com.beust.jcommander.JCommander;
try { try {
// load repository config // load repository config
File gitDir = FileKey.resolve(new File(folder, repo), FS.DETECTED); File gitDir = FileKey.resolve(new File(folder, repo), FS.DETECTED);
FileRepository repository = new FileRepository(gitDir);
FileRepository repository = (FileRepository)new FileRepositoryBuilder().setGitDir(gitDir).build();
FileBasedConfig config = repository.getConfig(); FileBasedConfig config = repository.getConfig();
config.load(); config.load();

+ 3
- 3
src/main/java/com/gitblit/GCExecutor.java View File

import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.storage.file.GC;
import org.eclipse.jgit.storage.file.GC.RepoStatistics;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.internal.storage.file.GC;
import org.eclipse.jgit.internal.storage.file.GC.RepoStatistics;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

+ 1
- 1
src/main/java/com/gitblit/GitBlit.java View File

import org.eclipse.jgit.lib.RepositoryCache.FileKey; import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.storage.file.WindowCache;
import org.eclipse.jgit.internal.storage.file.WindowCache;
import org.eclipse.jgit.storage.file.WindowCacheConfig; import org.eclipse.jgit.storage.file.WindowCacheConfig;
import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.FileUtils;

+ 3
- 2
src/main/java/com/gitblit/utils/JGitUtils.java View File

import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.filter.CommitTimeRevFilter; import org.eclipse.jgit.revwalk.filter.CommitTimeRevFilter;
import org.eclipse.jgit.revwalk.filter.RevFilter; import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.CredentialsProvider; 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;
File folder = new File(repositoriesFolder, name); File folder = new File(repositoriesFolder, name);
if (folder.exists()) { if (folder.exists()) {
File gitDir = FileKey.resolve(new File(repositoriesFolder, name), FS.DETECTED); File gitDir = FileKey.resolve(new File(repositoriesFolder, name), FS.DETECTED);
FileRepository repository = new FileRepository(gitDir);
FileRepository repository = (FileRepository)new FileRepositoryBuilder().setGitDir(gitDir).build();
result.fetchResult = fetchRepository(credentialsProvider, repository); result.fetchResult = fetchRepository(credentialsProvider, repository);
repository.close(); repository.close();
} else { } else {

Loading…
Cancel
Save