From c44c8052385c5c42e37103e4b1a2b5832a44f8a0 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 30 Oct 2023 15:00:57 +0100 Subject: [PATCH] Use some special output methods using ISMAS(), GUI() nad CONSOLE(). --- git/git_client.cpp | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/git/git_client.cpp b/git/git_client.cpp index 20b5c32..b23d7a3 100644 --- a/git/git_client.cpp +++ b/git/git_client.cpp @@ -302,6 +302,7 @@ std::optional GitClient::gitPull() { QString const s = c.getCommandResult().trimmed(); if (!s.isEmpty()) { QStringList lines = Update::split(s, '\n'); + worker()->CONSOLE(lines) << Worker::UPDATE_STEP::UPDATE_REPOSITORY; if (!lines.empty()) { static const QRegularExpression alreadyUpToDate("^\\s*Already\\s+up\\s+to\\s+date.*$"); if (std::none_of(lines.cbegin(), lines.cend(), @@ -332,34 +333,30 @@ std::optional GitClient::gitPull() { worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE); } } else { - emit m_worker->showErrorMessage("git pull", - QString("(wrong cap-count (%1)").arg(re.captureCount())); + QStringList lst("no regex-match for commits"); + worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE); } - } else { - emit m_worker->showErrorMessage("git pull", - "no regex-match for commits"); - Utils::printCriticalErrorMsg("NO REGEX MATCH FOR COMMITS"); } } - } - if (!found) { - emit m_worker->showErrorMessage("git pull", - QString("unkown branch name ") + m_branchName); - Utils::printCriticalErrorMsg("UNKNOWN BRANCH NAME " + m_branchName); + if (!found) { + QStringList lst(QString("unknown branch name ") + m_branchName); + worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE); + } + } else { + return "Already up to date"; } } else { - emit m_worker->showErrorMessage("git pull", - QString("wrong format for result of 'git pull' ") + s); - Utils::printCriticalErrorMsg(QString("WRONG FORMAT FOR RESULT OF 'GIT FETCH' ") + s); + QStringList lst(QString("WRONG FORMAT FOR RESULT OF 'GIT PULL' ") + s); + worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE); } } else { - // emit m_worker->showErrorMessage("git fetch", "empty result for 'git fetch'"); - Utils::printInfoMsg("EMPTY RESULT FOR 'GIT PULL'"); + QStringList lst("EMPTY RESULT FOR 'GIT PULL'"); + worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE); } } } else { - emit m_worker->showErrorMessage("git pull", QString("repository ") + m_customerRepository + " does not exist"); - Utils::printCriticalErrorMsg(QString("REPOSITORY ") + m_customerRepository + " DOES NOT EXIST"); + QStringList lst(QString("REPOSITORY ") + m_customerRepository + " DOES NOT EXIST"); + worker()->GUI(lst) << (worker()->CONSOLE(lst) << Worker::UPDATE_STEP::UPDATE_REPOSITORY_FAILURE); } return std::nullopt; }