--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Settings.java	Tue Sep 28 12:31:48 2010 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Settings.java	Tue Sep 28 12:49:37 2010 +0400
@@ -23,6 +23,8 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -130,15 +132,18 @@
   }
 
   private boolean containsCredentials(final String repository) {
-    for (String proto: AUTH_PROTOS) {
-      if (repository.startsWith(proto)) {
-        String withoutProto = repository.substring(proto.length());
-        int comma = withoutProto.indexOf(':');
-        int at = withoutProto.indexOf('@');
-        if (at != -1 && comma != -1 && at > comma) return true;
+    try {
+      URI repositoryURI = new URI(repository);
+      String scheme = repositoryURI.getScheme();
+      if (AUTH_PROTOS.contains(scheme + "://")) {
+        String userInfo = repositoryURI.getUserInfo();
+        return userInfo != null && userInfo.contains(":");
+      } else {
+        return false;
       }
+    } catch (URISyntaxException e) {
+      return false;
     }
-    return false;
   }
 
   public void setHgCommandPath(@NotNull final String hgCommandPath) {