Refactor some git routines into utility class

common/git/git_commit_handler.cpp

@@ -22,6 +22,8 @@
  */
 
 #include "git_commit_handler.h"
+#include <git/kicad_git_memory.h>
+#include <wx/log.h>
 
 GIT_COMMIT_HANDLER::GIT_COMMIT_HANDLER( git_repository* aRepo ) :
     KIGIT_COMMON( aRepo )
@@ -33,19 +35,126 @@ GIT_COMMIT_HANDLER::~GIT_COMMIT_HANDLER()
 
 
 GIT_COMMIT_HANDLER::CommitResult
-GIT_COMMIT_HANDLER::PerformCommit( const std::vector<std::string>& aFilesToCommit )
+GIT_COMMIT_HANDLER::PerformCommit( const std::vector<wxString>& aFiles,
+                                   const wxString&               aMessage,
+                                   const wxString&               aAuthorName,
+                                   const wxString&               aAuthorEmail )
 {
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return CommitResult::Error;
+
+    git_index* index = nullptr;
+
+    if( git_repository_index( &index, repo ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to get repository index: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    KIGIT::GitIndexPtr indexPtr( index );
+
+    for( const wxString& file : aFiles )
+    {
+        if( git_index_add_bypath( index, file.mb_str() ) != 0 )
+        {
+            AddErrorString( wxString::Format( _( "Failed to add file to index: %s" ),
+                                              KIGIT_COMMON::GetLastGitError() ) );
+            return CommitResult::Error;
+        }
+    }
+
+    if( git_index_write( index ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to write index: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    git_oid tree_id;
+
+    if( git_index_write_tree( &tree_id, index ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to write tree: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    git_tree* tree = nullptr;
+
+    if( git_tree_lookup( &tree, repo, &tree_id ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to lookup tree: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    KIGIT::GitTreePtr treePtr( tree );
+    git_commit* parent = nullptr;
+
+    if( git_repository_head_unborn( repo ) == 0 )
+    {
+        git_reference* headRef = nullptr;
+
+        if( git_repository_head( &headRef, repo ) != 0 )
+        {
+            AddErrorString( wxString::Format( _( "Failed to get HEAD reference: %s" ),
+                                              KIGIT_COMMON::GetLastGitError() ) );
+            return CommitResult::Error;
+        }
+
+        KIGIT::GitReferencePtr headRefPtr( headRef );
+
+        if( git_reference_peel( (git_object**) &parent, headRef, GIT_OBJECT_COMMIT ) != 0 )
+        {
+            AddErrorString( wxString::Format( _( "Failed to get commit: %s" ),
+                                              KIGIT_COMMON::GetLastGitError() ) );
+            return CommitResult::Error;
+        }
+    }
+
+    KIGIT::GitCommitPtr parentPtr( parent );
+
+    git_signature* author = nullptr;
+
+    if( git_signature_now( &author, aAuthorName.mb_str(), aAuthorEmail.mb_str() ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to create author signature: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    KIGIT::GitSignaturePtr authorPtr( author );
+    git_oid                oid;
+
+#if( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 8 \
+    && ( LIBGIT2_VER_REVISION < 2 || LIBGIT2_VER_REVISION == 3 ) )
+    git_commit* const parents[1] = { parent };
+#else
+    const git_commit* parents[1] = { parent };
+#endif
+
+    if( git_commit_create( &oid, repo, "HEAD", author, author, nullptr,
+                           aMessage.mb_str(), tree, 1, parents ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to create commit: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
     return CommitResult::Success;
 }
 
 
-std::string GIT_COMMIT_HANDLER::GetErrorString() const
+wxString GIT_COMMIT_HANDLER::GetErrorString() const
 {
     return m_errorString;
 }
 
 
-void GIT_COMMIT_HANDLER::AddErrorString( const std::string& aErrorString )
+void GIT_COMMIT_HANDLER::AddErrorString( const wxString& aErrorString )
 {
     m_errorString += aErrorString;
 }