diff options
| author | Markus Duft | 2016-07-04 09:11:23 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2018-06-13 14:54:19 +0000 |
| commit | 9df32ed5010bd1cb6851f9385e494b205046fbca (patch) | |
| tree | c1ef3619083899e4dbfb8bca7bf04e7aa7abd091 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties | |
| parent | 908d32b8b181169532b30d53406e120e3500a95e (diff) | |
| download | egit-9df32ed5010bd1cb6851f9385e494b205046fbca.tar.gz egit-9df32ed5010bd1cb6851f9385e494b205046fbca.tar.xz egit-9df32ed5010bd1cb6851f9385e494b205046fbca.zip | |
EGit integration for LFS
* Register builtin LFS on startup
When EGit starts and the lfs bundle (org.eclipse.jgit.lfs) is
available register the LFS implementation and check configuration.
* Allow install (enablement) of LFS support in Preferences (global) and
on the repository (local).
* Apply smudge/clean filters where applicable and required.
* LFS integration using built-in JGit lfs filters fully works when using
Gerrit with lfs plugin using ssh protocol.
* Pushing lfs objects over http still fails with 401 response code,
this is tracked in JGit bug 535814
Change-Id: I465da0f1c7f88272d3ec0e6545eea582eae631ec
Also-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 704e466720..8ded3f8322 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -256,6 +256,11 @@ GitPreferenceRoot_useLogicalModel=Allow models (e.g., Java, EMF) to participate GitPreferenceRoot_preferreMergeStrategy_label=You can select a specific merge strategy below\nto override the default JGit merge behavior for merge operations\n(merge, rebase, pull, revert, squash, stash, submodule update) GitPreferenceRoot_preferreMergeStrategy_group=Preferred merge strategy for operations that require merges GitPreferenceRoot_defaultMergeStrategyLabel=Default Strategy (as defined by JGit) +GitPreferenceRoot_lfsSupportCaption=LFS support +GitPreferenceRoot_lfsSupportCaptionNotAvailable=LFS support (not installed) +GitPreferenceRoot_lfsSupportInstall=Enable LFS support globally (for the current user) +GitPreferenceRoot_lfsSupportSuccessMessage=LFS support has been installed for the current user. +GitPreferenceRoot_lfsSupportSuccessTitle=LFS configured GitProjectPropertyPage_LabelBranch=Branch: GitProjectPropertyPage_LabelGitDir=Git directory: GitProjectPropertyPage_LabelId=HEAD: @@ -1311,6 +1316,7 @@ RepositoriesViewLabelProvider_SubmodulesNodeText=Submodules RepositoriesViewLabelProvider_SymbolicRefNodeText=References RepositoriesViewLabelProvider_TagsNodeText=Tags +DialogsPreferencePage_autoConfigureLfs=Automatically configure LFS without confirmation DialogsPreferencePage_DetachedHeadCombo=D&etached HEAD and checkout of remote-tracking branch DialogsPreferencePage_HideConfirmationGroupHeader=Show confirmation dialogs DialogsPreferencePage_ShowInfoGroupHeader=Show result dialogs after git remote operations @@ -1421,6 +1427,8 @@ user global configuration and to define the default location to store repositori not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and\n\ EGit might behave differently since they see different configuration options.\n\ This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. +ConfigurationChecker_installLfsCannotInstall=Cannot install LFS support +ConfigurationChecker_installLfsCannotLoadConfig=Cannot load user configuration ConfigurationEditorComponent_ConfigLocationLabel=&Location: ConfigurationEditorComponent_EmptyStringNotAllowed=Empty string is not allowed ConfigurationEditorComponent_KeyColumnHeader=Key |