dolphin: remove now redundant check in FileViewGitPlugin::getGitError()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/dolphin/plugins/git/fileviewgitplugin.cpp b/dolphin/plugins/git/fileviewgitplugin.cpp
index d9b7291..d60664b 100644 (file)
--- a/dolphin/plugins/git/fileviewgitplugin.cpp
+++ b/dolphin/plugins/git/fileviewgitplugin.cpp
@@ -129,7 +129,7 @@ bool FileViewGitPlugin::beginRetrieval(const QString &directory)
     // NOTE: git_repository_open_ext() will look for .git in parent directories
     const int gitresult = git_repository_open_ext(&m_gitrepo, directorybytes.constData(), 0 , "/");
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not open" << directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         return false;
@@ -157,7 +157,7 @@ KVersionControlPlugin::ItemVersion FileViewGitPlugin::itemVersion(const KFileIte
     unsigned int gitstatusflags = 0;
     const int gitresult = git_status_file(&gitstatusflags, m_gitrepo, gitfile.constData());
     if (gitresult != GIT_OK) {
-        kWarning() << "Could not get status" << gitfile << FileViewGitPlugin::getGitError(gitresult);
+        kWarning() << "Could not get status" << gitfile << FileViewGitPlugin::getGitError();
         return KVersionControlPlugin::UnversionedVersion;
     }
     if (gitstatusflags & GIT_STATUS_INDEX_NEW || gitstatusflags & GIT_STATUS_WT_NEW) {
@@ -224,7 +224,7 @@ QStringList FileViewGitPlugin::changedGitFiles() const
     git_status_options gitstatusoptions;
     int gitresult = git_status_options_init(&gitstatusoptions, GIT_STATUS_OPTIONS_VERSION);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not initialize status options" << m_directory << giterror;
         return result;
     }
@@ -236,7 +236,7 @@ QStringList FileViewGitPlugin::changedGitFiles() const
     // NOTE: the callback is called only for paths the status of which has changed
     gitresult = git_status_foreach_ext(m_gitrepo, &gitstatusoptions, FileViewGitPlugin::gitStatusCallback, &gitstatuspayload);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not get repository status" << m_directory << giterror;
         return result;
     }
@@ -259,11 +259,8 @@ int FileViewGitPlugin::gitStatusCallback(const char *path, unsigned int status_f
     return GIT_OK;
 }
 
