From 03df92ae400a276c5ed77cec44e13b8bf857c424 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Fri, 4 Mar 2016 03:09:23 +0300 Subject: [PATCH] [hg] fix users in full details --- .../src/org/zmlx/hg4idea/HgRevisionNumber.java | 15 ++++++++++++--- .../zmlx/hg4idea/log/HgFileRevisionLogParser.java | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java index e51a479f8448..ecfffcea3d9f 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java @@ -69,10 +69,19 @@ public class HgRevisionNumber implements VcsRevisionNumber { @NotNull String authorInfo, @NotNull String commitMessage, @NotNull List parents) { + this(revision, changeset, HgUtil.parseUserNameAndEmail(authorInfo).getFirst(), HgUtil.parseUserNameAndEmail(authorInfo).getSecond(), + commitMessage, parents); + } + + public HgRevisionNumber(@NotNull String revision, + @NotNull String changeset, + @NotNull String author, + @NotNull String email, + @NotNull String commitMessage, + @NotNull List parents) { this.commitMessage = commitMessage; - Couple authorArgs = HgUtil.parseUserNameAndEmail(authorInfo); - this.author = authorArgs.getFirst(); - this.email = authorArgs.getSecond(); + this.author = author; + this.email = email; this.parents = parents; this.revision = revision.trim(); this.changeset = changeset.trim(); diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgFileRevisionLogParser.java b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgFileRevisionLogParser.java index 3e0e0db3cd9c..540a025d2507 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgFileRevisionLogParser.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgFileRevisionLogParser.java @@ -53,7 +53,7 @@ public class HgFileRevisionLogParser extends HgBaseLogParser { int numAttributes = attributes.size(); String commitMessage = parseAdditionalStringAttribute(attributes, MESSAGE_INDEX); String branchName = parseAdditionalStringAttribute(attributes, BRANCH_INDEX); - final HgRevisionNumber vcsRevisionNumber = new HgRevisionNumber(rev, changeset, author, commitMessage, parents); + final HgRevisionNumber vcsRevisionNumber = new HgRevisionNumber(rev, changeset, author, email, commitMessage, parents); Set filesAdded = Collections.emptySet(); Set filesModified = Collections.emptySet();