From 4a8cb65e7f52d0e03657c7306469064aa8f438f8 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 11 May 2011 20:30:33 +0400 Subject: [PATCH] [Git] Store Subject in GitCommit. --- plugins/git4idea/src/git4idea/history/GitHistoryUtils.java | 2 +- .../git4idea/src/git4idea/history/browser/GitCommit.java | 7 +++++++ .../src/git4idea/history/wholeTree/DetailsLoaderImpl.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java index 9b9ebca04d64..5760d3b9fd28 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java @@ -502,7 +502,7 @@ public class GitHistoryUtils { final String s = parseRefs(refs, currentRefs, locals, remotes, tags); gitCommit = new GitCommit(AbstractHash.create(record.getShortHash()), new SHAHash(record.getHash()), record.getAuthorName(), record.getCommitterName(), - record.getDate(), record.getFullMessage(), + record.getDate(), record.getSubject(), record.getFullMessage(), new HashSet(Arrays.asList(record.getParentsShortHashes())), record.getFilePaths(root), record.getAuthorEmail(), record.getCommitterEmail(), tags, locals, remotes, diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCommit.java b/plugins/git4idea/src/git4idea/history/browser/GitCommit.java index 71f2af4485c7..8ecc14275459 100644 --- a/plugins/git4idea/src/git4idea/history/browser/GitCommit.java +++ b/plugins/git4idea/src/git4idea/history/browser/GitCommit.java @@ -31,6 +31,7 @@ public class GitCommit { private final SHAHash myHash; private final String myAuthor; private final String myCommitter; + private final String mySubject; private final String myDescription; private final Date myDate; @@ -60,6 +61,7 @@ public class GitCommit { final String author, final String committer, final Date date, + final String subject, final String description, final Set parentsHashes, final List pathsList, @@ -74,6 +76,7 @@ public class GitCommit { myAuthor = author; myCommitter = committer; myDate = date; + mySubject = subject; myDescription = description; myHash = hash; myParentsHashes = parentsHashes; @@ -223,4 +226,8 @@ public class GitCommit { } }); } + + public String getSubject() { + return mySubject; + } } diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/DetailsLoaderImpl.java b/plugins/git4idea/src/git4idea/history/wholeTree/DetailsLoaderImpl.java index 0293f3462cb0..a3fbe82972d1 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/DetailsLoaderImpl.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/DetailsLoaderImpl.java @@ -194,7 +194,7 @@ public class DetailsLoaderImpl implements DetailsLoader { private GitCommit createNotLoadedCommit(AbstractHash shortHash) { final String notKnown = "Can not load"; - return new GitCommit(shortHash, SHAHash.emulate(shortHash), notKnown, notKnown, new Date(0), + return new GitCommit(shortHash, SHAHash.emulate(shortHash), notKnown, notKnown, new Date(0), notKnown, "Can not load details", Collections.emptySet(), Collections.emptyList(), notKnown, notKnown, Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), 0);