diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java index 9667cb8ae4a8..0c09759898e5 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java @@ -648,13 +648,10 @@ public abstract class HgUtil { } // vasya.pupkin@email.com || else if (!authorString.contains(" ") && startDomainIndex > 0) { //simple e-mail check. john@localhost + userName = ""; if (startEmailIndex >= 0 && startDomainIndex > startEmailIndex && startDomainIndex < endEmailIndex) { - // --> vasya.pupkin, vasya.pupkin@email.com - userName = authorString.substring(startEmailIndex + 1, startDomainIndex).trim(); email = authorString.substring(startEmailIndex + 1, endEmailIndex).trim(); } else { - // vasya.pupkin@email.com --> vasya.pupkin, vasya.pupkin@email.com - userName = authorString.substring(0, startDomainIndex).trim(); email = authorString; } } diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/log/HgLogParseTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/log/HgLogParseTest.java index 441f5345ee0c..7ca67dd0681e 100644 --- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/log/HgLogParseTest.java +++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/log/HgLogParseTest.java @@ -52,11 +52,11 @@ public class HgLogParseTest { new Couple("Vasya Pavlovich Pupkin", "asdasd@localhost")); assertEquals(HgUtil.parseUserNameAndEmail("Vasya Pavlovich Pupkin"), new Couple("Vasya Pavlovich Pupkin", "")); assertEquals(HgUtil.parseUserNameAndEmail("vasya.pupkin@localhost.com"), - new Couple("vasya.pupkin", "vasya.pupkin@localhost.com")); + new Couple("", "vasya.pupkin@localhost.com")); assertEquals(HgUtil.parseUserNameAndEmail(""), - new Couple("vasya.pupkin", "vasya.pupkin@localhost.com")); + new Couple("", "vasya.pupkin@localhost.com")); assertEquals(HgUtil.parseUserNameAndEmail(""), - new Couple("vasya", "vasya@localhost.com")); + new Couple("", "vasya@localhost.com")); assertEquals(HgUtil.parseUserNameAndEmail("Vasya "), new Couple("Vasya", "vas@localhost.com")); }