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

svn: subversion log codec

Browse Source 
Subversion stores log in UTF-8 and returns it back in user system locale.
So we do not need to encode it.

Merge-request: 213
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Roman Kovalev
2010-11-03 10:20:49 +01:00
committed by Oswald Buddenhagen
parent c7a1068f21
commit 7cc6b469aa
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -842,7 +842,6 @@ void SubversionPlugin::filelog(const QString &workingDir,
const QStringList &files,
bool enableAnnotationContextMenu)
{
QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(workingDir, files);
// no need for temp file
QStringList args(QLatin1String("log"));
if (m_settings.logCount > 0)
@@ -850,9 +849,11 @@ void SubversionPlugin::filelog(const QString &workingDir,
foreach(const QString &file, files)
args.append(QDir::toNativeSeparators(file));
// subversion stores log in UTF-8 and returns it back in user system locale.
// So we do not need to encode it.
const SubversionResponse response =
runSvn(workingDir, args, m_settings.timeOutMS(),
SshPasswordPrompt, codec);
SshPasswordPrompt, 0/*codec*/);
if (response.error)
return;
@@ -866,7 +867,7 @@ void SubversionPlugin::filelog(const QString &workingDir,
} else {
const QString title = QString::fromLatin1("svn log %1").arg(id);
const QString source = VCSBase::VCSBaseEditor::getSource(workingDir, files);
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::LogOutput, source, codec);
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::LogOutput, source, /*codec*/0);
newEditor->setProperty("logFileName", id);
if (enableAnnotationContextMenu)
VCSBase::VCSBaseEditor::getVcsBaseEditor(newEditor)->setFileLogAnnotateEnabled(true);