MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[hg] do not set userName to VcsUsers that do not have it

Browse Source
This commit is contained in:
Julia Beliaeva
2016-03-26 19:55:37 +03:00
parent 0b9d425f2d
commit f95b01a22e
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
+1 -4
View File
@@ -648,13 +648,10 @@ public abstract class HgUtil {
}
// vasya.pupkin@email.com || <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@email.com> --> 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;
}
}
plugins/hg4idea/testSrc/org/zmlx/hg4idea/log/HgLogParseTest.java
+3 -3
View File
@@ -52,11 +52,11 @@ public class HgLogParseTest {
new Couple<String>("Vasya Pavlovich Pupkin", "asdasd@localhost"));
assertEquals(HgUtil.parseUserNameAndEmail("Vasya Pavlovich Pupkin"), new Couple<String>("Vasya Pavlovich Pupkin", ""));
assertEquals(HgUtil.parseUserNameAndEmail("vasya.pupkin@localhost.com"),
new Couple<String>("vasya.pupkin", "vasya.pupkin@localhost.com"));
new Couple<String>("", "vasya.pupkin@localhost.com"));
assertEquals(HgUtil.parseUserNameAndEmail("<vasya.pupkin@localhost.com>"),
new Couple<String>("vasya.pupkin", "vasya.pupkin@localhost.com"));
new Couple<String>("", "vasya.pupkin@localhost.com"));
assertEquals(HgUtil.parseUserNameAndEmail("<vasya@localhost.com>"),
new Couple<String>("vasya", "vasya@localhost.com"));
new Couple<String>("", "vasya@localhost.com"));
assertEquals(HgUtil.parseUserNameAndEmail("Vasya <vas@localhost.com>"),
new Couple<String>("Vasya", "vas@localhost.com"));
}