# 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/clone/Bundle.properties --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/clone/Bundle.properties Base (1.14) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/clone/Bundle.properties Locally Modified (Based On 1.14) @@ -38,13 +38,13 @@ # made subject to such option by the copyright holder. MSG_Clone_Progress = Cloning ... -MSG_CLONE_TITLE = Mercurial Clone +MSG_CLONE_TITLE = Mercurial Clone MSG_CLONE_TITLE_SEP = --------------- MSG_CLONE_FROM = INFO Clone From: {0} - {1} -MSG_CLONE_TO = INFO To: {0} - {1} -MSG_CLONE_DONE = INFO: End of Clone +MSG_CLONE_TO = INFO To: {0} - {1} +MSG_CLONE_DONE = INFO: End of Clone MSG_EXTERNAL_CLONE_FROM = INFO Clone From: {0} -MSG_EXTERNAL_CLONE_TO = INFO To: {0} +MSG_EXTERNAL_CLONE_TO = INFO To: {0} LBL_Clone_Progress=Cloning... ClonePanel.fromLabel.text=Source Repository: 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.13) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java Locally Modified (Based On 1.13) @@ -92,7 +92,7 @@ public final static int FLAG_SHOW_PROXY = 64; private final static String LOCAL_URL_HELP = "file:///repository_path"; // NOI18N - private final static String HTTP_URL_HELP = "http://hostname/repository_path"; // NOI18N + private final static String HTTP_URL_HELP = "http://[username[:password]@]hostname/repository_path"; // NOI18N private final static String HTTPS_URL_HELP = "https://hostname/repository_path"; // NOI18N private final static String STATIC_HTTP_URL_HELP = "static-http://hostname/repository_path"; // NOI18N private final static String SSH_URL_HELP = "ssh://hostname/repository_path"; // NOI18N Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/wizards/CloneRepositoryWizardPanel.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/wizards/CloneRepositoryWizardPanel.java Base (1.11) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/wizards/CloneRepositoryWizardPanel.java Locally Modified (Based On 1.11) @@ -283,11 +283,17 @@ // Note: valid repository returns con.getContentLength() = -1 // so no way to reliably test if this url exists, without using hg if (con != null){ - if (con.getResponseCode() != HttpURLConnection.HTTP_OK){ + String userInfo = uri.getUserInfo(); + boolean bNoUserAndOrPasswordInURL = userInfo == null; + // If username or username:password is in the URL the con.getResponseCode() returns -1 and this check would fail + if (bNoUserAndOrPasswordInURL && con.getResponseCode() != HttpURLConnection.HTTP_OK){ invalidMsg = NbBundle.getMessage(CloneRepositoryWizardPanel.class, "MSG_Progress_Clone_CannotAccess_Err"); con.disconnect(); return; + }else if (userInfo != null){ + Mercurial.LOG.log(Level.FINE, + "RepositoryStepProgressSupport.perform(): UserInfo - {0}", new Object[]{userInfo}); // NOI18N } con.disconnect(); }