From 2c0d75439884154c0f67b73e03a3ac9aa0dd9af5 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 4 Nov 2013 20:24:05 +0400 Subject: [PATCH] [log] Don't display commit time if equal to author time --- .../com/intellij/vcs/log/ui/frame/DetailsPanel.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java index 22346edecdcd..c9fe1021e547 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java @@ -165,8 +165,14 @@ class DetailsPanel extends JPanel implements ListSelectionListener { String authorText = commit.getAuthorName() + " at " + DateFormatUtil.formatDateTime(commit.getAuthorTime()); if (!commit.getAuthorName().equals(commit.getCommitterName()) || !commit.getAuthorEmail().equals(commit.getCommitterEmail())) { - authorText += " (committed by " + commit.getCommitterName() + - " at " + DateFormatUtil.formatDateTime(commit.getCommitTime()) + ")"; + String commitTime; + if (commit.getCommitTime() != commit.getAuthorTime()) { + commitTime = " at " + DateFormatUtil.formatDateTime(commit.getCommitTime()); + } + else { + commitTime = ""; + } + authorText += " (committed by " + commit.getCommitterName() + commitTime + ")"; } myAuthor.setText(authorText); }