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

Fixes: Add log message to SVN description

Browse Source
This commit is contained in:
Friedemann Kleint
2009-02-10 08:38:12 +01:00
parent 53fde645f9
commit 8f03874bd7
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/subversion/subversionplugin.cpp
View File

@@ -864,7 +864,20 @@ void SubversionPlugin::describe(const QString &source, const QString &changeNr)
const int number = changeNr.toInt(&ok); const int number = changeNr.toInt(&ok);
if (!ok || number < 2) if (!ok || number < 2)
return; return;
QStringList args(QLatin1String("diff")); // Run log to obtain message (local utf8)
QString description;
QStringList args(QLatin1String("log"));
args.push_back(QLatin1String("-r"));
args.push_back(changeNr);
args.push_back(topLevel);
const SubversionResponse logResponse = runSvn(args, subversionShortTimeOut, false);
if (logResponse.error)
return;
description = logResponse.stdOut;
// Run diff (encoding via source codec)
args.clear();
args.push_back(QLatin1String("diff"));
args.push_back(QLatin1String("-r")); args.push_back(QLatin1String("-r"));
QString diffArg; QString diffArg;
QTextStream(&diffArg) << (number - 1) << ':' << number; QTextStream(&diffArg) << (number - 1) << ':' << number;
@@ -875,16 +888,17 @@ void SubversionPlugin::describe(const QString &source, const QString &changeNr)
const SubversionResponse response = runSvn(args, subversionShortTimeOut, false, codec); const SubversionResponse response = runSvn(args, subversionShortTimeOut, false, codec);
if (response.error) if (response.error)
return; return;
description += response.stdOut;
// Re-use an existing view if possible to support // Re-use an existing view if possible to support
// the common usage pattern of continuously changing and diffing a file // the common usage pattern of continuously changing and diffing a file
const QString id = diffArg + source; const QString id = diffArg + source;
if (Core::IEditor *editor = locateEditor("describeChange", id)) { if (Core::IEditor *editor = locateEditor("describeChange", id)) {
editor->createNew(response.stdOut); editor->createNew(description);
Core::EditorManager::instance()->setCurrentEditor(editor); Core::EditorManager::instance()->setCurrentEditor(editor);
} else { } else {
const QString title = tr("svn describe %1#%2").arg(QFileInfo(source).fileName(), changeNr); const QString title = tr("svn describe %1#%2").arg(QFileInfo(source).fileName(), changeNr);
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::DiffOutput, source, codec); Core::IEditor *newEditor = showOutputInEditor(title, description, VCSBase::DiffOutput, source, codec);
newEditor->setProperty("describeChange", id); newEditor->setProperty("describeChange", id);
} }
} }