-QByteArray FileViewGitPlugin::getGitError(const int gitresult)
+QByteArray FileViewGitPlugin::getGitError()
 {
-    if (gitresult == GIT_EUSER) {
-        return i18n("Canceled by user").toLocal8Bit();
-    }
     const git_error* giterror = git_error_last();
     if (!giterror) {
         return QByteArray();
@@ -277,7 +274,7 @@ void FileViewGitPlugin::slotAdd()
     git_index* gitindex = nullptr;
     int gitresult = git_repository_index(&gitindex, m_gitrepo);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not get repository index" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         return;
@@ -288,7 +285,7 @@ void FileViewGitPlugin::slotAdd()
         emit infoMessage(i18n("Adding: %1", QFile::decodeName(gitfile)));
         gitresult = git_index_add_bypath(gitindex, gitfile.constData());
         if (gitresult != GIT_OK) {
-            const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+            const QByteArray giterror = FileViewGitPlugin::getGitError();
             kWarning() << "Could not add path to repository" << m_directory << giterror;
             emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
             git_index_free(gitindex);
@@ -299,7 +296,7 @@ void FileViewGitPlugin::slotAdd()
     emit infoMessage(i18n("Writing changes"));
     gitresult = git_index_write(gitindex);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not write changes to repository" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_index_free(gitindex);
@@ -325,7 +322,7 @@ void FileViewGitPlugin::slotRemove()
     git_index* gitindex = nullptr;
     int gitresult = git_repository_index(&gitindex, m_gitrepo);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not get repository index" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         return;
@@ -336,7 +333,7 @@ void FileViewGitPlugin::slotRemove()
         emit infoMessage(i18n("Removing: %1", QFile::decodeName(gitfile)));
         gitresult = git_index_remove_bypath(gitindex, gitfile.constData());
         if (gitresult != GIT_OK) {
-            const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+            const QByteArray giterror = FileViewGitPlugin::getGitError();
             kWarning() << "Could not remove path from repository" << m_directory << giterror;
             emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
             git_index_free(gitindex);
@@ -347,7 +344,7 @@ void FileViewGitPlugin::slotRemove()
     emit infoMessage(i18n("Writing changes"));
     gitresult = git_index_write(gitindex);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not write index changes to repository" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_index_free(gitindex);
@@ -382,7 +379,7 @@ void FileViewGitPlugin::slotCommit()
     git_index* gitindex = nullptr;
     int gitresult = git_repository_index(&gitindex, m_gitrepo);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not get repository index" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         return;
@@ -394,7 +391,7 @@ void FileViewGitPlugin::slotCommit()
     gitupdatearray.count = 1;
     gitresult = git_index_update_all(gitindex, &gitupdatearray, NULL, NULL);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not update index" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_index_free(gitindex);
@@ -405,7 +402,7 @@ void FileViewGitPlugin::slotCommit()
     git_reference* gitreference = nullptr;
     gitresult = git_repository_head(&gitreference, m_gitrepo);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not get repository head" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_index_free(gitindex);
@@ -418,7 +415,7 @@ void FileViewGitPlugin::slotCommit()
     git_object *gitparent = nullptr;
     gitresult = git_revparse_single(&gitparent, m_gitrepo, gitspec.constData());
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not parse revision" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_index_free(gitindex);
@@ -429,7 +426,7 @@ void FileViewGitPlugin::slotCommit()
     git_oid gittreeobjectid;
     gitresult = git_index_write_tree(&gittreeobjectid, gitindex);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not write tree changes to repository" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_object_free(gitparent);
@@ -438,7 +435,7 @@ void FileViewGitPlugin::slotCommit()
     }
     gitresult = git_index_write(gitindex);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not write index changes to repository" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_object_free(gitparent);
@@ -450,7 +447,7 @@ void FileViewGitPlugin::slotCommit()
     git_tree *gittree = nullptr;
     gitresult = git_tree_lookup(&gittree, m_gitrepo, &gittreeobjectid);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not lookup tree" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_object_free(gitparent);
@@ -462,7 +459,7 @@ void FileViewGitPlugin::slotCommit()
     git_signature* gitsignature = nullptr;
     gitresult = git_signature_default(&gitsignature, m_gitrepo);
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not get signature" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_tree_free(gittree);
@@ -481,7 +478,7 @@ void FileViewGitPlugin::slotCommit()
         gitparent ? 1 : 0, gitparent
     );
     if (gitresult != GIT_OK) {
-        const QByteArray giterror = FileViewGitPlugin::getGitError(gitresult);
+        const QByteArray giterror = FileViewGitPlugin::getGitError();
         kWarning() << "Could not commit" << m_directory << giterror;
         emit errorMessage(QString::fromLocal8Bit(giterror.constData(), giterror.size()));
         git_signature_free(gitsignature);

diff --git a/dolphin/plugins/git/fileviewgitplugin.h b/dolphin/plugins/git/fileviewgitplugin.h
index e0ec95e..83c8407 100644 (file)
--- a/dolphin/plugins/git/fileviewgitplugin.h
+++ b/dolphin/plugins/git/fileviewgitplugin.h
@@ -44,7 +44,7 @@ public:
 
     static int gitStatusCallback(const char *path, unsigned int status_flags, void *payload);
 
-    static QByteArray getGitError(const int gitresult);
+    static QByteArray getGitError();
 
 private Q_SLOTS:
     void slotAdd();

diff --git a/dolphin/plugins/git/gitcommitdialog.cpp b/dolphin/plugins/git/gitcommitdialog.cpp
index 0fe6e11..5438335 100644 (file)
--- a/dolphin/plugins/git/gitcommitdialog.cpp
+++ b/dolphin/plugins/git/gitcommitdialog.cpp
@@ -54,7 +54,7 @@ QByteArray GitCommitDialog::message() const
     git_buf gitbuffer = GIT_BUF_INIT;
     int gitresult = git_message_prettify(&gitbuffer, gitmessage.constData(), 1, '#');
     if (gitresult != GIT_OK) {
-        kWarning() << "Could not prettify message" << gitmessage << FileViewGitPlugin::getGitError(gitresult);
+        kWarning() << "Could not prettify message" << gitmessage << FileViewGitPlugin::getGitError();
         return gitmessage;
     }
     const QByteArray gitprettymessage(gitbuffer.ptr, gitbuffer.size);