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

Mercurial: Aspectify settings

Browse Source 
Change-Id: I689ce9a52124043e07472a1c95a3672f856232c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-03-19 14:12:25 +01:00
parent fb9796ae8a
commit 4a2a0f1037
10 changed files with 120 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -24,14 +24,14 @@
****************************************************************************/
#include "mercurialplugin.h"
#include "optionspage.h"
#include "commiteditor.h"
#include "constants.h"
#include "mercurialclient.h"
#include "mercurialeditor.h"
#include "mercurialsettings.h"
#include "revertdialog.h"
#include "srcdestdialog.h"
#include "commiteditor.h"
#include "mercurialsettings.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
@@ -662,8 +662,8 @@ void MercurialPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusI
const QString branch = vcsTopic(m_submitRepository);
commitEditor->setFields(QFileInfo(m_submitRepository), branch,
m_settings.stringValue(MercurialSettings::userNameKey),
m_settings.stringValue(MercurialSettings::userEmailKey), status);
m_settings.userName.value(),
m_settings.userEmail.value(), status);
}
void MercurialPluginPrivate::diffFromEditorSelected(const QStringList &files)
@@ -767,7 +767,7 @@ bool MercurialPluginPrivate::managesFile(const QString &workingDirectory, const
bool MercurialPluginPrivate::isConfigured() const
{
const Utils::FilePath binary = m_settings.binaryPath();
const FilePath binary = m_settings.binaryPath.filePath();
if (binary.isEmpty())
return false;
QFileInfo fi = binary.toFileInfo();
@@ -839,7 +839,7 @@ Core::ShellCommand *MercurialPluginPrivate::createInitialCheckoutCommand(const Q
args << QLatin1String("clone") << extraArgs << url << localName;
auto command = new VcsBase::VcsCommand(baseDirectory.toString(),
m_client.processEnvironment());
command->addJob({m_settings.binaryPath(), args}, -1);
command->addJob({m_settings.binaryPath.filePath(), args}, -1);
return command;
}