feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: InstantBlame: Add line log action to tooltip

Browse Source 
Shows a file log with commits touching the current line.

Task-number: QTCREATORBUG-31146
Change-Id: I33e643a1bbc832659a52ed3bc43254660e427f5b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2024-08-29 11:24:27 +02:00
committed by André Hartmann
parent 57c4d437a4
commit b2b0703f6f
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/git/instantblame.cpp
View File

@@ -90,6 +90,16 @@ bool BlameMark::addToolTipContent(QLayout *target) const
const auto fileName = Utils::FilePath::fromString(originalFileName); const auto fileName = Utils::FilePath::fromString(originalFileName);
gitClient().openShowEditor(path, sha1, fileName); gitClient().openShowEditor(path, sha1, fileName);
} }
} else if (link == "logLine") {
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
qCInfo(log).nospace().noquote() << "Showing log for: \"" << m_info.filePath
<< "\" line:" << m_info.line;
const QString lineArg = QString("-L %1,%1:%2")
.arg(m_info.line).arg(state.relativeCurrentFile());
gitClient().log(state.currentFileTopLevel(), {}, true, {lineArg, "--no-patch"});
} else { } else {
qCInfo(log).nospace().noquote() << "Showing commit: " << sha1 << " for " << m_info.filePath; qCInfo(log).nospace().noquote() << "Showing commit: " << sha1 << " for " << m_info.filePath;
gitClient().show(m_info.filePath, sha1); gitClient().show(m_info.filePath, sha1);
@@ -106,16 +116,18 @@ QString BlameMark::toolTipText(const CommitInfo &info) const
" <td><a href=\"blame\">Blame %1</a></td>" " <td><a href=\"blame\">Blame %1</a></td>"
" <td><a href=\"blameParent\">Blame Parent</a></td>" " <td><a href=\"blameParent\">Blame Parent</a></td>"
" <td><a href=\"showFile\">File at %1</a></td>" " <td><a href=\"showFile\">File at %1</a></td>"
" <td><a href=\"logLine\">Log for line %2</a></td>"
"</tr></table>" "</tr></table>"
"<p></p>" "<p></p>"
"<table>" "<table>"
" <tr><td>commit</td><td><a href=\"show\">%1</a></td></tr>" " <tr><td>commit</td><td><a href=\"show\">%1</a></td></tr>"
" <tr><td>Author:</td><td>%2 &lt;%3&gt;</td></tr>" " <tr><td>Author:</td><td>%3 &lt;%4&gt;</td></tr>"
" <tr><td>Date:</td><td>%4</td></tr>" " <tr><td>Date:</td><td>%5</td></tr>"
" <tr></tr>" " <tr></tr>"
" <tr><td colspan='2' align='left'>%5</td></tr>" " <tr><td colspan='2' align='left'>%6</td></tr>"
"</table>") "</table>")
.arg(info.sha1.left(8), info.author, info.authorMail, .arg(info.sha1.left(8), QString::number(info.line),
info.author, info.authorMail,
info.authorTime.toString("yyyy-MM-dd hh:mm:ss"), info.summary); info.authorTime.toString("yyyy-MM-dd hh:mm:ss"), info.summary);
if (settings().instantBlameIgnoreSpaceChanges() if (settings().instantBlameIgnoreSpaceChanges()