diff options
| author | Matthias Sohn | 2018-10-07 08:34:31 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2018-10-07 08:34:31 +0000 |
| commit | e8c1dda7e558882a5d332c8146ba658bdf5d9780 (patch) | |
| tree | 9a738c08a94c2a403972c60cae476c1362edfacd /org.eclipse.egit.ui | |
| parent | 41664dd15940b78269695a575d9c6c46647a49a1 (diff) | |
| parent | ec4c22327b64e6ce07b94084c873e268cfb08485 (diff) | |
| download | egit-e8c1dda7e558882a5d332c8146ba658bdf5d9780.tar.gz egit-e8c1dda7e558882a5d332c8146ba658bdf5d9780.tar.xz egit-e8c1dda7e558882a5d332c8146ba658bdf5d9780.zip | |
Merge branch 'stable-5.1'
* stable-5.1:
Prepare 5.1.3-SNAPSHOT builds
EGit v5.1.2.201810061102-r
Don't use virtual memory mapping in WindowCache on Windows
Change-Id: I0fbe5e117691a13a1e6bdbc89d690aff42a11a2f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java index ce3c228887..2bf360a153 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/WindowCachePreferencePage.java @@ -17,6 +17,7 @@ import org.eclipse.egit.core.project.GitProjectData; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.jgit.util.SystemReader; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.preferences.ScopedPreferenceStore; @@ -63,9 +64,13 @@ public class WindowCachePreferencePage extends FieldEditorPreferencePage UIText.WindowCachePreferencePage_streamFileThreshold, getFieldEditorParent(), 10 * MB, 1 * GB)); - addField(new BooleanFieldEditor(GitCorePreferences.core_packedGitMMAP, - UIText.WindowCachePreferencePage_packedGitMMAP, - getFieldEditorParent())); + if (!SystemReader.getInstance().isWindows()) { + BooleanFieldEditor mmapEditor = new BooleanFieldEditor( + GitCorePreferences.core_packedGitMMAP, + UIText.WindowCachePreferencePage_packedGitMMAP, + getFieldEditorParent()); + addField(mmapEditor); + } } @Override |