From faa92cd7c64ba4bce5d399c90fa855ed7a9d916d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 8 Aug 2019 16:44:43 +0200 Subject: Configure FS to determine FileStore attributes asynchronously We don't want to block EGit while JGit measures filesystem specific attributes like timestamp resolution which may block for a couple of seconds. While attributes are measured in the background JGit will use fallback values until the measurement is finished. Measured values are persisted in ~/.gitconfig under config key "filesystem" and reloaded from there on restart. Change-Id: Ia9691581ab0f6ac4499f02370f19642be1e3f8b6 Signed-off-by: Matthias Sohn --- org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java') diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java index f82cc6d6e6..4ad8e5c8bd 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java @@ -211,6 +211,8 @@ public class Activator extends Plugin implements DebugOptionsListener { super.start(context); pluginId = context.getBundle().getSymbolicName(); + FS.setAsyncFileStoreAttributes(true); + SystemReader.setInstance( new EclipseSystemReader(SystemReader.getInstance())); -- cgit v1.2.3 From d72ae77ab560641ef50b8cad2f75f59cc4e8251d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 8 Aug 2019 16:55:28 +0200 Subject: Remove trailing blank in javadoc of Activator#logError Change-Id: I37d346819486e917456e1928cc1b4cfb2f6e12ea Signed-off-by: Matthias Sohn --- org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java') diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java index 4ad8e5c8bd..e382d1dc75 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java @@ -149,7 +149,7 @@ public class Activator extends Plugin implements DebugOptionsListener { /** * Utility method to log errors in the Egit plugin. - * + * * @param message * User comprehensible message * @param thr -- cgit v1.2.3 From 8a5c8b12562fa7c2ec445a14df7e2a704422f00b Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Tue, 20 Aug 2019 07:37:12 +0200 Subject: [releng] Update target platform & SystemReader to JGit changes During the fixes in JGit 5.1.9 the JGit target platform was changed, and SystemReader got two new abstract methods. EGit doesn't build anymore after these changes. Update the target platform to match the one in JGit to enable building both EGit and JGit in the same workspace, and add implementations for the two new methods in the EclipseSystemReader. Change-Id: Ic1392b8e140d2be118226567a71be62ba833477d Signed-off-by: Thomas Wolf (cherry picked from commit 88ea3acf4878360f7b9cae6614a122579b316f7f) Signed-off-by: Matthias Sohn --- .../src/org/eclipse/egit/core/Activator.java | 14 ++++++++++++++ org.eclipse.egit.target/egit-4.10.target | 14 +++++++------- org.eclipse.egit.target/egit-4.11.target | 14 +++++++------- org.eclipse.egit.target/egit-4.12-staging.target | 14 +++++++------- org.eclipse.egit.target/egit-4.6.target | 14 +++++++------- org.eclipse.egit.target/egit-4.7.target | 14 +++++++------- org.eclipse.egit.target/egit-4.8.target | 14 +++++++------- org.eclipse.egit.target/egit-4.9.target | 14 +++++++------- org.eclipse.egit.target/orbit/R20190602212107-2019-06.tpd | 12 ++++++------ 9 files changed, 69 insertions(+), 55 deletions(-) (limited to 'org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java') diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java index e382d1dc75..1e96377b22 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java @@ -69,8 +69,10 @@ import org.eclipse.egit.core.project.RepositoryFinder; import org.eclipse.egit.core.project.RepositoryMapping; import org.eclipse.egit.core.securestorage.EGitSecureStore; import org.eclipse.equinox.security.storage.SecurePreferencesFactory; +import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.merge.MergeStrategy; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.transport.SshSessionFactory; @@ -1103,5 +1105,17 @@ public class Activator extends Plugin implements DebugOptionsListener { public int getTimezone(long when) { return delegate.getTimezone(when); } + + @Override + public StoredConfig getUserConfig() + throws IOException, ConfigInvalidException { + return delegate.getUserConfig(); + } + + @Override + public StoredConfig getSystemConfig() + throws IOException, ConfigInvalidException { + return delegate.getSystemConfig(); + } } } diff --git a/org.eclipse.egit.target/egit-4.10.target b/org.eclipse.egit.target/egit-4.10.target index 5a3b96c293..fb9432fd6e 100644 --- a/org.eclipse.egit.target/egit-4.10.target +++ b/org.eclipse.egit.target/egit-4.10.target @@ -1,7 +1,7 @@ - + @@ -75,12 +75,12 @@ - - - - - - + + + + + + diff --git a/org.eclipse.egit.target/egit-4.11.target b/org.eclipse.egit.target/egit-4.11.target index efc4c90889..90a3144fc5 100644 --- a/org.eclipse.egit.target/egit-4.11.target +++ b/org.eclipse.egit.target/egit-4.11.target @@ -1,7 +1,7 @@ - + @@ -75,12 +75,12 @@ - - - - - - + + + + + + diff --git a/org.eclipse.egit.target/egit-4.12-staging.target b/org.eclipse.egit.target/egit-4.12-staging.target index 02942dda51..13fa3c81e9 100644 --- a/org.eclipse.egit.target/egit-4.12-staging.target +++ b/org.eclipse.egit.target/egit-4.12-staging.target @@ -1,7 +1,7 @@ - + @@ -75,12 +75,12 @@ - - - - - - + + + + + + diff --git a/org.eclipse.egit.target/egit-4.6.target b/org.eclipse.egit.target/egit-4.6.target index 5dbeaa2a05..552adb7355 100644 --- a/org.eclipse.egit.target/egit-4.6.target +++ b/org.eclipse.egit.target/egit-4.6.target @@ -1,7 +1,7 @@ - + @@ -75,12 +75,12 @@ - - - - - - + + + + + + diff --git a/org.eclipse.egit.target/egit-4.7.target b/org.eclipse.egit.target/egit-4.7.target index 42d8515a40..4fb168f8c8 100644 --- a/org.eclipse.egit.target/egit-4.7.target +++ b/org.eclipse.egit.target/egit-4.7.target @@ -1,7 +1,7 @@ - + @@ -75,12 +75,12 @@ - - - - - - + + + + + + diff --git a/org.eclipse.egit.target/egit-4.8.target b/org.eclipse.egit.target/egit-4.8.target index b996b68367..42a47472a8 100644 --- a/org.eclipse.egit.target/egit-4.8.target +++ b/org.eclipse.egit.target/egit-4.8.target @@ -1,7 +1,7 @@ - + @@ -75,12 +75,12 @@ - - - - - - + + + + + + diff --git a/org.eclipse.egit.target/egit-4.9.target b/org.eclipse.egit.target/egit-4.9.target index 03921faabf..fe62a91d82 100644 --- a/org.eclipse.egit.target/egit-4.9.target +++ b/org.eclipse.egit.target/egit-4.9.target @@ -1,7 +1,7 @@ - + @@ -75,12 +75,12 @@ - - - - - - + + + + + + diff --git a/org.eclipse.egit.target/orbit/R20190602212107-2019-06.tpd b/org.eclipse.egit.target/orbit/R20190602212107-2019-06.tpd index f25d7e41e2..aab371406b 100644 --- a/org.eclipse.egit.target/orbit/R20190602212107-2019-06.tpd +++ b/org.eclipse.egit.target/orbit/R20190602212107-2019-06.tpd @@ -48,12 +48,12 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R201906022121 org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] org.junit [4.12.0.v201504281640,4.12.0.v201504281640] org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640] - org.mockito [2.13.0.v20180426-1843,2.13.0.v20180426-1843] - org.mockito.source [2.13.0.v20180426-1843,2.13.0.v20180426-1843] - net.bytebuddy.byte-buddy [1.7.9.v20180420-1519,1.7.9.v20180420-1519] - net.bytebuddy.byte-buddy.source [1.7.9.v20180420-1519,1.7.9.v20180420-1519] - net.bytebuddy.byte-buddy-agent [1.7.9.v20180420-1519,1.7.9.v20180420-1519] - net.bytebuddy.byte-buddy-agent.source [1.7.9.v20180420-1519,1.7.9.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] 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.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250] -- cgit v1.2.3