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

Git: Avoid main loop blocking in instant blame

Browse Source 
Query the author and encoding information asynchronous
after the current repository is changed.

Set the default codec to UTF-8, which should cover most
configurations (i.e. almost never be different).

In case requesting the information takes longer, the blame
mark is already created with the cached information.

In case the author or encoding changed, the blame mark
has to be recreated.

The call to refreshWorkingDirectory() is moved after the
widget checks in setupInstantBlame() to avoid requesting
these information in VCS editors.

Fixes: QTCREATORBUG-29151
Change-Id: I6feccbbed67c877f1015295f630dd63cf3ccf4a0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2023-05-28 07:29:54 +02:00
committed by André Hartmann
parent d15da2c0f9
commit 419f5416c5
3 changed files with 84 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -822,14 +822,19 @@ FilePaths GitClient::unmanagedFiles(const FilePaths &filePaths) const
return res;
}
QTextCodec *GitClient::defaultCommitEncoding() const
{
// Set default commit encoding to 'UTF-8', when it's not set,
// to solve displaying error of commit log with non-latin characters.
return QTextCodec::codecForName("UTF-8");
}
QTextCodec *GitClient::encoding(GitClient::EncodingType encodingType, const FilePath &source) const
{
auto codec = [this](const FilePath &workingDirectory, const QString &configVar) {
const QString codecName = readConfigValue(workingDirectory, configVar).trimmed();
// Set default commit encoding to 'UTF-8', when it's not set,
// to solve displaying error of commit log with non-latin characters.
if (codecName.isEmpty())
return QTextCodec::codecForName("UTF-8");
return defaultCommitEncoding();
return QTextCodec::codecForName(codecName.toUtf8());
};
@@ -2618,11 +2623,10 @@ bool GitClient::readDataFromCommit(const FilePath &repoDirectory, const QString
return true;
}
Author GitClient::getAuthor(const Utils::FilePath &workingDirectory)
Author GitClient::parseAuthor(const QString &authorInfo)
{
// The format is:
// Joe Developer <joedev@example.com> unixtimestamp +HHMM
const QString authorInfo = readGitVar(workingDirectory, "GIT_AUTHOR_IDENT");
int lt = authorInfo.lastIndexOf('<');
int gt = authorInfo.lastIndexOf('>');
if (gt == -1 || uint(lt) > uint(gt)) {
@@ -2634,6 +2638,12 @@ Author GitClient::getAuthor(const Utils::FilePath &workingDirectory)
return result;
}
Author GitClient::getAuthor(const Utils::FilePath &workingDirectory)
{
const QString authorInfo = readGitVar(workingDirectory, "GIT_AUTHOR_IDENT");
return parseAuthor(authorInfo);
}
bool GitClient::getCommitData(const FilePath &workingDirectory,
QString *commitTemplate,
CommitData &commitData,
@@ -3425,21 +3435,33 @@ QString GitClient::readGitVar(const FilePath &workingDirectory, const QString &c
return readOneLine(workingDirectory, {"var", configVar});
}
QString GitClient::readOneLine(const FilePath &workingDirectory, const QStringList &arguments) const
static QTextCodec *configFileCodec()
{
// Git for Windows always uses UTF-8 for configuration:
// https://github.com/msysgit/msysgit/wiki/Git-for-Windows-Unicode-Support#convert-config-files
static QTextCodec *codec = HostOsInfo::isWindowsHost()
? QTextCodec::codecForName("UTF-8")
: QTextCodec::codecForLocale();
return codec;
}
QString GitClient::readOneLine(const FilePath &workingDirectory, const QStringList &arguments) const
{
const CommandResult result = vcsSynchronousExec(workingDirectory, arguments,
RunFlags::NoOutput, vcsTimeoutS(), codec);
RunFlags::NoOutput, vcsTimeoutS(),
configFileCodec());
if (result.result() == ProcessResult::FinishedWithSuccess)
return result.cleanedStdOut().trimmed();
return {};
}
void GitClient::readConfigAsync(const FilePath &workingDirectory, const QStringList &arguments,
const CommandHandler &handler) const
{
vcsExecWithHandler(workingDirectory, arguments, this, handler, RunFlags::NoOutput,
configFileCodec());
}
static unsigned parseGitVersion(const QString &output)
{
// cut 'git version 1.6.5.1.sha'