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

VcsBase: Proliferate FilePath use a tiny bit

Browse Source 
Change-Id: I78929f6036702fe0b5384f4324f6283c2129d91b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2023-07-07 14:06:00 +02:00
parent 299fdb9b80
commit 20700feb84
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -521,7 +521,7 @@ void VcsBaseSubmitEditor::slotCheckSubmitMessage()
bool VcsBaseSubmitEditor::checkSubmitMessage(QString *errorMessage) const bool VcsBaseSubmitEditor::checkSubmitMessage(QString *errorMessage) const
{ {
const QString checkScript = commonSettings().submitMessageCheckScript.value(); const FilePath checkScript = commonSettings().submitMessageCheckScript();
if (checkScript.isEmpty()) if (checkScript.isEmpty())
return true; return true;
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@@ -530,17 +530,17 @@ bool VcsBaseSubmitEditor::checkSubmitMessage(QString *errorMessage) const
return rc; return rc;
} }
static QString msgCheckScript(const FilePath &workingDir, const QString &cmd) static QString msgCheckScript(const FilePath &workingDir, const FilePath &cmd)
{ {
const QString nativeCmd = QDir::toNativeSeparators(cmd); const QString nativeCmd = cmd.toUserOutput();
return workingDir.isEmpty() ? return workingDir.isEmpty() ?
Tr::tr("Executing %1").arg(nativeCmd) : Tr::tr("Executing %1").arg(nativeCmd) :
Tr::tr("Executing [%1] %2"). Tr::tr("Executing [%1] %2").arg(workingDir.toUserOutput(), nativeCmd);
arg(workingDir.toUserOutput(), nativeCmd);
} }
bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript, QString *errorMessage) const bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const FilePath &checkScript, QString *errorMessage) const
{ {
QTC_ASSERT(!checkScript.needsDevice(), return false); // Not supported below.
// Write out message // Write out message
TempFileSaver saver(TemporaryDirectory::masterDirectoryPath() + "/msgXXXXXX.txt"); TempFileSaver saver(TemporaryDirectory::masterDirectoryPath() + "/msgXXXXXX.txt");
saver.write(fileContents()); saver.write(fileContents());
@@ -552,7 +552,7 @@ bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
Process checkProcess; Process checkProcess;
if (!d->m_checkScriptWorkingDirectory.isEmpty()) if (!d->m_checkScriptWorkingDirectory.isEmpty())
checkProcess.setWorkingDirectory(d->m_checkScriptWorkingDirectory); checkProcess.setWorkingDirectory(d->m_checkScriptWorkingDirectory);
checkProcess.setCommand({FilePath::fromString(checkScript), {saver.filePath().toString()}}); checkProcess.setCommand({checkScript, {saver.filePath().path()}});
checkProcess.start(); checkProcess.start();
const bool succeeded = checkProcess.waitForFinished(); const bool succeeded = checkProcess.waitForFinished();

2
src/plugins/vcsbase/vcsbasesubmiteditor.h
View File

@@ -116,7 +116,7 @@ private:
void createUserFields(const QString &fieldConfigFile); void createUserFields(const QString &fieldConfigFile);
bool checkSubmitMessage(QString *errorMessage) const; bool checkSubmitMessage(QString *errorMessage) const;
bool runSubmitMessageCheckScript(const QString &script, QString *errorMessage) const; bool runSubmitMessageCheckScript(const Utils::FilePath &script, QString *errorMessage) const;
QString promptForNickName(); QString promptForNickName();
void close(); void close();