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

Mercurial: Work on Windows using Tortoise Hg, polishing.

Browse Source 
Do not use "cmd /c hg" on Windows as this will fail randomly
depending on arguments with blanks, such as "-U 8". Output log
messages about synchronous commands, format author correctly,
label menus correctly.
This commit is contained in:
Friedemann Kleint
2009-11-05 12:45:02 +01:00
parent c8bb7e174b
commit d570b05bec
10 changed files with 130 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/mercurial/mercurialjobrunner.cpp
View File

@@ -132,6 +132,21 @@ void MercurialJobRunner::run()
}
}
QString MercurialJobRunner::msgExecute(const QString &binary, const QStringList &args)
{
return tr("Executing: %1 %2\n").arg(binary, args.join(QString(QLatin1Char(' '))));
}
QString MercurialJobRunner::msgStartFailed(const QString &binary, const QString &why)
{
return tr("Unable to start mercurial process '%1': %2").arg(binary, why);
}
QString MercurialJobRunner::msgTimeout(int timeoutMS)
{
return tr("Timed out after %1ms waiting for mercurial process to finish.").arg(timeoutMS);
}
void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
{
HgTask *taskData = job.data();
@@ -155,8 +170,8 @@ void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
Qt::QueuedConnection);
}
const QString starting = tr("Executing: %1 %2\n").arg(binary, taskData->args().join(QString(QLatin1Char(' '))));
emit commandStarted(starting);
const QStringList args = standardArguments + taskData->args();
emit commandStarted(msgExecute(binary, args));
//infom the user of what we are going to try and perform
if (Constants::debug)
@@ -165,13 +180,11 @@ void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
QProcess hgProcess;
hgProcess.setWorkingDirectory(taskData->repositoryRoot());
QStringList args = standardArguments;
args << taskData->args();
hgProcess.start(binary, args);
if (!hgProcess.waitForStarted()) {
emit error(tr("Unable to start mercurial process '%1': %2").arg(binary, hgProcess.errorString()));
if (!hgProcess.waitForStarted()) {
emit error(msgStartFailed(binary, hgProcess.errorString()));
return;
}
@@ -179,7 +192,7 @@ void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
if (!hgProcess.waitForFinished(timeout)) {
hgProcess.terminate();
emit error(tr("Timed out waiting for mercurial process to finish."));
emit error(msgTimeout(timeout));
return;
}