Browse Source
* stable-5.2:
Fix NPE in RebaseTodoFile#parseComments
Fix NPE in ObjectIdOwnerMap#get
Fix NPE in CommitOnlyTest#getHead
FileUtils#lastModifiedInstant should not log error if path doesn't exist
Cache user global and system-wide git configurations
Avoid setup and saving FileStoreAttributes compete for ~/.gitconfig lock
Add missing dependencies for running FS_POSIXTest in Eclipse
Fix javadoc for SystemReader#getInstance
Improve retry handling when saving FileStoreAttributes fails
Ensure FSTest uses MockSystemReader
Make supportsAtomicCreateNewFile return true as default
Update orbit to R20190602212107-2019-06 to enable backports from master
Handle InvalidPathException in FS_POSIX#createNewFileAtomic
Ensure root cause of lock creation failures is logged
Implement toString in MockSystemReader and MockConfig
LocalDiskRefTreeDatabaseTest shall use MockSystemReader
Ensure LocalDiskRepositoryTestCase#setup fully uses MockSystemReader
Ensure we use MockSystemReader in tests
Override FileBasedConfig's save method in MockConfig
Remove FileBasedConfig.load(boolean) introduced in d45219ba
Disable debug log for FS in org.eclipse.jgit.test
Bazel: enable logging for tests in org.eclipse.jgit.test
LockFile: log exception if creation of lock file failed
Stop using deprecated Constants.CHARACTER_ENCODING
Change-Id: If0c5010a2cf151ebebb2f2088fac3ee02c5007b9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-5.3
Matthias Sohn
5 years ago
49 changed files with 754 additions and 383 deletions
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
||||
<component id="org.eclipse.jgit.lfs" version="2"> |
||||
<resource path="META-INF/MANIFEST.MF"> |
||||
<filter id="924844039"> |
||||
<message_arguments> |
||||
<message_argument value="5.3.3"/> |
||||
<message_argument value="5.3.0"/> |
||||
</message_arguments> |
||||
</filter> |
||||
</resource> |
||||
</component> |
||||
@ -1,7 +1,7 @@
|
||||
target "jgit-4.6" with source configurePhase |
||||
|
||||
include "projects/jetty-9.4.14.tpd" |
||||
include "orbit/R20190226160451-2019-03.tpd" |
||||
include "orbit/R20190602212107-2019-06.tpd" |
||||
|
||||
location "http://download.eclipse.org/releases/neon/" { |
||||
org.eclipse.osgi lazy |
||||
|
||||
@ -1,7 +1,7 @@
|
||||
target "jgit-4.9" with source configurePhase |
||||
|
||||
include "projects/jetty-9.4.14.tpd" |
||||
include "orbit/R20190226160451-2019-03.tpd" |
||||
include "orbit/R20190602212107-2019-06.tpd" |
||||
|
||||
location "http://download.eclipse.org/releases/2018-09/" { |
||||
org.eclipse.osgi lazy |
||||
|
||||
@ -0,0 +1,64 @@
|
||||
target "R20190602212107-2019-06" with source configurePhase |
||||
// see http://download.eclipse.org/tools/orbit/downloads/ |
||||
|
||||
location "http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository" { |
||||
org.apache.ant [1.10.5.v20190526-1402,1.10.5.v20190526-1402] |
||||
org.apache.ant.source [1.10.5.v20190526-1402,1.10.5.v20190526-1402] |
||||
org.apache.commons.codec [1.10.0.v20180409-1845,1.10.0.v20180409-1845] |
||||
org.apache.commons.codec.source [1.10.0.v20180409-1845,1.10.0.v20180409-1845] |
||||
org.apache.commons.compress [1.18.0.v20181121-2221,1.18.0.v20181121-2221] |
||||
org.apache.commons.compress.source [1.18.0.v20181121-2221,1.18.0.v20181121-2221] |
||||
org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] |
||||
org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] |
||||
org.apache.httpcomponents.httpclient [4.5.6.v20190503-0009,4.5.6.v20190503-0009] |
||||
org.apache.httpcomponents.httpclient.source [4.5.6.v20190503-0009,4.5.6.v20190503-0009] |
||||
org.apache.httpcomponents.httpcore [4.4.10.v20190123-2214,4.4.10.v20190123-2214] |
||||
org.apache.httpcomponents.httpcore.source [4.4.10.v20190123-2214,4.4.10.v20190123-2214] |
||||
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] |
||||
org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] |
||||
org.bouncycastle.bcpg [1.60.0.v20181210-2057,1.60.0.v20181210-2057] |
||||
org.bouncycastle.bcpg.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057] |
||||
org.bouncycastle.bcpkix [1.60.0.v20181210-2057,1.60.0.v20181210-2057] |
||||
org.bouncycastle.bcpkix.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057] |
||||
org.bouncycastle.bcprov [1.60.0.v20181210-2057,1.60.0.v20181210-2057] |
||||
org.bouncycastle.bcprov.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057] |
||||
org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] |
||||
org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] |
||||
org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] |
||||
org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] |
||||
org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] |
||||
org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] |
||||
org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] |
||||
javaewah [1.1.6.v20160919-1400,1.1.6.v20160919-1400] |
||||
javaewah.source [1.1.6.v20160919-1400,1.1.6.v20160919-1400] |
||||
org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519] |
||||
org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] |
||||
org.mockito [2.23.0.v20190527-1420,2.23.0.v20190527-1420] |
||||
org.mockito.source [2.23.0.v20190527-1420,2.23.0.v20190527-1420] |
||||
net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410] |
||||
net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410] |
||||
net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534] |
||||
net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534] |
||||
com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110] |
||||
com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110] |
||||
com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902] |
||||
com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902] |
||||
org.junit [4.12.0.v201504281640,4.12.0.v201504281640] |
||||
org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640] |
||||
javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] |
||||
javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] |
||||
org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613] |
||||
org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613] |
||||
org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250] |
||||
org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250] |
||||
org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] |
||||
org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] |
||||
com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305] |
||||
com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305] |
||||
net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323] |
||||
net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323] |
||||
org.apache.sshd.core [2.0.0.v20181102-1323,2.0.0.v20181102-1323] |
||||
org.apache.sshd.core.source [2.0.0.v20181102-1323,2.0.0.v20181102-1323] |
||||
org.apache.sshd.sftp [2.0.0.v20181102-1323,2.0.0.v20181102-1323] |
||||
org.apache.sshd.sftp.source [2.0.0.v20181102-1323,2.0.0.v20181102-1323] |
||||
} |
||||
@ -0,0 +1,9 @@
|
||||
org.slf4j.simpleLogger.logFile = System.err |
||||
org.slf4j.simpleLogger.cacheOutputStream = true |
||||
org.slf4j.simpleLogger.defaultLogLevel = info |
||||
org.slf4j.simpleLogger.showDateTime = true |
||||
org.slf4j.simpleLogger.dateTimeFormat = HH:mm:ss.SSSXXX |
||||
org.slf4j.simpleLogger.showThreadName = true |
||||
|
||||
#org.slf4j.simpleLogger.log.org.eclipse.jgit.util.FS = debug |
||||
#org.slf4j.simpleLogger.log.org.eclipse.jgit.internal.storage.file.FileSnapshot = debug |
||||
@ -0,0 +1,139 @@
|
||||
/* |
||||
* Copyright (C) 2019, Vishal Devgire <vishaldevgire@gmail.com> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.util; |
||||
|
||||
import static org.junit.Assert.assertFalse; |
||||
import static org.junit.Assert.assertTrue; |
||||
|
||||
import java.io.File; |
||||
import java.io.IOException; |
||||
import java.nio.file.Files; |
||||
import java.nio.file.Path; |
||||
|
||||
import org.eclipse.jgit.junit.MockSystemReader; |
||||
import org.eclipse.jgit.lib.ConfigConstants; |
||||
import org.eclipse.jgit.storage.file.FileBasedConfig; |
||||
import org.junit.After; |
||||
import org.junit.Before; |
||||
import org.junit.Test; |
||||
|
||||
public class FS_POSIXTest { |
||||
private SystemReader originalSystemReaderInstance; |
||||
|
||||
private FileBasedConfig systemConfig; |
||||
|
||||
private FileBasedConfig userConfig; |
||||
|
||||
private Path tmp; |
||||
|
||||
@Before |
||||
public void setUp() throws Exception { |
||||
tmp = Files.createTempDirectory("jgit_test_"); |
||||
MockSystemReader mockSystemReader = new MockSystemReader(); |
||||
SystemReader.setInstance(mockSystemReader); |
||||
|
||||
// Measure timer resolution before the test to avoid time critical tests
|
||||
// are affected by time needed for measurement.
|
||||
// The MockSystemReader must be configured first since we need to use
|
||||
// the same one here
|
||||
FS.getFileStoreAttributes(tmp.getParent()); |
||||
systemConfig = new FileBasedConfig( |
||||
new File(tmp.toFile(), "systemgitconfig"), FS.DETECTED); |
||||
userConfig = new FileBasedConfig(systemConfig, |
||||
new File(tmp.toFile(), "usergitconfig"), FS.DETECTED); |
||||
// We have to set autoDetach to false for tests, because tests expect to
|
||||
// be able to clean up by recursively removing the repository, and
|
||||
// background GC might be in the middle of writing or deleting files,
|
||||
// which would disrupt this.
|
||||
userConfig.setBoolean(ConfigConstants.CONFIG_GC_SECTION, null, |
||||
ConfigConstants.CONFIG_KEY_AUTODETACH, false); |
||||
userConfig.save(); |
||||
mockSystemReader.setSystemGitConfig(systemConfig); |
||||
mockSystemReader.setUserGitConfig(userConfig); |
||||
|
||||
originalSystemReaderInstance = SystemReader.getInstance(); |
||||
SystemReader.setInstance(mockSystemReader); |
||||
} |
||||
|
||||
@After |
||||
public void tearDown() throws IOException { |
||||
SystemReader.setInstance(originalSystemReaderInstance); |
||||
FileUtils.delete(tmp.toFile(), FileUtils.RECURSIVE | FileUtils.RETRY); |
||||
} |
||||
|
||||
@Test |
||||
public void supportsAtomicCreateNewFile_shouldReturnSupportedAsDefault() { |
||||
assertTrue(new FS_POSIX().supportsAtomicCreateNewFile()); |
||||
} |
||||
|
||||
@Test |
||||
public void supportsAtomicCreateNewFile_shouldReturnTrueIfFlagIsSetInUserConfig() { |
||||
setAtomicCreateCreationFlag(userConfig, "true"); |
||||
assertTrue(new FS_POSIX().supportsAtomicCreateNewFile()); |
||||
} |
||||
|
||||
@Test |
||||
public void supportsAtomicCreateNewFile_shouldReturnTrueIfFlagIsSetInSystemConfig() { |
||||
setAtomicCreateCreationFlag(systemConfig, "true"); |
||||
assertTrue(new FS_POSIX().supportsAtomicCreateNewFile()); |
||||
} |
||||
|
||||
@Test |
||||
public void supportsAtomicCreateNewFile_shouldReturnFalseIfFlagUnsetInUserConfig() { |
||||
setAtomicCreateCreationFlag(userConfig, "false"); |
||||
assertFalse(new FS_POSIX().supportsAtomicCreateNewFile()); |
||||
} |
||||
|
||||
@Test |
||||
public void supportsAtomicCreateNewFile_shouldReturnFalseIfFlagUnsetInSystemConfig() { |
||||
setAtomicCreateCreationFlag(systemConfig, "false"); |
||||
assertFalse(new FS_POSIX().supportsAtomicCreateNewFile()); |
||||
} |
||||
|
||||
private void setAtomicCreateCreationFlag(FileBasedConfig config, |
||||
String value) { |
||||
config.setString(ConfigConstants.CONFIG_CORE_SECTION, null, |
||||
ConfigConstants.CONFIG_KEY_SUPPORTSATOMICFILECREATION, value); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue