diff options
Diffstat (limited to 'plugins/git4idea/src/git4idea/push')
| -rw-r--r-- | plugins/git4idea/src/git4idea/push/GitPushDialog.java | 3 | ||||
| -rw-r--r-- | plugins/git4idea/src/git4idea/push/GitPushLog.java | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/git4idea/src/git4idea/push/GitPushDialog.java b/plugins/git4idea/src/git4idea/push/GitPushDialog.java index 56476078f692..f12b7b407c89 100644 --- a/plugins/git4idea/src/git4idea/push/GitPushDialog.java +++ b/plugins/git4idea/src/git4idea/push/GitPushDialog.java @@ -15,6 +15,7 @@ */ package git4idea.push; +import com.intellij.dvcs.DvcsUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; @@ -219,7 +220,7 @@ public class GitPushDialog extends DialogWrapper { private static String logMessageForCommits(GitCommitsByRepoAndBranch commitsToPush) { StringBuilder logMessage = new StringBuilder(); for (GitCommit commit : commitsToPush.getAllCommits()) { - logMessage.append(GitUtil.getShortHash(commit.getId().toString())); + logMessage.append(DvcsUtil.getShortHash(commit.getId().toString())); } return logMessage.toString(); } diff --git a/plugins/git4idea/src/git4idea/push/GitPushLog.java b/plugins/git4idea/src/git4idea/push/GitPushLog.java index 99d3c1350698..e3659554bdf2 100644 --- a/plugins/git4idea/src/git4idea/push/GitPushLog.java +++ b/plugins/git4idea/src/git4idea/push/GitPushLog.java @@ -29,7 +29,6 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowser; import com.intellij.ui.*; import com.intellij.util.ArrayUtil; import com.intellij.util.Consumer; -import com.intellij.util.text.DateFormatUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; import git4idea.GitBranch; @@ -336,12 +335,12 @@ class GitPushLog extends JPanel implements TypeSafeDataProvider { @NotNull private static String getDateString(@NotNull GitCommit commit) { - return DateFormatUtil.formatPrettyDateTime(commit.getTimestamp()) + " "; + return DvcsUtil.getDateString(commit); } @NotNull private static String getHashString(@NotNull GitCommit commit) { - return GitUtil.getShortHash(commit.getId().toString()); + return DvcsUtil.getShortHash(commit.getId().toString()); } private static class MyTreeCellRenderer extends CheckboxTree.CheckboxTreeCellRenderer { |