diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java index 046e16c148a4..007df92a403b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java @@ -26,12 +26,13 @@ import com.intellij.openapi.vcs.actions.VcsContextFactory; import com.intellij.openapi.vcs.history.VcsFileRevision; import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vcs.impl.ContentRevisionCache; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnRevisionNumber; import org.jetbrains.idea.svn.SvnUtil; import org.jetbrains.idea.svn.SvnVcs; -import org.tmatesoft.svn.core.SVNLogEntry; +import org.jetbrains.idea.svn.checkin.CommitInfo; import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc2.SvnTarget; @@ -47,7 +48,7 @@ public class SvnFileRevision implements VcsFileRevision { private final Date myDate; private String myCommitMessage; private final String myAuthor; - private final VcsRevisionNumber myRevisionNumber; + private final SvnRevisionNumber myRevisionNumber; private final SvnVcs myVCS; private final String myURL; private final SVNRevision myPegRevision; @@ -79,7 +80,7 @@ public class SvnFileRevision implements VcsFileRevision { public SvnFileRevision(SvnVcs vcs, SVNRevision pegRevision, - SVNLogEntry logEntry, + LogEntry logEntry, String url, String copyFromPath, Charset charset) { myCharset = charset; @@ -96,6 +97,11 @@ public class SvnFileRevision implements VcsFileRevision { myMergeSources = new ArrayList<SvnFileRevision>(); } + @NotNull + public CommitInfo getCommitInfo() { + return new CommitInfo.Builder(myRevisionNumber.getRevision().getNumber(), myDate, myAuthor).build(); + } + public String getURL() { return myURL; } |