Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2018-10-20 10:47:52 -0400
committerThomas Wolf2018-11-17 12:57:51 -0500
commit33cc25fcead0ed86bd61c0f87625aac1dcaf6b90 (patch)
treec9fa7bece549ab658933d1af2c25f25a5550a152 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parent2f75c631e5f4e5f0354d18ff0311abf69c6db8bc (diff)
downloadegit-33cc25fcead0ed86bd61c0f87625aac1dcaf6b90.tar.gz
egit-33cc25fcead0ed86bd61c0f87625aac1dcaf6b90.tar.xz
egit-33cc25fcead0ed86bd61c0f87625aac1dcaf6b90.zip
Include the Apache MINA ssh client
Add a preference with UI in the main Git preference page to select between JSch and the new Apache MINA sshd client. Read preferences from the org.eclipse.jsch.core preference node and install a listener to pick up preference changes. The session factory thus can use the ssh preferences as configured by the user. For the time being, we use the ssh directory, the default identities, and the preferred authentication mechanisms. The latter two can be overridden through the ssh config file, which will be the one in the configured ssh directory. The other preferences from org.eclipse.jsch are not taken into account; sshd may have different algorithms available and I don't want to change preferences in a foreign bundle. Make the proxy service accessible in the EGit core activator, and use it in a ProxyDataFactory in the EGitSshdSessionFactory. The EGitSshdSessionFactory has no key cache. Eclipse is a long-running application, and keeping ssh keys in memory for that long is most probably not wise. Instead re-load keys whenever they are needed, and use an IdentityPasswordProvider (which provides passwords for encrypted private key files) that uses the Eclipse secure storage for key passphrases to avoid repeatedly asking the user for the same passphrases for the same keys. Bug: 520927 JGit-Dependency: Iaa78bbb998a5e574fa091664b75c48a3b9cfb897 Change-Id: Id3cf850c4e132e864eab7eda52c20ff379e2b1d9 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
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.properties15
1 files changed, 9 insertions, 6 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 e1cbc9402..1ac276970 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
@@ -241,7 +241,7 @@ GitHistoryPage_toggleEmailAddresses=&E-mail Addresses
GitLightweightDecorator_name=Git resource decorations
GitPreferenceRoot_automaticallyEnableChangesetModel=Automatically enable commit &grouping in Git synchronizations
GitPreferenceRoot_BlameGroupHeader=Revision Information
-GitPreferenceRoot_BlameIgnoreWhitespaceLabel=Ignore whitespace changes
+GitPreferenceRoot_BlameIgnoreWhitespaceLabel=Ignore &whitespace changes
GitPreferenceRoot_fetchBeforeSynchronization=Always launch fetch before synchronization
GitPreferenceRoot_CloningRepoGroupHeader=Cloning repositories
GitPreferenceRoot_DefaultRepoFolderLabel=Default repository &folder:
@@ -256,14 +256,16 @@ GitPreferenceRoot_MergeModeTooltip=Determines which content to be displayed on t
GitPreferenceRoot_RemoteConnectionsGroupHeader=Remote connections
GitPreferenceRoot_RepoChangeScannerGroupHeader=Automatic refresh
GitPreferenceRoot_SecureStoreGroupLabel=Secure Store
-GitPreferenceRoot_SecureStoreUseByDefault=Store credentials in secure store by default
+GitPreferenceRoot_SecureStoreUseByDefault=Store credentials in secure store by &default
+GitPreferenceRoot_SshClient_Jsch_Label=JSch
+GitPreferenceRoot_SshClient_Apache_Label=Apache MINA sshd
GitPreferenceRoot_useLogicalModel=Allow models (e.g., Java, EMF) to participate in synchronizations
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_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:
@@ -1056,10 +1058,10 @@ ProjectsPreferencePage_AutoShareProjects=Automatically share projects located in
ProjectsPreferencePage_RestoreBranchProjects=Track each branch's imported projects and restore on checkout
ProjectsPreferencePage_AutoIgnoreDerivedResources=Automatically ignore derived resources by adding them to .gitignore
-RefreshPreferencesPage_RefreshIndexInterval=Refre&sh interval (seconds):
+RefreshPreferencesPage_RefreshIndexInterval=Refresh &interval (seconds):
RefreshPreferencesPage_RefreshIndexIntervalTooltip=0 is equivalent to no refresh
RefreshPreferencesPage_RefreshOnlyWhenActive=Refresh only when workbench is &active
-RefreshPreferencesPage_RefreshWhenIndexChange=Refresh resources when &index changes
+RefreshPreferencesPage_RefreshWhenIndexChange=&Refresh resources when index changes
RefUpdateElement_CommitCountDecoration=({0})
RefUpdateElement_CommitRangeDecoration=[{0}{1}{2}]
RefUpdateElement_statusRejectedNonFastForward=[rejected - non-fast-forward]
@@ -1756,7 +1758,8 @@ NotesEditorPage_Title=Notes
GitPreferenceRoot_MaxPullThreadsCount=&Maximum number of parallel pulls:
GitPreferenceRoot_MaxPullThreadsCountTooltip=1 disables parallel pulls
-RemoteConnectionPreferencePage_TimeoutLabel=&Remote connection timeout (seconds):
+RemoteConnectionPreferencePage_SshClientLabel=&Ssh client:
+RemoteConnectionPreferencePage_TimeoutLabel=&Connection timeout (seconds):
RemoteConnectionPreferencePage_ZeroValueTooltip=0 is equivalent to no timeout
RemoveCommand_ConfirmDeleteBareRepositoryMessage=This will permanently delete repository ''{0}''.\n\nDo you want to continue?
RemoveCommand_ConfirmDeleteBareRepositoryTitle=Delete Bare Repository

Back to the top