# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Bundle.properties
--- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Bundle.properties Base (1.5)
+++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Bundle.properties Locally Modified (Based On 1.5)
@@ -61,8 +61,6 @@
for direct Mercurial repositories access\
http\://hostname/repository_path\
for connecting Mercurial repository via WebDAV protocol\
-https\://hostname/repository_path\
-for connecting Mercurial repository via WebDAV protocol with SSL encryption\
static-http\://hostname/repository_path\
for connecting Mercurial repository without requiring a special server on the web host\
\ssh://hostname/repository_path\
@@ -111,9 +109,8 @@
IDE directly supports the following Mercurial URL types:\
- {0}
- for direct Mercurial repositories access
\
- {1}
- for connecting Mercurial repository via WebDAV protocol
\
- - {2}
- for connecting Mercurial repository via WebDAV protocol with SSL encryption
\
- - {3}
- for connecting Mercurial repository without requiring a special server on the web host
\
- - {4}
- for connecting Mercurial repository via ssh
\
+ - {2}
- for connecting Mercurial repository without requiring a special server on the web host
\
+ - {3}
- for connecting Mercurial repository via ssh
\
ACSD_RepositoryPanel_Title=Specify Mercurial repository location
Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java
--- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java Base (1.11)
+++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java Locally Modified (Based On 1.11)
@@ -197,7 +197,7 @@
// templates for supported connection methods
recentRoots.add(new RepositoryConnection("file:///")); // NOI18N
recentRoots.add(new RepositoryConnection("http://")); // NOI18N
- recentRoots.add(new RepositoryConnection("https://")); // NOI18N
+ //recentRoots.add(new RepositoryConnection("https://")); // NOI18N
recentRoots.add(new RepositoryConnection("static-http://")); // NOI18N
recentRoots.add(new RepositoryConnection("ssh://")); // NOI18N
};
@@ -402,10 +402,10 @@
repositoryPanel.tipLabel.setText(HTTP_URL_HELP);
authFields = true;
proxyFields = true;
- } else if(selectedUrlString.startsWith("https:")) { // NOI18N
- repositoryPanel.tipLabel.setText(HTTPS_URL_HELP);
- authFields = true;
- proxyFields = true;
+ //} else if(selectedUrlString.startsWith("https:")) { // NOI18N
+ //repositoryPanel.tipLabel.setText(HTTPS_URL_HELP);
+ //authFields = true;
+ //proxyFields = true;
} else if(selectedUrlString.startsWith("static-http:")) { // NOI18N
repositoryPanel.tipLabel.setText(STATIC_HTTP_URL_HELP);
authFields = true;
@@ -417,16 +417,23 @@
repositoryPanel.tipLabel.setText(LOCAL_URL_HELP);
} else {
repositoryPanel.tipLabel.setText(NbBundle.getMessage(Repository.class, "MSG_Repository_Url_Help", new Object [] { // NOI18N
- LOCAL_URL_HELP, HTTP_URL_HELP, HTTPS_URL_HELP, STATIC_HTTP_URL_HELP, SSH_URL_HELP
+ //LOCAL_URL_HELP, HTTP_URL_HELP, HTTPS_URL_HELP, STATIC_HTTP_URL_HELP, SSH_URL_HELP
+ LOCAL_URL_HELP, HTTP_URL_HELP, STATIC_HTTP_URL_HELP, SSH_URL_HELP
}));
}
- repositoryPanel.userPasswordField.setVisible(authFields);
- repositoryPanel.passwordLabel.setVisible(authFields);
- repositoryPanel.userTextField.setVisible(authFields);
- repositoryPanel.leaveBlankLabel.setVisible(authFields);
- repositoryPanel.userLabel.setVisible(authFields);
+ //repositoryPanel.userPasswordField.setVisible(authFields);
+ //repositoryPanel.passwordLabel.setVisible(authFields);
+ //repositoryPanel.userTextField.setVisible(authFields);
+ //repositoryPanel.leaveBlankLabel.setVisible(authFields);
+ //repositoryPanel.userLabel.setVisible(authFields);
//repositoryPanel.savePasswordCheckBox.setVisible(authFields);
+ repositoryPanel.userPasswordField.setVisible(false);
+ repositoryPanel.passwordLabel.setVisible(false);
+ repositoryPanel.userTextField.setVisible(false);
+ repositoryPanel.leaveBlankLabel.setVisible(false);
+ repositoryPanel.userLabel.setVisible(authFields);
+ repositoryPanel.savePasswordCheckBox.setVisible(false);
repositoryPanel.proxySettingsButton.setVisible(proxyFields && ((modeMask & FLAG_SHOW_PROXY) != 0));
//repositoryPanel.tunnelCommandTextField.setVisible(sshFields);
//repositoryPanel.tunnelCommandLabel.setVisible(sshFields);
@@ -440,8 +447,9 @@
}
private String getSVNTunnelTip(String urlString) {
- String tunnelName = getTunnelName(urlString);
- return MessageFormat.format(SSH_URL_HELP, tunnelName).trim();
+ //String tunnelName = getTunnelName(urlString);
+ //return MessageFormat.format(SSH_URL_HELP, tunnelName).trim();
+ return SSH_URL_HELP;
}
private String getTunnelName(String urlString) {