24#ifndef _GIT_PULL_HANDLER_H_
25#define _GIT_PULL_HANDLER_H_
75 const std::vector<std::pair<std::string, std::vector<CommitDetails>>>&
GetFetchResults()
const;
78 void UpdateProgress(
int aCurrent,
int aTotal,
const wxString& aMessage )
override;
82 std::vector<std::pair<std::string, std::vector<CommitDetails>>>
m_fetchResults;
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
git_time_t their_commit_time
git_time_t our_commit_time