KiCad PCB EDA Suite
Loading...
Searching...
No Matches
git_pull_handler.h
Go to the documentation of this file.
1/*
2 * This program source code file is part of KiCad, a free EDA CAD application.
3 *
4 * Copyright The KiCad Developers, see AUTHORS.TXT for contributors.
5 *
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License
8 * as published by the Free Software Foundation; either version 3
9 * of the License, or (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, you may find one here:
18 * http://www.gnu.org/licenses/gpl-3.0.html
19 * or you may search the http://www.gnu.org website for the version 3 license,
20 * or you may write to the Free Software Foundation, Inc.,
21 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
22 */
23
24#ifndef _GIT_PULL_HANDLER_H_
25#define _GIT_PULL_HANDLER_H_
26
27#include <git/git_repo_mixin.h>
28
29#include <vector>
30#include <string>
31#include <wx/string.h>
32#include <git2.h>
33
34// Structure to store commit details
36{
37 std::string m_sha;
38 std::string m_firstLine;
39 std::string m_author;
40 std::string m_date;
41};
42
43// Enum for result codes, error codes are negative, success codes are positive
44enum class PullResult : int
45{
46 MergeFailed = -2,
47 Error = -1,
48 Success = 0,
51};
52
54{
55 std::string filename;
56 std::string our_status;
57 std::string their_status;
58 git_oid our_oid;
59 git_oid their_oid;
60 git_time_t our_commit_time;
62 bool use_ours; // Flag indicating user's choice (true = ours, false = theirs)
63};
64
65
67{
68public:
71
72 bool PerformFetch( bool aSkipLock = false );
74
75 const std::vector<std::pair<std::string, std::vector<CommitDetails>>>& GetFetchResults() const;
76
77 // Implementation for progress updates
78 void UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage ) override;
79
80
81private:
82 std::vector<std::pair<std::string, std::vector<CommitDetails>>> m_fetchResults;
83
84 std::string getFirstLineFromCommitMessage( const std::string& aMessage );
85 std::string getFormattedCommitDate( const git_time& aTime );
87 PullResult handleMerge( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount );
88 PullResult handleRebase( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount );
89};
90
91#endif // _GIT_PULL_HANDLER_H_
bool PerformFetch(bool aSkipLock=false)
std::string getFirstLineFromCommitMessage(const std::string &aMessage)
PullResult handleRebase(const git_annotated_commit **aMergeHeads, size_t aMergeHeadsCount)
PullResult handleFastForward()
PullResult handleMerge(const git_annotated_commit **aMergeHeads, size_t aMergeHeadsCount)
const std::vector< std::pair< std::string, std::vector< CommitDetails > > > & GetFetchResults() const
void UpdateProgress(int aCurrent, int aTotal, const wxString &aMessage) override
std::string getFormattedCommitDate(const git_time &aTime)
std::vector< std::pair< std::string, std::vector< CommitDetails > > > m_fetchResults
PullResult PerformPull()
PullResult
std::string m_sha
std::string m_date
std::string m_firstLine
std::string m_author
std::string their_status
std::string our_status
std::string filename
git_time_t their_commit_time
git_time_t our_commit_time