opendev/gerrit
Code Issues Proposed changes

Update to JGit 0.8.4.240-g8e9cc82

Browse Source 
Change-Id: Id43a1846b31bb1aad40ca0ae295a268fcacd162f
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-08-05 17:57:35 -07:00
parent 91c1532130
commit 5f11b2954c
26 changed files with 255 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitFlags.java
View File

@@ -19,7 +19,8 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.FileBasedConfig;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
import java.io.IOException;
@@ -40,8 +41,8 @@ public class InitFlags {
@Inject
InitFlags(final SitePaths site) throws IOException, ConfigInvalidException {
cfg = new FileBasedConfig(site.gerrit_config);
sec = new FileBasedConfig(site.secure_config);
cfg = new FileBasedConfig(site.gerrit_config, FS.DETECTED);
sec = new FileBasedConfig(site.secure_config, FS.DETECTED);
cfg.load();
sec.load();

11
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitUtil.java
View File

@@ -17,15 +17,16 @@ package com.google.gerrit.pgm.init;
import com.google.gerrit.pgm.util.Die;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileBasedConfig;
import org.eclipse.jgit.lib.LockFile;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.storage.file.LockFile;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.SystemReader;
import java.io.OutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.URI;
import java.net.URISyntaxException;
@@ -48,7 +49,7 @@ class InitUtil {
static void saveSecure(final FileBasedConfig sec) throws IOException {
final byte[] out = Constants.encode(sec.toText());
final File path = sec.getFile();
final LockFile lf = new LockFile(path);
final LockFile lf = new LockFile(path, FS.DETECTED);
if (!lf.lock()) {
throw new IOException("Cannot lock " + path);
}
@@ -169,7 +170,7 @@ class InitUtil {
throws FileNotFoundException, IOException {
try {
dst.getParentFile().mkdirs();
LockFile lf = new LockFile(dst);
LockFile lf = new LockFile(dst, FS.DETECTED);
if (!lf.lock()) {
throw new IOException("Cannot lock " + dst);
}

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java
View File

@@ -26,7 +26,7 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.FileBasedConfig;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import java.io.File;
import java.io.FileInputStream;