kigit_merge_blob_utils.h

Go to the documentation of this file.

/*
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright The KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 3
 * of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, you may find one here:
 * http://www.gnu.org/licenses/gpl-3.0.html
 */
 
#ifndef KIGIT_MERGE_BLOB_UTILS_H
#define KIGIT_MERGE_BLOB_UTILS_H
 
#include <kicommon.h>
 
#include <git2.h>
#include <git2/sys/merge.h>
 
#include <string>
 
 
namespace KIGIT
{

KICOMMON_API std::string BlobToString( git_blob* aBlob );
 

KICOMMON_API int WriteToGitBuf( git_buf* aBuf, const std::string& aContent );
 

struct MERGE_BLOBS
{
    std::string ancestor;   
    std::string ours;
    std::string theirs;
};
 

KICOMMON_API int LoadMergeBlobs( const git_merge_driver_source* aSource, MERGE_BLOBS& aBlobs );
 

KICOMMON_API bool TryTrivialMerge( const MERGE_BLOBS& aBlobs, git_buf* aResult, int* aRc );
 

template <typename DRIVER>
int ApplyMergeDriver( const git_merge_driver_source* aSrc, const char** aPathOut,
                      unsigned int* aModeOut, git_buf* aMergedOut )
{
    if( !aSrc || !aPathOut || !aModeOut || !aMergedOut )
        return -1;
 
    DRIVER driver( const_cast<git_merge_driver_source*>( aSrc ), aMergedOut );
    int    rc = driver.Merge();
 
    if( rc == 0 || rc == GIT_EMERGECONFLICT )
    {
        if( const git_index_entry* oursEntry = git_merge_driver_source_ours( aSrc ) )
        {
            *aPathOut = oursEntry->path;
            *aModeOut = oursEntry->mode;
        }
    }
 
    return rc;
}
 
} // namespace KIGIT
 
#endif // KIGIT_MERGE_BLOB_UTILS_H