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

[file-history] better revision description: fix date, add committer name, make it gray to distinguish with message

Browse Source
This commit is contained in:
Julia Beliaeva
2016-05-30 03:24:59 +03:00
parent cb0e5b71e2
commit a7964a3224
1 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+41 -10
View File
@@ -346,7 +346,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
final boolean isStaticEmbedded) {
this(vcs, filePath, null, session, provider, contentManager, refresherI, isStaticEmbedded);
}
public FileHistoryPanelImpl(AbstractVcs vcs,
@NotNull FilePath filePath,
@Nullable VcsRevisionNumber startingRevision,
@@ -672,19 +672,24 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
return;
}
boolean addRevisionInfo = selection.size() > 1;
StringBuilder sb = new StringBuilder();
StringBuilder original = new StringBuilder();
StringBuilder html = new StringBuilder();
for (TreeNodeOnVcsRevision revision : selection) {
String message = revision.getCommitMessage();
if (StringUtil.isEmpty(message)) continue;
if (sb.length() > 0) sb.append("\n\n");
if (addRevisionInfo) {
sb.append(RevisionColumnInfo.toString(revision, true)).append(" ")
.append(AuthorColumnInfo.toString(revision)).append(" on ")
.append(DateColumnInfo.toString(revision)).append("\n");
if (original.length() > 0) {
original.append("\n\n");
html.append("<br/><br/>");
}
sb.append(message);
if (addRevisionInfo) {
String revisionInfo = getRevisionInfo(revision);
html.append("<font color=\"#").append(Integer.toHexString(JBColor.gray.getRGB()).substring(2)).append("\">").append(getHtmlWithFonts(revisionInfo)).append("</font><br/>");
original.append(revisionInfo).append("\n");
}
original.append(message);
html.append(getHtmlWithFonts(formatTextWithLinks(myVcs.getProject(), message)));
}
myOriginalComment = sb.toString();
myOriginalComment = original.toString();
if (StringUtil.isEmpty(myOriginalComment)) {
myComments.setText("");
}
@@ -692,7 +697,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
myComments.setText("<html><head>" +
UIUtil.getCssFontDeclaration(UIUtil.getLabelFont()) +
"</head><body>" +
getHtmlWithFonts(formatTextWithLinks(myVcs.getProject(), myOriginalComment)) +
html.toString() +
"</body></html>");
myComments.setCaretPosition(0);
}
@@ -701,6 +706,32 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
}
}
private static String getRevisionInfo(@NotNull TreeNodeOnVcsRevision revision) {
StringBuilder sb = new StringBuilder();
// revision
sb.append(RevisionColumnInfo.toString(revision, true)).append(" ");
// author
VcsFileRevision vcsFileRevision = revision.getRevision();
sb.append(vcsFileRevision.getAuthor()).append(" ");
// date
sb.append(formatDateTime(revision.getRevisionDate().getTime()));
// committed by
if (vcsFileRevision instanceof VcsFileRevisionEx) {
if (!Comparing.equal(vcsFileRevision.getAuthor(), ((VcsFileRevisionEx)vcsFileRevision).getCommitterName())) {
sb.append(" (committed by ").append(((VcsFileRevisionEx)vcsFileRevision).getCommitterName()).append(")");
}
}
return sb.toString();
}
@NotNull
private static String formatDateTime(long time) {
return " on " + DateFormatUtil.formatDate(time) + " at " + DateFormatUtil.formatTime(time);
}
protected JComponent createCenterPanel() {
mySplitter = new OnePixelSplitter(true, getSplitterProportion());