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

Git: Factor out commitEncoding

Browse Source 
Task-number: QTCREATORBUG-11115

Change-Id: I58f3759c13d963aaf3e7891d7cc0a41c1ae14ecd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-03-16 22:52:37 +02:00
committed by Orgad Shaneh
parent 2f8ca8f81a
commit 86d7916b5b
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/git/gitclient.cpp
View File

@@ -3027,6 +3027,16 @@ QString GitClient::gitBinaryPath(bool *ok, QString *errorMessage) const
return settings()->gitBinaryPath(ok, errorMessage);
}
QString GitClient::commitEncoding(const QString &workingDirectory)
{
QString encoding = readConfigValue(workingDirectory, QLatin1String("i18n.commitEncoding"));
if (!encoding.isEmpty())
return encoding;
// Set default commit encoding to 'UTF-8', when it's not set,
// to solve displaying error of commit log with non-latin characters.
return QLatin1String("UTF-8");
}
bool GitClient::getCommitData(const QString &workingDirectory,
QString *commitTemplate,
CommitData &commitData,
@@ -3106,12 +3116,7 @@ bool GitClient::getCommitData(const QString &workingDirectory,
}
}
commitData.commitEncoding = readConfigValue(workingDirectory, QLatin1String("i18n.commitEncoding"));
// Set default commit encoding to 'UTF-8', when it's not set,
// to solve displaying error of commit log with non-latin characters.
if (commitData.commitEncoding.isEmpty())
commitData.commitEncoding = QLatin1String("UTF-8");
commitData.commitEncoding = commitEncoding(workingDirectory);
// Get the commit template or the last commit message
switch (commitData.commitType) {

1
src/plugins/git/gitclient.h
View File

@@ -285,6 +285,7 @@ public:
QString readConfigValue(const QString &workingDirectory, const QString &configVar) const;
QString commitEncoding(const QString &workingDirectory);
bool getCommitData(const QString &workingDirectory, QString *commitTemplate,
CommitData &commitData, QString *errorMessage);